diff options
| author | Chumva <faiver.unknown@gmail.com> | 2019-10-18 18:32:09 +0300 |
|---|---|---|
| committer | Chumva <faiver.unknown@gmail.com> | 2019-10-18 18:32:09 +0300 |
| commit | 17b9972a1c17e31a72fda16224987309b9a88362 (patch) | |
| tree | 31790d76687bc19883b5b7be55433792ee1504fa | |
| parent | ba405fa7bfc46581b3cf2ddaaa824cce2f619346 (diff) | |
| download | Osmand-17b9972a1c17e31a72fda16224987309b9a88362.tar.gz | |
Remove unnecessary changes
| -rw-r--r-- | OsmAnd/src/net/osmand/plus/OsmandSettings.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index cbadef91c3..7285d5835a 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -151,6 +151,7 @@ public class OsmandSettings { private final OsmandApplication ctx; private PreferencesDataStore dataStore; private SettingsAPI settingsAPI; + private Object defaultProfilePreferences; private Object globalPreferences; private Object profilePreferences; private ApplicationMode currentMode; @@ -180,6 +181,7 @@ public class OsmandSettings { private void initPrefs() { globalPreferences = settingsAPI.getPreferenceObject(getSharedPreferencesName(null)); + defaultProfilePreferences = getProfilePreferences(ApplicationMode.DEFAULT); currentMode = readApplicationMode(); profilePreferences = getProfilePreferences(currentMode); registeredPreferences.put(APPLICATION_MODE.getId(), APPLICATION_MODE); @@ -580,7 +582,11 @@ public class OsmandSettings { if (pt != null) { return getProfileDefaultValue(pt); } - return defaultValue; + if (settingsAPI.contains(defaultProfilePreferences, getId())) { + return getValue(defaultProfilePreferences, defaultValue); + } else { + return defaultValue; + } } protected T getDefaultValue() { |