eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 10:09:42 +00:00
Code Activity

fixed regatta configuration loading, because of last change in AppPreferences

Browse Source
This commit is contained in:
Peter Siegmund committed 2016-05-10 16:36:08 +02:00
1 parent 65fd3bb089
commit 570d1c7ad9
2 files changed
+15 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
+14 -3
View File
@@ -62,7 +62,11 @@ public class AppPreferences {
} }
public static AppPreferences on(Context context, String preferenceName) { public static AppPreferences on(Context context, String preferenceName) {
return new AppPreferences(context, preferenceName); return new AppPreferences(context, preferenceName, true);
}
public static AppPreferences on(Context context, String preferenceName, boolean overload) {
return new AppPreferences(context, preferenceName, overload);
} }
protected final Context context; protected final Context context;
@@ -86,9 +90,16 @@ public class AppPreferences {
helper = new Helper(PreferenceManager.getDefaultSharedPreferences(context), null); helper = new Helper(PreferenceManager.getDefaultSharedPreferences(context), null);
} }
public AppPreferences(Context context, String preferenceName) { public AppPreferences(Context context, String preferenceName, boolean overload) {
this.context = context; this.context = context;
helper = new Helper(PreferenceManager.getDefaultSharedPreferences(context), context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE));
SharedPreferences defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
SharedPreferences customSharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
if (overload) {
helper = new Helper(defaultSharedPreferences, customSharedPreferences);
} else {
helper = new Helper(customSharedPreferences, null);
}
} }
public void setAuthor(AbstractLogEventAuthor author) { public void setAuthor(AbstractLogEventAuthor author) {
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
+1 -1
View File
@@ -679,7 +679,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
RegattaConfiguration configuration = raceGroup.getRegattaConfiguration(); RegattaConfiguration configuration = raceGroup.getRegattaConfiguration();
if (configuration instanceof RegattaConfigurationImpl) { if (configuration instanceof RegattaConfigurationImpl) {
AppPreferences preferences = AppPreferences.on(this, regattaPreference); AppPreferences preferences = AppPreferences.on(this, regattaPreference, false);
PreferencesRegattaConfigurationLoader preferencesLoader = new PreferencesRegattaConfigurationLoader(configuration, preferences); PreferencesRegattaConfigurationLoader preferencesLoader = new PreferencesRegattaConfigurationLoader(configuration, preferences);
preferencesLoader.store(); preferencesLoader.store();
} }