mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-04 10:09:42 +00:00
fixed regatta configuration loading, because of last change in AppPreferences
This commit is contained in:
1 parent
65fd3bb089
commit
570d1c7ad9
2 files changed
+15
-4
No files matched your search
+14
-3
@@ -62,7 +62,11 @@ public class AppPreferences {
|
||||
}
|
||||
|
||||
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;
|
||||
@@ -86,9 +90,16 @@ public class AppPreferences {
|
||||
helper = new Helper(PreferenceManager.getDefaultSharedPreferences(context), null);
|
||||
}
|
||||
|
||||
public AppPreferences(Context context, String preferenceName) {
|
||||
public AppPreferences(Context context, String preferenceName, boolean overload) {
|
||||
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) {
|
||||
|
||||
+1
-1
@@ -679,7 +679,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
|
||||
|
||||
RegattaConfiguration configuration = raceGroup.getRegattaConfiguration();
|
||||
if (configuration instanceof RegattaConfigurationImpl) {
|
||||
AppPreferences preferences = AppPreferences.on(this, regattaPreference);
|
||||
AppPreferences preferences = AppPreferences.on(this, regattaPreference, false);
|
||||
PreferencesRegattaConfigurationLoader preferencesLoader = new PreferencesRegattaConfigurationLoader(configuration, preferences);
|
||||
preferencesLoader.store();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user