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

Fix prefs migration

Browse source
This commit is contained in:
Vitaliy 2020-01-08 18:22:24 +02:00
parent cb686a2a10
commit 3114402137
2 changed files with 9 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -236,7 +236,7 @@ public class OsmandSettings {
CommonPreference commonPreference = (CommonPreference) pref;
if (!commonPreference.global) {
for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
if (!commonPreference.isSetForMode(mode)) {
if (!commonPreference.isSetForMode(mode) && !commonPreference.hasDefaultValueForMode(mode)) {
setPreference(key, globalPrefsMap.get(key), mode);
}
}
@ -255,10 +255,13 @@ public class OsmandSettings {
}
}
for (OsmandPreference pref : generalPrefs) {
Object defaultVal = pref.getModeValue(ApplicationMode.DEFAULT);
if (pref instanceof CommonPreference) {
CommonPreference commonPref = (CommonPreference) pref;
Object defaultVal = commonPref.getModeValue(ApplicationMode.DEFAULT);
for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
if (!pref.isSetForMode(mode)) {
pref.setModeValue(mode, defaultVal);
if (!commonPref.isSetForMode(mode) && !commonPref.hasDefaultValueForMode(mode)) {
setPreference(commonPref.getId(), defaultVal, mode);
}
}
}
}
@ -410,7 +413,7 @@ public class OsmandSettings {
for (OsmandPreference pref : registeredPreferences.values()) {
if (pref instanceof CommonPreference && !((CommonPreference) pref).global) {
CommonPreference profilePref = (CommonPreference) pref;
if (profilePref.isSetForMode(modeFrom)) {
if (profilePref.isSetForMode(modeFrom) || profilePref.hasDefaultValueForMode(modeFrom)) {
Object copiedValue = profilePref.getModeValue(modeFrom);
if (copiedValue instanceof String) {
settingsEditor.putString(pref.getId(), (String) copiedValue);

27
OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java
View file

@ -12,10 +12,8 @@ import android.support.v7.app.AlertDialog;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.support.v7.preference.TwoStatePreference;
import android.support.v7.widget.AppCompatCheckedTextView;
import android.support.v7.widget.SwitchCompat;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -23,7 +21,6 @@ import android.widget.ArrayAdapter;
import android.widget.CompoundButton;
import android.widget.TextView;
import net.osmand.AndroidUtils;
import net.osmand.data.PointDescription;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandSettings;
@ -32,11 +29,9 @@ import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.Version;
import net.osmand.plus.base.MapViewTrackingUtilities;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomSheet;
import net.osmand.plus.settings.preferences.ListPreferenceEx;
import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
import net.osmand.plus.widgets.style.CustomTypefaceSpan;
import java.io.Serializable;
import java.util.ArrayList;
@ -80,28 +75,6 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
switchView.setChecked(checked);
switchView.setOnCheckedChangeListener(externalInputDeviceListener);
}
OsmandSettings.OsmandPreference osmandPreference = settings.getPreference(prefId);
TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);
if (osmandPreference instanceof CommonPreference && summaryView != null) {
CharSequence summary = null;
if (preference instanceof TwoStatePreference) {
TwoStatePreference statePreference = (TwoStatePreference) preference;
summary = statePreference.isChecked() ? statePreference.getSummaryOn() : statePreference.getSummaryOff();
}
if (TextUtils.isEmpty(summary)) {
summary = preference.getSummary();
}
ApplicationMode selectedMode = getSelectedAppMode();
CommonPreference commonPref = (CommonPreference) osmandPreference;
if (!commonPref.hasDefaultValueForMode(selectedMode)
&& (!commonPref.isSetForMode(selectedMode) || getSelectedAppMode().equals(ApplicationMode.DEFAULT))) {
String baseString = getString(R.string.shared_preference) + ": %s";
summary = AndroidUtils.getStyledString(baseString, summary, new CustomTypefaceSpan(FontCache.getRobotoMedium(app)), null);
}
summaryView.setText(summary);
}
}
CompoundButton.OnCheckedChangeListener externalInputDeviceListener = new CompoundButton.OnCheckedChangeListener() {