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

Merge pull request #647 from dubrovskip/master

Browse source 
Tour settings save format fix
This commit is contained in:
vshcherb 2014-05-23 22:46:16 +02:00
commit 1d0fbad437
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,13 +110,12 @@ public class OsmandSettings {
protected OsmandSettings(OsmandApplication clientContext, SettingsAPI settinsAPI) { protected OsmandSettings(OsmandApplication clientContext, SettingsAPI settinsAPI) {
ctx = clientContext; ctx = clientContext;
this.settingsAPI = settinsAPI; this.settingsAPI = settinsAPI;
initPrefs();
}
private void initPrefs() {
globalPreferences = settingsAPI.getPreferenceObject(SHARED_PREFERENCES_NAME); globalPreferences = settingsAPI.getPreferenceObject(SHARED_PREFERENCES_NAME);
// start from default settings
currentMode = ApplicationMode.DEFAULT;
defaultProfilePreferences = getProfilePreferences(ApplicationMode.DEFAULT); defaultProfilePreferences = getProfilePreferences(ApplicationMode.DEFAULT);
profilePreferences = defaultProfilePreferences;
currentMode = readApplicationMode(); currentMode = readApplicationMode();
profilePreferences = getProfilePreferences(currentMode); profilePreferences = getProfilePreferences(currentMode);
} }
@ -127,6 +126,7 @@ public class OsmandSettings {
public void setSettingsAPI(SettingsAPI settingsAPI) { public void setSettingsAPI(SettingsAPI settingsAPI) {
this.settingsAPI = settingsAPI; this.settingsAPI = settingsAPI;
initPrefs();
} }
public SettingsAPI getSettingsAPI() { public SettingsAPI getSettingsAPI() {

3
OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
View file

@ -113,6 +113,9 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
} }
} }
} }
if (selectedName == null) {
app.getSettings().setSettingsAPI(originalSettings.getSettingsAPI());
}
} }
} }
this.tourPresent = tourPresent; this.tourPresent = tourPresent;