Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove profile default value dependency from browse map profile

Browse source
This commit is contained in:
Chumva 2019-10-17 14:54:01 +03:00
parent 1c645c5cf9
commit 390fd268c4
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -45,17 +45,11 @@ import net.osmand.util.Algorithms;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.io.BufferedOutputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
@ -158,7 +152,6 @@ public class OsmandSettings {
private PreferencesDataStore dataStore; private PreferencesDataStore dataStore;
private SettingsAPI settingsAPI; private SettingsAPI settingsAPI;
private Object globalPreferences; private Object globalPreferences;
private Object defaultProfilePreferences;
private Object profilePreferences; private Object profilePreferences;
private ApplicationMode currentMode; private ApplicationMode currentMode;
private Map<String, OsmandPreference<?>> registeredPreferences = private Map<String, OsmandPreference<?>> registeredPreferences =
@ -187,7 +180,6 @@ public class OsmandSettings {
private void initPrefs() { private void initPrefs() {
globalPreferences = settingsAPI.getPreferenceObject(getSharedPreferencesName(null)); globalPreferences = settingsAPI.getPreferenceObject(getSharedPreferencesName(null));
defaultProfilePreferences = getProfilePreferences(ApplicationMode.DEFAULT);
currentMode = readApplicationMode(); currentMode = readApplicationMode();
profilePreferences = getProfilePreferences(currentMode); profilePreferences = getProfilePreferences(currentMode);
registeredPreferences.put(APPLICATION_MODE.getId(), APPLICATION_MODE); registeredPreferences.put(APPLICATION_MODE.getId(), APPLICATION_MODE);
@ -587,12 +579,8 @@ public class OsmandSettings {
if (pt != null) { if (pt != null) {
return getProfileDefaultValue(pt); return getProfileDefaultValue(pt);
} }
if (settingsAPI.contains(defaultProfilePreferences, getId())) {
return getValue(defaultProfilePreferences, defaultValue);
} else {
return defaultValue; return defaultValue;
} }
}
protected T getDefaultValue() { protected T getDefaultValue() {
return getProfileDefaultValue(currentMode); return getProfileDefaultValue(currentMode);