From 7ba771c4178e798eaf9501904e773de53b7bb84b Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 6 Aug 2019 18:18:25 +0200
Subject: [PATCH] Moved sharedPreferences accessor to PreferenceUtils.

---
 .../opentracks/content/TrackDataHubTest.java  |  2 +-
 .../services/TrackRecordingServiceTest.java   |  2 +-
 .../opentracks/MarkerListActivity.java        |  2 +-
 .../opentracks/SearchListActivity.java        |  2 +-
 .../opentracks/TrackDetailActivity.java       |  2 +-
 .../opentracks/TrackListActivity.java         |  2 +-
 .../opentracks/content/DataSource.java        |  3 ++-
 .../services/TrackRecordingService.java       |  2 +-
 .../settings/AbstractSettingsActivity.java    |  6 +-----
 .../settings/AdvancedSettingsActivity.java    |  2 +-
 .../opentracks/util/PreferencesUtils.java     | 20 +++++++++++--------
 11 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java
index b4c9c5eda..f783c2483 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java
@@ -80,7 +80,7 @@ public class TrackDataHubTest {
     protected void setUp() {
         context = new MockContext(new MockContentResolver(), new RenamingDelegatingContext(
                 getContext(), getContext(), "test."));
-        sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        sharedPreferences = PreferencesUtils.getSharedPreferences(context);
         contentProviderUtils = AndroidMock.createMock(ContentProviderUtils.class);
         dataSource = AndroidMock.createMock(DataSource.class, context);
         trackDataManager = new TrackDataManager();
diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
index 378ecf748..a4acc2321 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
@@ -140,7 +140,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
 
         providerUtils = ContentProviderUtils.Factory.get(context);
 
-        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
         // Let's use default values.
         sharedPreferences.edit().clear().apply();
 
diff --git a/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java
index 152919e60..fe5fbe7d7 100644
--- a/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java
@@ -129,7 +129,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
         super.onCreate(savedInstanceState);
 
         contentProviderUtils = ContentProviderUtils.Factory.get(this);
-        sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
         long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L);
         track = trackId != -1L ? contentProviderUtils.getTrack(trackId) : null;
diff --git a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
index 4894f22c4..2fed77724 100644
--- a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
@@ -168,7 +168,7 @@ public class SearchListActivity extends AbstractTrackActivity implements DeleteM
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
         contentProviderUtils = ContentProviderUtils.Factory.get(this);
-        sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
         searchEngine = new SearchEngine(contentProviderUtils);
         searchRecentSuggestions = SearchEngineProvider.newHelper(this);
diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
index a5f90165b..83d527602 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
@@ -193,7 +193,7 @@ public class TrackDetailActivity extends AbstractTrackActivity implements Choose
         contentProviderUtils = ContentProviderUtils.Factory.get(this);
         handleIntent(getIntent());
 
-        sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, bindChangedCallback);
         trackDataHub = TrackDataHub.newInstance(this);
diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index 91bd8f03a..044a5cdef 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -269,7 +269,7 @@ public class TrackListActivity extends AbstractTrackActivity implements FileType
         }
 
         contentProviderUtils = ContentProviderUtils.Factory.get(this);
-        sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, bindChangedCallback);
         trackController = new TrackController(this, trackRecordingServiceConnection, true, recordListener, stopListener);
diff --git a/src/main/java/de/dennisguse/opentracks/content/DataSource.java b/src/main/java/de/dennisguse/opentracks/content/DataSource.java
index 9e38e1ba0..d254c4b98 100644
--- a/src/main/java/de/dennisguse/opentracks/content/DataSource.java
+++ b/src/main/java/de/dennisguse/opentracks/content/DataSource.java
@@ -24,6 +24,7 @@ import android.database.ContentObserver;
 import android.net.Uri;
 
 import de.dennisguse.opentracks.Constants;
+import de.dennisguse.opentracks.util.PreferencesUtils;
 
 /**
  * Data source on the phone.
@@ -37,7 +38,7 @@ public class DataSource {
 
     public DataSource(Context context) {
         contentResolver = context.getContentResolver();
-        sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        sharedPreferences = PreferencesUtils.getSharedPreferences(context);
     }
 
     /**
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index e863bfb28..a48536a8f 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -241,7 +241,7 @@ public class TrackRecordingService extends Service {
         locationManagerConnector = new LocationManagerConnector(this, handler.getLooper());
         voiceExecutor = new PeriodicTaskExecutor(this, new AnnouncementPeriodicTaskFactory());
         splitExecutor = new PeriodicTaskExecutor(this, new SplitPeriodicTaskFactory());
-        sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
         sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
 
         // onSharedPreferenceChanged might not set recordingTrackId.
diff --git a/src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java
index 8404e2c23..b65ebe54b 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java
@@ -35,7 +35,7 @@ import de.dennisguse.opentracks.R;
  *
  * @author Jimmy Shih
  */
-public class AbstractSettingsActivity extends PreferenceActivity {
+public abstract class AbstractSettingsActivity extends PreferenceActivity {
 
     @Override
     protected void onCreate(Bundle bundle) {
@@ -47,10 +47,6 @@ public class AbstractSettingsActivity extends PreferenceActivity {
             actionBar.setHomeButtonEnabled(true);
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setSharedPreferencesName(Constants.SETTINGS_NAME);
-        preferenceManager.setSharedPreferencesMode(Context.MODE_PRIVATE);
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/settings/AdvancedSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/AdvancedSettingsActivity.java
index 82f6d7e43..b50472cad 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/AdvancedSettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/AdvancedSettingsActivity.java
@@ -76,7 +76,7 @@ public class AdvancedSettingsActivity extends AbstractSettingsActivity {
         super.onCreate(bundle);
         addPreferencesFromResource(R.xml.settings_advanced);
 
-        sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
         resetPreference = findPreference(getString(R.string.settings_reset_key));
         resetPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
index 8abd731d2..a201be512 100644
--- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
@@ -93,6 +93,10 @@ public class PreferencesUtils {
     private PreferencesUtils() {
     }
 
+    public static SharedPreferences getSharedPreferences(Context context) {
+        return context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+    }
+
     /**
      * Gets a preference key
      *
@@ -111,7 +115,7 @@ public class PreferencesUtils {
      * @param defaultValue the default value
      */
     public static boolean getBoolean(Context context, int keyId, boolean defaultValue) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = getSharedPreferences(context);
         return sharedPreferences.getBoolean(getKey(context, keyId), defaultValue);
     }
 
@@ -123,7 +127,7 @@ public class PreferencesUtils {
      * @param value   the value
      */
     public static void setBoolean(Context context, int keyId, boolean value) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = getSharedPreferences(context);
         Editor editor = sharedPreferences.edit();
         editor.putBoolean(getKey(context, keyId), value);
         editor.apply();
@@ -138,7 +142,7 @@ public class PreferencesUtils {
      */
     public static int getInt(Context context, int keyId, int defaultValue) {
         //NOTE: We assume that the data was stored as String due to use of ListPreference.
-        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = getSharedPreferences(context);
         String stringValue = sharedPreferences.getString(getKey(context, keyId), null);
 
         int intValue = defaultValue;
@@ -157,7 +161,7 @@ public class PreferencesUtils {
      * @param value   the value
      */
     public static void setInt(Context context, int keyId, int value) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = getSharedPreferences(context);
         Editor editor = sharedPreferences.edit();
         editor.putInt(getKey(context, keyId), value);
         editor.apply();
@@ -170,7 +174,7 @@ public class PreferencesUtils {
      * @param keyId   the key id
      */
     public static long getLong(Context context, int keyId) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = getSharedPreferences(context);
         return sharedPreferences.getLong(getKey(context, keyId), -1L);
     }
 
@@ -182,7 +186,7 @@ public class PreferencesUtils {
      * @param value   the value
      */
     public static void setLong(Context context, int keyId, long value) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = getSharedPreferences(context);
         Editor editor = sharedPreferences.edit();
         editor.putLong(getKey(context, keyId), value);
         editor.apply();
@@ -196,7 +200,7 @@ public class PreferencesUtils {
      * @param defaultValue default value
      */
     public static String getString(Context context, int keyId, String defaultValue) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = getSharedPreferences(context);
         return sharedPreferences.getString(getKey(context, keyId), defaultValue);
     }
 
@@ -208,7 +212,7 @@ public class PreferencesUtils {
      * @param value   the value
      */
     public static void setString(Context context, int keyId, String value) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = getSharedPreferences(context);
         Editor editor = sharedPreferences.edit();
         editor.putString(getKey(context, keyId), value);
         editor.apply();