kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Refactoring MwmApplication.prefs.

Browse source 
Refactoring MwmApplication, Statistic, SharedPropertiesUtils.
This commit is contained in:
velichkomarija 2020-11-27 18:52:27 +03:00 • committed by Alexey
parent c6d7f6461c
commit 1026a9314a
6 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/MwmApplication.java
View file

@ -253,7 +253,7 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
filesPath, tempPath, StorageUtils.getObbGooglePath(), BuildConfig.FLAVOR,
BuildConfig.BUILD_TYPE, UiUtils.isTablet());
Config.setStatisticsEnabled(SharedPropertiesUtils.isStatisticsEnabled());
Config.setStatisticsEnabled(SharedPropertiesUtils.isStatisticsEnabled(this));
@SuppressWarnings("unused")
Statistics s = Statistics.INSTANCE;

2
android/src/com/mapswithme/maps/SplashActivity.java
View file

@ -263,7 +263,7 @@ public class SplashActivity extends AppCompatActivity
if (Counters.isMigrationNeeded())
{
Config.migrateCountersToSharedPrefs();
Config.migrateCountersToSharedPrefs(getApplicationContext());
Counters.setMigrationExecuted();
}

6
android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
View file

@ -677,13 +677,13 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
if (pref == null)
return;
((TwoStatePreference)pref).setChecked(SharedPropertiesUtils.isStatisticsEnabled());
((TwoStatePreference)pref).setChecked(SharedPropertiesUtils.isStatisticsEnabled(requireContext()));
pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
{
@Override
public boolean onPreferenceChange(Preference preference, Object newValue)
{
Statistics.INSTANCE.setStatEnabled((Boolean) newValue);
Statistics.INSTANCE.setStatEnabled(requireContext(), (Boolean) newValue);
return true;
}
});
@ -710,7 +710,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
{
boolean enabled = (Boolean) newValue;
TrackRecorder.setEnabled(enabled);
Statistics.INSTANCE.setStatEnabled(enabled);
Statistics.INSTANCE.setStatEnabled(requireContext(), enabled);
trackPref.setEnabled(enabled);
if (root != null)
root.setSummary(enabled ? R.string.on : R.string.off);

6
android/src/com/mapswithme/util/Config.java
View file

@ -1,5 +1,7 @@
package com.mapswithme.util;
import android.content.Context;
import androidx.annotation.NonNull;
import com.mapswithme.maps.BuildConfig;
@ -102,10 +104,10 @@ public final class Config
nativeSetBoolean(key, value);
}
public static void migrateCountersToSharedPrefs()
public static void migrateCountersToSharedPrefs(@NonNull Context context)
{
int version = getInt(KEY_APP_FIRST_INSTALL_VERSION, BuildConfig.VERSION_CODE);
MwmApplication.prefs()
MwmApplication.prefs(context)
.edit()
.putInt(KEY_APP_LAUNCH_NUMBER, getInt(KEY_APP_LAUNCH_NUMBER))
.putInt(KEY_APP_FIRST_INSTALL_VERSION, version)

8
android/src/com/mapswithme/util/SharedPropertiesUtils.java
View file

@ -37,14 +37,14 @@ public final class SharedPropertiesUtils
throw new IllegalStateException("Try instantiate utility class SharedPropertiesUtils");
}
public static boolean isStatisticsEnabled()
public static boolean isStatisticsEnabled(@NonNull Context context)
{
return MwmApplication.prefs().getBoolean(KEY_PREF_STATISTICS, true);
return MwmApplication.prefs(context).getBoolean(KEY_PREF_STATISTICS, true);
}
public static void setStatisticsEnabled(boolean enabled)
public static void setStatisticsEnabled(@NonNull Context context, boolean enabled)
{
MwmApplication.prefs().edit().putBoolean(KEY_PREF_STATISTICS, enabled).apply();
MwmApplication.prefs(context).edit().putBoolean(KEY_PREF_STATISTICS, enabled).apply();
}
public static void setShouldShowEmulateBadStorageSetting(boolean show)

6
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -892,8 +892,8 @@ public enum Statistics
Statistics()
{
mEnabled = SharedPropertiesUtils.isStatisticsEnabled();
final Context context = MwmApplication.get();
mEnabled = SharedPropertiesUtils.isStatisticsEnabled(context);
// At the moment we need special handling for Alohalytics to enable/disable logging of events in core C++ code.
if (mEnabled)
org.alohalytics.Statistics.enable(context);
@ -1002,9 +1002,9 @@ public enum Statistics
mMediator.getEventLogger().stopActivity(activity);
}
public void setStatEnabled(boolean isEnabled)
public void setStatEnabled(@NonNull Context context, boolean isEnabled)
{
SharedPropertiesUtils.setStatisticsEnabled(isEnabled);
SharedPropertiesUtils.setStatisticsEnabled(context, isEnabled);
Config.setStatisticsEnabled(isEnabled);
// We track if user turned on/off statistics to understand data better.