Bugfix: not connecting to heart rate sensor - need to start BluetoothRemoteSensorManager.

Introduced in bc5ab0d7e5

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Report issues of Opentracks features
+title: ''
+labels: potential bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+If applicable:
+* add screenshots
+* add logcat output
+
+**Technical information**
+ - Device: [e.g. Nexus 7 (2013)]
+ - OS: [e.g. LineageOS 15.1]
+ - Version [e.g. v3.2.4]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for OpenTracks
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

DEVELOPER.md

@@ -7,6 +7,10 @@
 3. Manually update _version code_ and _version name_ in `AndroidManifest.xml` (used by FDroid)
 4. Create changelog (`_version code_.txt`)
 5. Create commit with all changes
-6. Push commits
-7. Tag newly create commit with _version name_ (e.g., v3.2.1)
-8. Push the tagged commit to public repository  
+6. Tag newly create commit with _version name_ (e.g., v3.2.1)
+7. Push commits and tags to public repository
+8. Add changelog to tag (Github releases)  
+
+## Translations (localization)
+
+Translations of the OpenTracks are handled in Transifex: [https://www.transifex.com/opentracks](https://www.transifex.com/opentracks/).

fastlane/metadata/android/en-US/changelogs/3123.txt

@@ -0,0 +1,15 @@
+v3.2.5: OpenTracks
+
+Changes:
+- Disable activity change
+- Add permission for Android 10: recording location data
+
+Bugfix:
+- Fix reset settings
+
+Developer:
+- Preferences
+  - if Settings cannot be loaded reset all preferences
+  - moved access to preferences to PreferencesUtil
+  - moved default of preferences from code to xml
+  - use SummaryProvider

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java

@@ -27,7 +27,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
@@ -95,7 +94,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         // A flush happens at the end
         when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(1), eq(TRACK_ID_0))).thenReturn(1);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_1);
-        when(contentProviderUtils.getTrack(PreferencesUtils.getLong(context, R.string.recording_track_id_key))).thenReturn(null);
+        when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
         ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
         expectTrackUpdate(trackCaptor, true, TRACK_ID_0);
 
@@ -124,7 +123,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         // A flush happens at the end
         when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(5), eq(TRACK_ID_0))).thenReturn(5);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_3);
-        when(contentProviderUtils.getTrack(PreferencesUtils.getLong(context, R.string.recording_track_id_key))).thenReturn(null);
+        when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
 
         ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
         expectTrackUpdate(trackCaptor, true, TRACK_ID_0);
@@ -156,7 +155,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         // A flush happens at the end
         when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(5), eq(TRACK_ID_0))).thenReturn(5);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_3);
-        when(contentProviderUtils.getTrack(PreferencesUtils.getLong(context, R.string.recording_track_id_key))).thenReturn(null);
+        when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
 
         ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
         expectTrackUpdate(trackCaptor, true, TRACK_ID_0);
@@ -211,7 +210,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), anyInt(), anyLong())).thenReturn(1);
         when(contentProviderUtils.getFirstTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_0);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_0);
-        when(contentProviderUtils.getTrack(PreferencesUtils.getLong(context, R.string.recording_track_id_key))).thenReturn(null);
+        when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
         contentProviderUtils.deleteTrack(context, TRACK_ID_0);
 
         InputStream inputStream = new ByteArrayInputStream(xml.getBytes());

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java

@@ -27,7 +27,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
@@ -79,7 +78,7 @@ public class KmlFileTrackImporterTest extends AbstractTestFileTrackImporter {
         // A flush happens at the end
         when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(1), eq(TRACK_ID_0))).thenReturn(1);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_1);
-        when(contentProviderUtils.getTrack(PreferencesUtils.getLong(context, R.string.recording_track_id_key))).thenReturn(null);
+        when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
 
         ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
         expectTrackUpdate(trackCaptor, true, TRACK_ID_0);
@@ -110,7 +109,7 @@ public class KmlFileTrackImporterTest extends AbstractTestFileTrackImporter {
         // A flush happens at the end
         when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(5), eq(TRACK_ID_0))).thenReturn(5);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_3);
-        when(contentProviderUtils.getTrack(PreferencesUtils.getLong(context, R.string.recording_track_id_key))).thenReturn(null);
+        when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
 
         ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
         expectTrackUpdate(trackCaptor, true, TRACK_ID_0);

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java

@@ -135,7 +135,7 @@ public class TrackRecordingServiceTest {
         createDummyTrack(trackId, System.currentTimeMillis(), true);
 
         // Clear the number of attempts and set the timeout to 10 min.
-        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_DEFAULT);
+        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
 
         // Start the service in "resume" mode (simulates the on-reboot action).
         Intent startIntent = createStartIntent(context);
@@ -154,7 +154,7 @@ public class TrackRecordingServiceTest {
     @MediumTest
     @Test
     public void testResumeAfterReboot_simulateReboot() throws Exception {
-        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_DEFAULT);
+        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
         ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
         Assert.assertFalse(service.isRecording());
 
@@ -163,7 +163,7 @@ public class TrackRecordingServiceTest {
         Assert.assertTrue(service.isRecording());
         Assert.assertEquals(id, service.getRecordingTrackId());
         mServiceRule.unbindService();
-        Assert.assertEquals(id, PreferencesUtils.getLong(context, R.string.recording_track_id_key));
+        Assert.assertEquals(id, PreferencesUtils.getRecordingTrackId(context));
 
         // Start the service in "resume" mode (simulates the on-reboot action).
 
@@ -184,7 +184,7 @@ public class TrackRecordingServiceTest {
         createDummyTrack(trackId, System.currentTimeMillis(), false);
 
         // Clear the number of attempts and set the timeout to 10 min.
-        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_DEFAULT);
+        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
 
         // Start the service in "resume" mode (simulates the on-reboot action).
         Intent startIntent = createStartIntent(context);
@@ -207,7 +207,7 @@ public class TrackRecordingServiceTest {
         createDummyTrack(trackId, System.currentTimeMillis() - 1500 * 60 * 1000, true);
 
         // Clear the number of attempts and set the timeout to 10 min.
-        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_DEFAULT);
+        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
 
         // Start the service in "resume" mode (simulates the on-reboot action).
         Intent startIntent = createStartIntent(context);
@@ -230,7 +230,7 @@ public class TrackRecordingServiceTest {
         createDummyTrack(trackId, System.currentTimeMillis(), true);
 
         // Set the number of attempts to max.
-        updateAutoResumePrefs(context, TrackRecordingService.MAX_AUTO_RESUME_TRACK_RETRY_ATTEMPTS, PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_DEFAULT);
+        updateAutoResumePrefs(context, TrackRecordingService.MAX_AUTO_RESUME_TRACK_RETRY_ATTEMPTS, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
 
         // Start the service in "resume" mode (simulates the on-reboot action).
         Intent startIntent = createStartIntent(context);
@@ -297,7 +297,7 @@ public class TrackRecordingServiceTest {
         long newTrackId = service.startNewTrack();
         Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, newTrackId);
 
-        Assert.assertEquals(trackId, PreferencesUtils.getLong(context, R.string.recording_track_id_key));
+        Assert.assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context));
         Assert.assertEquals(trackId, service.getRecordingTrackId());
     }
 
@@ -310,7 +310,7 @@ public class TrackRecordingServiceTest {
         // Ending the current track when there is no recording should not result in any error.
         service.endCurrentTrack();
 
-        Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, PreferencesUtils.getLong(context, R.string.recording_track_id_key));
+        Assert.assertFalse(PreferencesUtils.isRecording(context));
         Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, service.getRecordingTrackId());
     }
 

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java

@@ -103,7 +103,7 @@ public class TrackRecordingServiceTestLooper {
     @MediumTest
     @Test
     public void testWithProperties_voiceFrequencyDefault() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.voice_frequency_key, PreferencesUtils.VOICE_FREQUENCY_DEFAULT);
+        PreferencesUtils.setInt(context, R.string.voice_frequency_key, Integer.parseInt(context.getResources().getString(R.string.voice_frequency_default)));
         fullRecordingSession();
     }
 
@@ -125,7 +125,7 @@ public class TrackRecordingServiceTestLooper {
     @MediumTest
     @Test
     public void testWithProperties_maxRecordingDistanceDefault() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.max_recording_distance_key, PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT);
+        PreferencesUtils.setInt(context, R.string.max_recording_distance_key, Integer.parseInt(context.getResources().getString(R.string.max_recording_distance_default)));
         fullRecordingSession();
     }
 
@@ -153,7 +153,7 @@ public class TrackRecordingServiceTestLooper {
     @MediumTest
     @Test
     public void testWithProperties_splitFrequencyDefault() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.split_frequency_key, PreferencesUtils.SPLIT_FREQUENCY_DEFAULT);
+        PreferencesUtils.setInt(context, R.string.split_frequency_key, Integer.parseInt(context.getResources().getString(R.string.split_frequency_default)));
         fullRecordingSession();
     }
 
@@ -174,7 +174,7 @@ public class TrackRecordingServiceTestLooper {
     @MediumTest
     @Test
     public void testWithProperties_metricUnitsDefault() throws TimeoutException {
-        PreferencesUtils.setString(context, R.string.stats_units_key, PreferencesUtils.STATS_UNITS_DEFAULT);
+        PreferencesUtils.setString(context, R.string.stats_units_key, context.getString(R.string.stats_units_default));
         fullRecordingSession();
     }
 
@@ -188,7 +188,7 @@ public class TrackRecordingServiceTestLooper {
     @MediumTest
     @Test
     public void testWithProperties_minRecordingIntervalDefault() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.min_recording_interval_key, PreferencesUtils.MIN_RECORDING_INTERVAL_DEFAULT);
+        PreferencesUtils.setInt(context, R.string.min_recording_interval_key, Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)));
         fullRecordingSession();
     }
 
@@ -225,7 +225,7 @@ public class TrackRecordingServiceTestLooper {
         Track track = providerUtils.getTrack(id);
         Assert.assertNotNull(track);
         Assert.assertEquals(id, track.getId());
-        Assert.assertEquals(id, PreferencesUtils.getLong(context, R.string.recording_track_id_key));
+        Assert.assertEquals(id, PreferencesUtils.getRecordingTrackId(context));
         Assert.assertEquals(id, service.getRecordingTrackId());
 
         // Insert a few points, markers and statistics.

src/main/AndroidManifest.xml

@@ -16,8 +16,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.dennisguse.opentracks"
     android:installLocation="auto"
-    android:versionCode="3101"
-    android:versionName="v3.2.4"> <!-- For FDroid. -->
+    android:versionCode="3123"
+    android:versionName="v3.2.5"> <!-- For FDroid. -->
     <!-- Permission to initialize services -->
     <application
         android:name=".Startup"
@@ -124,6 +124,7 @@ limitations under the License.
             android:name=".services.TrackRecordingService"
             android:enabled="true"
             android:exported="false"
+            android:foregroundServiceType="location|connectedDevice"
             android:icon="@drawable/ic_logo_color_24dp"
             android:label="@string/recording_service" />
     </application>

src/main/java/de/dennisguse/opentracks/AbstractListActivity.java

@@ -65,7 +65,7 @@ public abstract class AbstractListActivity extends AbstractActivity implements C
         if (trackIds.length == 1 && trackIds[0] == -1L) {
             stopRecording = true;
         } else {
-            long recordingTrackId = PreferencesUtils.getLong(this, R.string.recording_track_id_key);
+            long recordingTrackId = PreferencesUtils.getRecordingTrackId(this);
             for (long trackId : trackIds) {
                 if (trackId == recordingTrackId) {
                     stopRecording = true;

src/main/java/de/dennisguse/opentracks/MarkerListActivity.java

@@ -79,11 +79,11 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
             // Note that the key can be null
-            if (key == null || key.equals(PreferencesUtils.getKey(MarkerListActivity.this, R.string.recording_track_id_key))) {
-                recordingTrackId = PreferencesUtils.getLong(MarkerListActivity.this, R.string.recording_track_id_key);
+            if (PreferencesUtils.isKey(MarkerListActivity.this, R.string.recording_track_id_key, key)) {
+                recordingTrackId = PreferencesUtils.getRecordingTrackId(MarkerListActivity.this);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(MarkerListActivity.this, R.string.recording_track_paused_key))) {
-                recordingTrackPaused = PreferencesUtils.getBoolean(MarkerListActivity.this, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+            if (PreferencesUtils.isKey(MarkerListActivity.this, R.string.recording_track_paused_key, key)) {
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(MarkerListActivity.this);
             }
             if (key != null) {
                 runOnUiThread(new Runnable() {

src/main/java/de/dennisguse/opentracks/SearchListActivity.java

@@ -143,14 +143,14 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
     private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (key == null || key.equals(PreferencesUtils.getKey(SearchListActivity.this, R.string.stats_units_key))) {
+            if (PreferencesUtils.isKey(SearchListActivity.this, R.string.stats_units_key, key)) {
                 metricUnits = PreferencesUtils.isMetricUnits(SearchListActivity.this);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(SearchListActivity.this, R.string.recording_track_id_key))) {
-                recordingTrackId = PreferencesUtils.getLong(SearchListActivity.this, R.string.recording_track_id_key);
+            if (PreferencesUtils.isKey(SearchListActivity.this, R.string.recording_track_id_key, key)) {
+                recordingTrackId = PreferencesUtils.getRecordingTrackId(SearchListActivity.this);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(SearchListActivity.this, R.string.recording_track_paused_key))) {
-                recordingTrackPaused = PreferencesUtils.getBoolean(SearchListActivity.this, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+            if (PreferencesUtils.isKey(SearchListActivity.this, R.string.recording_track_paused_key, key)) {
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(SearchListActivity.this);
             }
             if (key != null) {
                 runOnUiThread(new Runnable() {

src/main/java/de/dennisguse/opentracks/TabsAdapter.java

@@ -24,6 +24,7 @@ import android.widget.TabHost;
 import android.widget.TabHost.TabContentFactory;
 import android.widget.TabWidget;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentPagerAdapter;
@@ -79,6 +80,7 @@ public class TabsAdapter extends FragmentPagerAdapter implements TabHost.OnTabCh
     }
 
     @Override
+    @NonNull
     public Fragment getItem(int position) {
         TabInfo info = tabInfos.get(position);
         return Fragment.instantiate(context, info.clss.getName(), info.bundle);

src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java

@@ -94,7 +94,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     // Preferences
     private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
     private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
-    private boolean showOnLockScreen = PreferencesUtils.SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN;
 
     private final Runnable bindChangedCallback = new Runnable() {
         @Override
@@ -125,16 +124,15 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
             sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (key == null || key.equals(PreferencesUtils.getKey(TrackDetailActivity.this, R.string.recording_track_id_key))) {
-                recordingTrackId = PreferencesUtils.getLong(TrackDetailActivity.this, R.string.recording_track_id_key);
+            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.recording_track_id_key, key)) {
+                recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackDetailActivity.this);
             }
 
-            if (key == null || key.equals(PreferencesUtils.getKey(TrackDetailActivity.this, R.string.recording_track_paused_key))) {
-                recordingTrackPaused = PreferencesUtils.getBoolean(TrackDetailActivity.this, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.recording_track_paused_key, key)) {
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(TrackDetailActivity.this);
             }
 
-            if (key == null || key.equals(PreferencesUtils.getKey(TrackDetailActivity.this, R.string.trackdetail_show_on_lockscreen_while_recording_key))) {
-                showOnLockScreen = PreferencesUtils.getBoolean(TrackDetailActivity.this, R.string.trackdetail_show_on_lockscreen_while_recording_key, PreferencesUtils.SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN);
+            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.stats_show_on_lockscreen_while_recording_key, key)) {
                 setLockscreenPolicy();
             }
 
@@ -227,12 +225,14 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     }
 
     private void setLockscreenPolicy() {
+        boolean showOnLockScreen = PreferencesUtils.shouldShowStatsOnLockscreen(TrackDetailActivity.this);
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
             setShowWhenLocked(showOnLockScreen);
+        } else if (showOnLockScreen) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
         } else {
-            if (showOnLockScreen)
-                getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-            else getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
         }
     }
 
@@ -272,7 +272,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putString(CURRENT_TAB_TAG_KEY, tabHost.getCurrentTabTag());
         if (photoUri != null) {

src/main/java/de/dennisguse/opentracks/TrackListActivity.java

@@ -135,22 +135,17 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
             sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (key == null || key.equals(PreferencesUtils.getKey(TrackListActivity.this, R.string.stats_units_key))) {
+            if (PreferencesUtils.isKey(TrackListActivity.this, R.string.stats_units_key, key)) {
                 metricUnits = PreferencesUtils.isMetricUnits(TrackListActivity.this);
             }
-            if (key == null || key.equals(
-                    PreferencesUtils.getKey(TrackListActivity.this, R.string.recording_track_id_key))) {
-                recordingTrackId = PreferencesUtils.getLong(
-                        TrackListActivity.this, R.string.recording_track_id_key);
+            if (PreferencesUtils.isKey(TrackListActivity.this, R.string.recording_track_id_key, key)) {
+                recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackListActivity.this);
                 if (key != null && PreferencesUtils.isRecording(recordingTrackId)) {
                     trackRecordingServiceConnection.startAndBind();
                 }
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(
-                    TrackListActivity.this, R.string.recording_track_paused_key))) {
-                recordingTrackPaused = PreferencesUtils.getBoolean(TrackListActivity.this,
-                        R.string.recording_track_paused_key,
-                        PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+            if (PreferencesUtils.isKey(TrackListActivity.this, R.string.recording_track_paused_key, key)) {
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(TrackListActivity.this);
             }
             if (key != null) {
                 runOnUiThread(new Runnable() {
@@ -226,7 +221,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
 
     private final OnClickListener recordListener = new OnClickListener() {
         public void onClick(View v) {
-            if (recordingTrackId == PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) {
+            if (!PreferencesUtils.isRecording(recordingTrackId)) {
                 // Not recording -> Recording
                 updateMenuItems(false, true);
                 startRecording();

src/main/java/de/dennisguse/opentracks/content/SensorDataSetLocation.java

@@ -28,11 +28,6 @@ public class SensorDataSetLocation extends Location {
 
     private SensorDataSet sensorDataSet = null;
 
-    /**
-     * The id of this location from the provider.
-     */
-    private int id = -1;
-
     public SensorDataSetLocation(Location location, SensorDataSet sensorDataSet) {
         super(location);
         this.sensorDataSet = sensorDataSet;
@@ -50,17 +45,8 @@ public class SensorDataSetLocation extends Location {
         this.sensorDataSet = sensorDataSet;
     }
 
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
     public void reset() {
         super.reset();
         sensorDataSet = null;
-        id = -1;
     }
 }

src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java

@@ -254,13 +254,13 @@ public class TrackDataHub implements DataSourceListener {
         runInHandlerThread(new Runnable() {
             @Override
             public void run() {
-                if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_track_id_key))) {
-                    recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
+                if (PreferencesUtils.isKey(context, R.string.recording_track_id_key, key)) {
+                    recordingTrackId = PreferencesUtils.getRecordingTrackId(context);
                 }
-                if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_track_paused_key))) {
-                    recordingTrackPaused = PreferencesUtils.getBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+                if (PreferencesUtils.isKey(context, R.string.recording_track_paused_key, key)) {
+                    recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(context);
                 }
-                if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.stats_units_key))) {
+                if (PreferencesUtils.isKey(context, R.string.stats_units_key, key)) {
                     metricUnits = PreferencesUtils.isMetricUnits(context);
                     if (key != null) {
                         for (TrackDataListener trackDataListener : trackDataManager.getListeners(TrackDataType.PREFERENCE)) {
@@ -270,7 +270,7 @@ public class TrackDataHub implements DataSourceListener {
                         }
                     }
                 }
-                if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.stats_rate_key))) {
+                if (PreferencesUtils.isKey(context, R.string.stats_rate_key, key)) {
                     reportSpeed = PreferencesUtils.isReportSpeed(context);
                     if (key != null) {
                         for (TrackDataListener trackDataListener : trackDataManager.getListeners(TrackDataType.PREFERENCE)) {
@@ -280,8 +280,8 @@ public class TrackDataHub implements DataSourceListener {
                         }
                     }
                 }
-                if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_gps_accuracy_key))) {
-                    recordingGpsAccuracy = PreferencesUtils.getInt(context, R.string.recording_gps_accuracy_key, PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
+                if (PreferencesUtils.isKey(context, R.string.recording_gps_accuracy_key, key)) {
+                    recordingGpsAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
                     if (key != null) {
                         for (TrackDataListener trackDataListener : trackDataManager.getListeners(TrackDataType.PREFERENCE)) {
                             if (trackDataListener.onRecordingGpsAccuracy(recordingGpsAccuracy)) {
@@ -290,8 +290,8 @@ public class TrackDataHub implements DataSourceListener {
                         }
                     }
                 }
-                if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_distance_interval_key))) {
-                    recordingDistanceInterval = PreferencesUtils.getInt(context, R.string.recording_distance_interval_key, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
+                if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) {
+                    recordingDistanceInterval = PreferencesUtils.getRecordingDistanceInterval(context);
                     if (key != null) {
                         for (TrackDataListener trackDataListener : trackDataManager.getListeners(TrackDataType.PREFERENCE)) {
                             if (trackDataListener.onRecordingDistanceIntervalChanged(recordingDistanceInterval)) {

src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java

@@ -4,7 +4,7 @@ public final class SensorDataSet {
 
     public static final float DATA_UNAVAILABLE = Float.NaN;
 
-    //TODO It might be necessary to consider: sensor if sensor was connected as well.
+    //TODO It might be necessary to consider: if sensor was connected as well.
     public String sensorName;
     public String sensorAddress;
     private float heartRate;

src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java

@@ -263,8 +263,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
             }
             reportSpeed = speed;
             chartView.setReportSpeed(reportSpeed);
-            boolean chartShowSpeed = PreferencesUtils.getBoolean(
-                    getActivity(), R.string.chart_show_speed_key, PreferencesUtils.CHART_SHOW_SPEED_DEFAULT);
+            boolean chartShowSpeed = PreferencesUtils.shouldChartShowSpeed(getActivity());
             setSeriesEnabled(ChartView.SPEED_SERIES, chartShowSpeed && reportSpeed);
             setSeriesEnabled(ChartView.PACE_SERIES, chartShowSpeed && !reportSpeed);
             runOnUiThread(new Runnable() {
@@ -309,24 +308,24 @@ public class ChartFragment extends Fragment implements TrackDataListener {
             reloadTrackDataHub();
             needUpdate = true;
         }
-        if (setSeriesEnabled(ChartView.ELEVATION_SERIES, PreferencesUtils.getBoolean(getActivity(), R.string.chart_show_elevation_key, PreferencesUtils.CHART_SHOW_ELEVATION_DEFAULT))) {
+        if (setSeriesEnabled(ChartView.ELEVATION_SERIES, PreferencesUtils.shouldChartShowElevation(getActivity()))) {
             needUpdate = true;
         }
 
-        boolean chartShowSpeed = PreferencesUtils.getBoolean(getActivity(), R.string.chart_show_speed_key, PreferencesUtils.CHART_SHOW_SPEED_DEFAULT);
+        boolean chartShowSpeed = PreferencesUtils.shouldChartShowSpeed(getActivity());
         if (setSeriesEnabled(ChartView.SPEED_SERIES, chartShowSpeed && reportSpeed)) {
             needUpdate = true;
         }
         if (setSeriesEnabled(ChartView.PACE_SERIES, chartShowSpeed && !reportSpeed)) {
             needUpdate = true;
         }
-        if (setSeriesEnabled(ChartView.POWER_SERIES, PreferencesUtils.getBoolean(getActivity(), R.string.chart_show_power_key, PreferencesUtils.CHART_SHOW_POWER_DEFAULT))) {
+        if (setSeriesEnabled(ChartView.POWER_SERIES, PreferencesUtils.shouldChartShowPower(getActivity()))) {
             needUpdate = true;
         }
-        if (setSeriesEnabled(ChartView.CADENCE_SERIES, PreferencesUtils.getBoolean(getActivity(), R.string.chart_show_cadence_key, PreferencesUtils.CHART_SHOW_CADENCE_DEFAULT))) {
+        if (setSeriesEnabled(ChartView.CADENCE_SERIES, PreferencesUtils.shouldChartShowCadence(getActivity()))) {
             needUpdate = true;
         }
-        if (setSeriesEnabled(ChartView.HEART_RATE_SERIES, PreferencesUtils.getBoolean(getActivity(), R.string.chart_show_heart_rate_key, PreferencesUtils.CHART_SHOW_HEART_RATE_DEFAULT))) {
+        if (setSeriesEnabled(ChartView.HEART_RATE_SERIES, PreferencesUtils.shouldChartShowHeartRate(getActivity()))) {
             needUpdate = true;
         }
         if (needUpdate) {

src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java

@@ -1,6 +1,5 @@
 package de.dennisguse.opentracks.fragments;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -79,19 +78,6 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment implements
         return view;
     }
 
-    /**
-     * TODO: Only used by obsolete Androidx preferences. Remove when onAttach(Context) is called.
-     */
-    @Override
-    public void onAttach(@NonNull Activity activity) {
-        super.onAttach(activity);
-        try {
-            chooseActivityTypeCaller = (ChooseActivityTypeCaller) activity;
-        } catch (ClassCastException e) {
-            throw new ClassCastException(activity + " must implement " + ChooseActivityTypeCaller.class.getSimpleName());
-        }
-    }
-
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         try {

src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java

@@ -67,7 +67,6 @@ public class StatsFragment extends Fragment implements TrackDataListener {
 
     private Location lastLocation = null;
     private TripStatistics lastTripStatistics = null;
-    private SensorDataSet sensorDataSet = null;
 
     private final Runnable updateUIeachSecond = new Runnable() {
         public void run() {
@@ -304,9 +303,10 @@ public class StatsFragment extends Fragment implements TrackDataListener {
      */
     private void updateSensorDataUI() {
         ITrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
+
+        SensorDataSet sensorDataSet = null;
         if (trackRecordingService == null) {
             Log.d(STATS_FRAGMENT_TAG, "Cannot get the track recording service.");
-            sensorDataSet = null;
         } else {
             //TODO sensorState = trackRecordingService.getSensorState();
             sensorDataSet = trackRecordingService.getSensorData();

src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java

@@ -27,7 +27,6 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.TracksColumns;
@@ -100,7 +99,7 @@ public class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
         try {
             Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
             boolean isRecording = PreferencesUtils.isRecording(exportActivity);
-            boolean isPaused = PreferencesUtils.getBoolean(exportActivity, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+            boolean isPaused = PreferencesUtils.isRecordingTrackPaused(exportActivity);
             // Get the wake lock if not recording or paused
             if (!isRecording || isPaused) {
                 wakeLock = SystemUtils.acquireWakeLock(exportActivity, wakeLock);

src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java

@@ -102,7 +102,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
         this.context = context;
         this.importTrackId = importTrackId;
         this.contentProviderUtils = contentProviderUtils;
-        this.recordingDistanceInterval = PreferencesUtils.getInt(context, R.string.recording_distance_interval_key, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
+        this.recordingDistanceInterval = PreferencesUtils.getRecordingDistanceInterval(context);
         trackIds = new ArrayList<>();
         waypoints = new ArrayList<>();
     }

src/main/java/de/dennisguse/opentracks/io/file/importer/ImportAsyncTask.java

@@ -28,7 +28,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
@@ -104,7 +103,7 @@ public class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
             Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
             // Get the wake lock if not recording or paused
             boolean isRecording = PreferencesUtils.isRecording(importActivity);
-            boolean isPaused = PreferencesUtils.getBoolean(importActivity, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+            boolean isPaused = PreferencesUtils.isRecordingTrackPaused(importActivity);
             if (!isRecording || isPaused) {
                 wakeLock = SystemUtils.acquireWakeLock(importActivity, wakeLock);
             }

src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java

@@ -101,7 +101,7 @@ public class KmzTrackImporter implements TrackImporter {
      * @param trackId the trackId
      */
     private void cleanImport(long trackId) {
-        if (trackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) {
+        if (PreferencesUtils.isRecording(trackId)) {
             ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
             contentProviderUtils.deleteTrack(context, trackId);
         }

src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java

@@ -58,7 +58,6 @@ import de.dennisguse.opentracks.content.Waypoint.WaypointType;
 import de.dennisguse.opentracks.content.WaypointCreationRequest;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
-import de.dennisguse.opentracks.services.sensors.RemoteSensorManagerFactory;
 import de.dennisguse.opentracks.services.tasks.AnnouncementPeriodicTaskFactory;
 import de.dennisguse.opentracks.services.tasks.PeriodicTaskExecutor;
 import de.dennisguse.opentracks.services.tasks.SplitPeriodicTaskFactory;
@@ -118,28 +117,28 @@ public class TrackRecordingService extends Service {
     private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_track_id_key))) {
+            if (PreferencesUtils.isKey(context, R.string.recording_track_id_key, key)) {
                 // Only through the TrackRecordingService can one stop a recording and set the recordingTrackId to -1L.
                 if (PreferencesUtils.isRecording(context)) {
-                    recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
+                    recordingTrackId = PreferencesUtils.getRecordingTrackId(context);
                 }
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_track_paused_key))) {
-                recordingTrackPaused = PreferencesUtils.getBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+            if (PreferencesUtils.isKey(context, R.string.recording_track_paused_key, key)) {
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(context);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.stats_units_key))) {
+            if (PreferencesUtils.isKey(context, R.string.stats_units_key, key)) {
                 boolean metricUnits = PreferencesUtils.isMetricUnits(context);
                 voiceExecutor.setMetricUnits(metricUnits);
                 splitExecutor.setMetricUnits(metricUnits);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.voice_frequency_key))) {
-                voiceExecutor.setTaskFrequency(PreferencesUtils.getInt(context, R.string.voice_frequency_key, PreferencesUtils.VOICE_FREQUENCY_DEFAULT));
+            if (PreferencesUtils.isKey(context, R.string.voice_frequency_key, key)) {
+                voiceExecutor.setTaskFrequency(PreferencesUtils.getVoiceFrequency(context));
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.split_frequency_key))) {
-                splitExecutor.setTaskFrequency(PreferencesUtils.getInt(context, R.string.split_frequency_key, PreferencesUtils.SPLIT_FREQUENCY_DEFAULT));
+            if (PreferencesUtils.isKey(context, R.string.split_frequency_key, key)) {
+                splitExecutor.setTaskFrequency(PreferencesUtils.getSplitFrequency(context));
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.min_recording_interval_key))) {
-                int minRecordingInterval = PreferencesUtils.getInt(context, R.string.min_recording_interval_key, PreferencesUtils.MIN_RECORDING_INTERVAL_DEFAULT);
+            if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) {
+                int minRecordingInterval = PreferencesUtils.getMinRecordingInterval(context);
                 switch (minRecordingInterval) {
                     case PreferencesUtils.MIN_RECORDING_INTERVAL_ADAPT_BATTERY_LIFE:
                         // Choose battery life over moving time accuracy.
@@ -153,17 +152,17 @@ public class TrackRecordingService extends Service {
                         locationListenerPolicy = new AbsoluteLocationListenerPolicy(minRecordingInterval * UnitConversions.ONE_SECOND);
                 }
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_distance_interval_key))) {
-                recordingDistanceInterval = PreferencesUtils.getInt(context, R.string.recording_distance_interval_key, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
+            if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) {
+                recordingDistanceInterval = PreferencesUtils.getRecordingDistanceInterval(context);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.max_recording_distance_key))) {
-                maxRecordingDistance = PreferencesUtils.getInt(context, R.string.max_recording_distance_key, PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT);
+            if (PreferencesUtils.isKey(context, R.string.max_recording_distance_key, key)) {
+                maxRecordingDistance = PreferencesUtils.getMaxRecordingDistance(context);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_gps_accuracy_key))) {
-                recordingGpsAccuracy = PreferencesUtils.getInt(context, R.string.recording_gps_accuracy_key, PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
+            if (PreferencesUtils.isKey(context, R.string.recording_gps_accuracy_key, key)) {
+                recordingGpsAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.auto_resume_track_timeout_key))) {
-                autoResumeTrackTimeout = PreferencesUtils.getInt(context, R.string.auto_resume_track_timeout_key, PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_DEFAULT);
+            if (PreferencesUtils.isKey(context, R.string.auto_resume_track_timeout_key, key)) {
+                autoResumeTrackTimeout = PreferencesUtils.getAutoResumeTrackTimeout(context);
             }
         }
     };
@@ -266,7 +265,7 @@ public class TrackRecordingService extends Service {
     @Override
     public void onDestroy() {
         if (remoteSensorManager != null) {
-            RemoteSensorManagerFactory.releaseSystemSensorManager();
+            remoteSensorManager.stop();
             remoteSensorManager = null;
         }
 
@@ -465,17 +464,19 @@ public class TrackRecordingService extends Service {
             return false;
         }
 
-        int retries = PreferencesUtils.getInt(this, R.string.auto_resume_track_current_retry_key, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT);
+        int retries = PreferencesUtils.getAutoResumeTrackCurrentRetryDefault(this);
         if (retries >= MAX_AUTO_RESUME_TRACK_RETRY_ATTEMPTS) {
             Log.d(TAG, "Not resuming. Exceeded maximum retry attempts.");
             return false;
         }
-        PreferencesUtils.setInt(this, R.string.auto_resume_track_current_retry_key, retries + 1);
+        PreferencesUtils.incrementAutoResumeTrackCurrentRetryDefault(this);
 
-        if (autoResumeTrackTimeout == PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_NEVER) {
+        if (autoResumeTrackTimeout == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_never))) {
             Log.d(TAG, "Not resuming. Auto-resume track timeout set to never.");
             return false;
-        } else if (autoResumeTrackTimeout == PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_ALWAYS) {
+        }
+
+        if (autoResumeTrackTimeout == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_always))) {
             Log.d(TAG, "Resuming. Auto-resume track timeout set to always.");
             return true;
         }
@@ -509,13 +510,13 @@ public class TrackRecordingService extends Service {
 
         // Update shared preferences
         updateRecordingState(trackId, false);
-        PreferencesUtils.setInt(this, R.string.auto_resume_track_current_retry_key, 0);
+        PreferencesUtils.resetAutoResumeTrackCurrentRetryDefault(this);
 
         // Update database
         track.setId(trackId);
         track.setName(TrackNameUtils.getTrackName(this, trackId, now));
 
-        String category = PreferencesUtils.getString(this, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+        String category = PreferencesUtils.getDefaultActivity(this);
         track.setCategory(category);
         track.setIcon(TrackIconUtils.getIconValue(this, category));
         track.setTripStatistics(trackTripStatisticsUpdater.getTripStatistics());
@@ -595,7 +596,8 @@ public class TrackRecordingService extends Service {
      */
     private void startRecording(boolean trackStarted) {
         // Update instance variables
-        remoteSensorManager = RemoteSensorManagerFactory.getSystemSensorManager(this);
+        remoteSensorManager = new BluetoothRemoteSensorManager(this);
+        remoteSensorManager.start();
         lastLocation = null;
         currentSegmentHasLocation = false;
         isIdle = false;
@@ -693,7 +695,7 @@ public class TrackRecordingService extends Service {
 
         // Update instance variables
         if (remoteSensorManager != null) {
-            RemoteSensorManagerFactory.releaseSystemSensorManager();
+            remoteSensorManager.stop();
             remoteSensorManager = null;
         }
         lastLocation = null;

src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java

@@ -203,9 +203,9 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
         if (PreferencesUtils.isRecording(context)) {
             PreferencesUtils.setLong(context, R.string.recording_track_id_key, PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
         }
-        boolean recordingTrackPaused = PreferencesUtils.getBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+        boolean recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(context);
         if (!recordingTrackPaused) {
-            PreferencesUtils.setBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+            PreferencesUtils.defaultRecordingTrackPaused(context);
         }
     }
 
@@ -248,7 +248,7 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
             try {
                 if (showEditor) {
                     // Need to remember the recordingTrackId before calling endCurrentTrack() as endCurrentTrack() sets the value to -1L.
-                    long recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
+                    long recordingTrackId = PreferencesUtils.getRecordingTrackId(context);
                     trackRecordingService.endCurrentTrack();
                     if (PreferencesUtils.isRecording(context)) {
                         Intent intent = IntentUtils.newIntent(context, TrackEditActivity.class)

src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java

@@ -36,7 +36,6 @@ import de.dennisguse.opentracks.util.BluetoothUtils;
 
 /**
  * Manages connection to Bluetooth LE heart rate monitor.
- * TODO: shutdown connection.
  */
 public class BluetoothConnectionManager {
 

src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java

@@ -34,7 +34,8 @@ import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
- * Bluetooth sensor manager.
+ * Bluetooth LE sensor manager.
+ * Should only be instantiated once!
  *
  * @author Sandor Dornbush
  */
@@ -49,6 +50,7 @@ public class BluetoothRemoteSensorManager {
     private final Context context;
 
     private final SharedPreferences sharedPreferences;
+
     // Handler that gets information back from the bluetoothConnectionManager
     private final Handler messageHandler = new Handler(Looper.getMainLooper()) {
         @Override
@@ -85,8 +87,8 @@ public class BluetoothRemoteSensorManager {
     private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (bluetoothConnectionManager != null && key == null || key.equals(PreferencesUtils.getKey(context, R.string.bluetooth_sensor_key))) {
-                String address = PreferencesUtils.getString(context, R.string.bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
+            if (bluetoothConnectionManager != null && PreferencesUtils.isKey(context, R.string.settings_sensor_bluetooth_sensor_key, key)) {
+                String address = PreferencesUtils.getString(context, R.string.settings_sensor_bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
                 if (address.equals(PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT)) {
                     stop();
                     return;
@@ -107,7 +109,7 @@ public class BluetoothRemoteSensorManager {
     /**
      * @param context the context
      */
-    BluetoothRemoteSensorManager(Context context) {
+    public BluetoothRemoteSensorManager(Context context) {
         this.context = context;
         sharedPreferences = PreferencesUtils.getSharedPreferences(context);
     }
@@ -182,7 +184,7 @@ public class BluetoothRemoteSensorManager {
             return;
         }
 
-        String address = PreferencesUtils.getString(context, R.string.bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
+        String address = PreferencesUtils.getString(context, R.string.settings_sensor_bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
         if (PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT.equals(address)) {
             Log.w(TAG, "No bluetooth address.");
             return;

src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManagerFactory.java

@@ -1,64 +0,0 @@
-/*
- * Copyright 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.services.sensors;
-
-import android.content.Context;
-
-/**
- * A factory of {@link BluetoothRemoteSensorManager}.
- *
- * @author Sandor Dornbush
- */
-public class RemoteSensorManagerFactory {
-
-    private static BluetoothRemoteSensorManager remoteSensorManagerSystem = null;
-
-
-    private RemoteSensorManagerFactory() {
-    }
-
-    /**
-     * Gets the system sensor manager.
-     *
-     * @param context the context
-     */
-    public static BluetoothRemoteSensorManager getSystemSensorManager(Context context) {
-        releaseSystemSensorManager();
-        remoteSensorManagerSystem = getSensorManager(context);
-        remoteSensorManagerSystem.start();
-        return remoteSensorManagerSystem;
-    }
-
-    /**
-     * Releases the system sensor manager.
-     */
-    public static void releaseSystemSensorManager() {
-        if (remoteSensorManagerSystem != null) {
-            remoteSensorManagerSystem.stop();
-        }
-        remoteSensorManagerSystem = null;
-    }
-
-    /**
-     * Gets the sensor manager.
-     *
-     * @param context the context
-     */
-    private static BluetoothRemoteSensorManager getSensorManager(Context context) {
-        return new BluetoothRemoteSensorManager(context);
-    }
-}

src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java

@@ -32,6 +32,7 @@ import androidx.preference.PreferenceDialogFragmentCompat;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
+import de.dennisguse.opentracks.util.HackUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 
@@ -45,7 +46,7 @@ public class ActivityTypePreference extends DialogPreference {
     private SummaryProvider<DialogPreference> summaryProvider = new SummaryProvider<DialogPreference>() {
         @Override
         public CharSequence provideSummary(DialogPreference preference) {
-            String defaultActivity = PreferencesUtils.getString(ActivityTypePreference.this.getContext(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+            String defaultActivity = PreferencesUtils.getDefaultActivity(ActivityTypePreference.this.getContext());
             return defaultActivity != null && !defaultActivity.equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT) ? defaultActivity : getContext().getString(R.string.value_unknown);
         }
     };
@@ -57,8 +58,7 @@ public class ActivityTypePreference extends DialogPreference {
         setNegativeButtonText(android.R.string.cancel);
         setDialogIcon(null);
         setPersistent(true);
-        //TODO: for some reason the summary is not updated; after changing it. Enable summaryprovider, when fixed.
-//        setSummaryProvider(summaryProvider);
+        setSummaryProvider(summaryProvider);
     }
 
     @Override
@@ -87,7 +87,7 @@ public class ActivityTypePreference extends DialogPreference {
             final Context context = getActivity();
 
             textView = view.findViewById(R.id.activity_type_preference_text_view);
-            String category = PreferencesUtils.getString(context, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+            String category = PreferencesUtils.getDefaultActivity(context);
             textView.setText(category);
             ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(context, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
             textView.setAdapter(adapter);
@@ -132,7 +132,7 @@ public class ActivityTypePreference extends DialogPreference {
         }
 
         private void showIconSelectDialog() {
-            String category = PreferencesUtils.getString(getActivity(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+            String category = PreferencesUtils.getDefaultActivity(getActivity());
             ChooseActivityTypeDialogFragment.showDialog(getActivity().getSupportFragmentManager(), category);
         }
 
@@ -141,7 +141,8 @@ public class ActivityTypePreference extends DialogPreference {
             if (positiveResult) {
                 String newDefaultActivity = textView.getText().toString();
                 if (getPreference().callChangeListener(newDefaultActivity)) {
-                    PreferencesUtils.setString(getActivity(), R.string.default_activity_key, newDefaultActivity);
+                    PreferencesUtils.setDefaultActivity(getActivity(), newDefaultActivity);
+                    HackUtils.invalidatePreference(getPreference());
                 }
             }
         }

src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java

@@ -168,15 +168,12 @@ final class PreferenceHelper {
     static void setAutoResumeTrackTimeoutOptions(Context context, String[] options, String[] values) {
         for (int i = 0; i < values.length; i++) {
             int value = Integer.parseInt(values[i]);
-            switch (value) {
-                case PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_NEVER:
-                    options[i] = context.getString(R.string.value_never);
-                    break;
-                case PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_ALWAYS:
-                    options[i] = context.getString(R.string.value_always);
-                    break;
-                default:
-                    options[i] = context.getString(R.string.value_integer_minute, value);
+            if (value == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_never))) {
+                options[i] = context.getString(R.string.value_never);
+            } else if (value == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_always))) {
+                options[i] = context.getString(R.string.value_always);
+            } else {
+                options[i] = context.getString(R.string.value_integer_minute, value);
             }
         }
     }
@@ -187,7 +184,7 @@ final class PreferenceHelper {
     static void configureBluetoothSensorList(ListPreference preference) {
         Context context = preference.getContext();
 
-        String value = PreferencesUtils.getString(context, R.string.bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
+        String value = PreferencesUtils.getString(context, R.string.settings_sensor_bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
         List<String> devicesNameList = new ArrayList<>();
         List<String> devicesAddressList = new ArrayList<>();
         BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -198,7 +195,7 @@ final class PreferenceHelper {
         // Was the previously configured device unpaired? Then forget it.
         if (!devicesAddressList.contains(value)) {
             value = PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT;
-            PreferencesUtils.setString(context, R.string.bluetooth_sensor_key, value);
+            PreferencesUtils.setString(context, R.string.settings_sensor_bluetooth_sensor_key, value);
         }
 
         devicesNameList.add(0, context.getString(R.string.value_none));

src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.util.AttributeSet;
 import android.widget.Toast;
 
+import androidx.fragment.app.FragmentActivity;
 import androidx.preference.DialogPreference;
 import androidx.preference.PreferenceDialogFragmentCompat;
 
@@ -17,6 +18,10 @@ public class ResetDialogPreference extends DialogPreference {
         super(context, attrs);
     }
 
+    interface ResetCallback {
+        void onReset();
+    }
+
     public static class ResetPreferenceDialog extends PreferenceDialogFragmentCompat {
 
         static PreferenceDialogFragmentCompat newInstance(String preferenceKey) {
@@ -31,9 +36,14 @@ public class ResetDialogPreference extends DialogPreference {
         @Override
         public void onDialogClosed(boolean positiveResult) {
             if (positiveResult) {
-                PreferencesUtils.resetPreferences(getActivity(), true);
+                FragmentActivity activity = getActivity();
 
-                Toast.makeText(getActivity(), R.string.settings_reset_done, Toast.LENGTH_SHORT).show();
+                PreferencesUtils.resetPreferences(activity, true);
+                Toast.makeText(activity, R.string.settings_reset_done, Toast.LENGTH_SHORT).show();
+
+                if (activity instanceof ResetCallback) {
+                    ((ResetCallback) activity).onReset();
+                }
             }
         }
     }

src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java

@@ -2,6 +2,7 @@ package de.dennisguse.opentracks.settings;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -12,12 +13,13 @@ import androidx.preference.PreferenceFragmentCompat;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
+import de.dennisguse.opentracks.util.HackUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 
-public class SettingsActivity extends AppCompatActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller {
+public class SettingsActivity extends AppCompatActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, ResetDialogPreference.ResetCallback {
 
-    private PrefsFragment prefsFragment = new PrefsFragment();
+    private PrefsFragment prefsFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -29,7 +31,7 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
         toolbar.setTitle(R.string.menu_settings);
         setSupportActionBar(toolbar);
 
-        getSupportFragmentManager().beginTransaction().replace(R.id.settings_fragment, prefsFragment).commit();
+        onReset();
     }
 
     @Override
@@ -37,6 +39,12 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
         prefsFragment.setDefaultActivity(iconValue);
     }
 
+    @Override
+    public void onReset() {
+        prefsFragment = new PrefsFragment();
+        getSupportFragmentManager().beginTransaction().replace(R.id.settings_fragment, prefsFragment).commit();
+    }
+
     public static class PrefsFragment extends PreferenceFragmentCompat {
 
         /*
@@ -53,7 +61,7 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
                     }
                 });
 
-                if (key == null || key.equals(PreferencesUtils.getKey(getActivity(), R.string.stats_units_key))) {
+                if (PreferencesUtils.isKey(getActivity(), R.string.stats_units_key, key)) {
                     getActivity().runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
@@ -69,7 +77,15 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
 
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-            setPreferencesFromResource(R.xml.settings, rootKey);
+            try {
+                setPreferencesFromResource(R.xml.settings, rootKey);
+            } catch (ClassCastException e) {
+                // Some sharedPreference is broken: delete all and reset them; it is just a last resort...
+                Toast.makeText(getContext(), R.string.settings_error_initial_values_restored, Toast.LENGTH_LONG).show();
+                PreferencesUtils.resetPreferences(getContext(), true);
+
+                setPreferencesFromResource(R.xml.settings, rootKey);
+            }
             updateUnits();
         }
 
@@ -94,7 +110,6 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
         }
 
         private void configListPreference(int key, int valueArray, boolean metricUnits) {
-            //TODO Can we make values an int array?
             String[] values = getResources().getStringArray(valueArray);
             final String[] options = new String[values.length];
             switch (key) {
@@ -155,13 +170,14 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
             Preference speedCheckBoxPreference = findPreference(getString(R.string.chart_show_speed_key));
             speedCheckBoxPreference.setTitle(PreferencesUtils.isReportSpeed(getActivity()) ? R.string.stats_speed : R.string.stats_pace);
 
-            ListPreference bluetoothPreference = findPreference(getString(R.string.bluetooth_sensor_key));
+            ListPreference bluetoothPreference = findPreference(getString(R.string.settings_sensor_bluetooth_sensor_key));
             PreferenceHelper.configureBluetoothSensorList(bluetoothPreference);
         }
 
         private void updateUnits() {
             boolean metricUnits = PreferencesUtils.isMetricUnits(getActivity());
 
+            //TODO Refactor this!
             configFrequencyPreference(R.string.voice_frequency_key, metricUnits);
             configFrequencyPreference(R.string.split_frequency_key, metricUnits);
             configListPreference(R.string.min_recording_interval_key, R.array.min_recording_interval_values, metricUnits);
@@ -174,9 +190,8 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
             final ListPreference statsRatePreferences = findPreference(getString(R.string.stats_rate_key));
             String[] options = getResources().getStringArray(metricUnits ? R.array.stats_rate_metric_options : R.array.stats_rate_imperial_options);
             statsRatePreferences.setEntries(options);
-            //TODO This is a hack!!! Need to manually updated the summary as otherwise it will only be updated after scrolling down and up again (bring the object out of view).
-            //Check if this is still needed after upgraded PreferenceFragment.
-            statsRatePreferences.setSummary(statsRatePreferences.getEntry());
+
+            HackUtils.invalidatePreference(statsRatePreferences);
         }
     }
 }

src/main/java/de/dennisguse/opentracks/util/HackUtils.java

@@ -0,0 +1,22 @@
+package de.dennisguse.opentracks.util;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+
+public class HackUtils {
+
+    private HackUtils() {
+    }
+
+    /**
+     * Triggers a redraw of the summary of a preference if it was set programmatically.
+     * Need to trigger androidx.preference.preferences.notifyChanged() to trigger a redraw, but method is protected.
+     * This workaround also works when this preference has not changed, but it's entries (see R.string.stats_rate_key).
+     * TODO
+     */
+    public static void invalidatePreference(@NonNull Preference preference) {
+        boolean isEnabled = preference.isEnabled();
+        preference.setEnabled(!isEnabled);
+        preference.setEnabled(isEnabled);
+    }
+}

src/main/java/de/dennisguse/opentracks/util/IntentUtils.java

@@ -70,7 +70,6 @@ public class IntentUtils {
      * @param context  the context
      * @param trackIds the track ids
      */
-    //TODO Share mulitple tracks in different files!
     public static Intent newShareFileIntent(Context context, long[] trackIds) {
         if (trackIds.length == 0) {
             throw new RuntimeException("Need to share at least one track.");

src/main/java/de/dennisguse/opentracks/util/LocationUtils.java

@@ -29,7 +29,6 @@ import de.dennisguse.opentracks.content.Track;
  *
  * @author Leif Hendrik Wilden
  */
-//TODO Cleanup: rename variables
 public class LocationUtils {
 
     private static final String TAG = LocationUtils.class.getSimpleName();

src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceManager;
 
 import de.dennisguse.opentracks.R;
@@ -35,62 +36,36 @@ public class PreferencesUtils {
      * Preferences values.
      * The defaults need to match the defaults in the xml files.
      */
-    public static final int AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT = 0;
-
-    // Values for auto_resume_track_timeout_key
-    public static final int AUTO_RESUME_TRACK_TIMEOUT_ALWAYS = -1;
-    public static final int AUTO_RESUME_TRACK_TIMEOUT_DEFAULT = 10;
-    public static final int AUTO_RESUME_TRACK_TIMEOUT_NEVER = 0;
+    @Deprecated
+    public static final boolean RECORDING_TRACK_PAUSED_DEFAULT = true;
 
     public static final String BLUETOOTH_SENSOR_DEFAULT = "";
 
-    public static final boolean CHART_SHOW_CADENCE_DEFAULT = true;
-    public static final boolean CHART_SHOW_ELEVATION_DEFAULT = true;
-    public static final boolean CHART_SHOW_HEART_RATE_DEFAULT = true;
-    public static final boolean CHART_SHOW_POWER_DEFAULT = true;
-    public static final boolean CHART_SHOW_SPEED_DEFAULT = true;
-    @Deprecated
-    //NOTE: is at the moment still used to determine if a track is currently recorded; better ask the service directly.
-    //NOTE: This is also used to recover from a reboot, but this data should not be exposed to the whole application.
-    public static final long RECORDING_TRACK_ID_DEFAULT = -1L;
-
-    public static final String DEFAULT_ACTIVITY_DEFAULT = "";
-
     // Value for split_frequency_key and voice_frequency_key
+    @Deprecated
     public static final int FREQUENCY_OFF = 0;
 
+    @Deprecated
     public static final int MAX_RECORDING_DISTANCE_DEFAULT = 200;
 
     // Values for min_recording_interval_key
+    @Deprecated
     public static final int MIN_RECORDING_INTERVAL_ADAPT_ACCURACY = -1;
+    @Deprecated
     public static final int MIN_RECORDING_INTERVAL_ADAPT_BATTERY_LIFE = -2;
+    @Deprecated
     public static final int MIN_RECORDING_INTERVAL_DEFAULT = 0;
 
+    @Deprecated
     public static final int RECORDING_DISTANCE_INTERVAL_DEFAULT = 10;
 
     // Values for recording_gps_accuracy
+    @Deprecated
     public static final int RECORDING_GPS_ACCURACY_DEFAULT = 50;
+    @Deprecated
     public static final int RECORDING_GPS_ACCURACY_EXCELLENT = 10;
+    @Deprecated
     public static final int RECORDING_GPS_ACCURACY_POOR = 2000;
-    static final boolean STATS_SHOW_COORDINATE_DEFAULT = false;
-    public static final boolean RECORDING_TRACK_PAUSED_DEFAULT = true;
-
-    public static final int SPLIT_FREQUENCY_DEFAULT = 0;
-    static final boolean STATS_SHOW_ELEVATION_DEFAULT = false;
-    static final String TRACK_NAME_DEFAULT = "DATE_ISO_8601";
-    private static final String CHART_X_AXIS_DEFAULT = "DISTANCE";
-    public static final String STATS_UNITS_DEFAULT = "METRIC";
-    // Stats
-    private static final String STATS_RATE_DEFAULT = "SPEED";
-
-    public static final boolean SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN = false;
-
-    // Track widget
-    public static final int TRACK_WIDGET_ITEM1_DEFAULT = 3; // moving time
-    public static final int TRACK_WIDGET_ITEM2_DEFAULT = 0; // distance
-    public static final int TRACK_WIDGET_ITEM3_DEFAULT = 1; // total time
-    public static final int TRACK_WIDGET_ITEM4_DEFAULT = 2; // average speed
-    public static final int VOICE_FREQUENCY_DEFAULT = 0;
 
     private PreferencesUtils() {
     }
@@ -99,16 +74,63 @@ public class PreferencesUtils {
         return PreferenceManager.getDefaultSharedPreferences(context);
     }
 
+    @Deprecated
+    //NOTE: is at the moment still used to determine if a track is currently recorded; better ask the service directly.
+    //NOTE: This is also used to recover from a reboot, but this data should not be exposed to the whole application.
+    public static final long RECORDING_TRACK_ID_DEFAULT = -1L;
+
+    public static long getRecordingTrackId(Context context) {
+        return PreferencesUtils.getLong(context, R.string.recording_track_id_key, RECORDING_TRACK_ID_DEFAULT);
+    }
+
+
+    @VisibleForTesting
+    public static final int AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT = 0;
+
+    public static int getAutoResumeTrackCurrentRetryDefault(Context context) {
+        return PreferencesUtils.getInt(context, R.string.auto_resume_track_current_retry_key, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT);
+    }
+
+    public static void resetAutoResumeTrackCurrentRetryDefault(Context context) {
+        PreferencesUtils.setInt(context, R.string.auto_resume_track_current_retry_key, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT);
+    }
+
+    public static void incrementAutoResumeTrackCurrentRetryDefault(Context context) {
+        PreferencesUtils.setInt(context, R.string.auto_resume_track_current_retry_key, getAutoResumeTrackCurrentRetryDefault(context) + 1);
+    }
+
+
+    public static final String DEFAULT_ACTIVITY_DEFAULT = "";
+
+    public static String getDefaultActivity(Context context) {
+        return PreferencesUtils.getString(context, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+    }
+
+    public static void setDefaultActivity(Context context, String newDefaultActivity) {
+        PreferencesUtils.setString(context, R.string.default_activity_key, newDefaultActivity);
+    }
+
     /**
      * Gets a preference key
      *
      * @param context the context
      * @param keyId   the key id
      */
-    public static String getKey(Context context, int keyId) {
+    private static String getKey(Context context, int keyId) {
         return context.getString(keyId);
     }
 
+    /**
+     * Compares if keyId and key belong to the same shared preference key.
+     *
+     * @param keyId The resource id of the key
+     * @param key
+     * @return true if key == null or key belongs to keyId
+     */
+    public static boolean isKey(Context context, int keyId, String key) {
+        return key == null || key.equals(PreferencesUtils.getKey(context, keyId));
+    }
+
     /**
      * Gets a boolean preference value.
      *
@@ -180,9 +202,9 @@ public class PreferencesUtils {
      * @param context the context
      * @param keyId   the key id
      */
-    public static long getLong(Context context, int keyId) {
+    private static long getLong(Context context, int keyId, long defaultValue) {
         SharedPreferences sharedPreferences = getSharedPreferences(context);
-        return sharedPreferences.getLong(getKey(context, keyId), -1L);
+        return sharedPreferences.getLong(getKey(context, keyId), defaultValue);
     }
 
     /**
@@ -231,7 +253,8 @@ public class PreferencesUtils {
      * @param context the context
      */
     public static boolean isMetricUnits(Context context) {
-        return STATS_UNITS_DEFAULT.equals(getString(context, R.string.stats_units_key, STATS_UNITS_DEFAULT));
+        final String STATS_UNIT = context.getString(R.string.stats_units_default);
+        return STATS_UNIT.equals(getString(context, R.string.stats_units_key, STATS_UNIT));
     }
 
     /**
@@ -241,20 +264,102 @@ public class PreferencesUtils {
      * @param context the context
      */
     public static boolean isReportSpeed(Context context) {
+        final String STATS_RATE_DEFAULT = context.getString(R.string.stats_rate_default);
         return STATS_RATE_DEFAULT.equals(getString(context, R.string.stats_rate_key, STATS_RATE_DEFAULT));
     }
 
-    /**
-     * Returns true if chart x axis is by distance, false if by time.
-     *
-     * @param context the context
-     */
+    public static int getAutoResumeTrackTimeout(Context context) {
+        final int AUTO_RESUME_TRACK_TIMEOUT = Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default));
+        return PreferencesUtils.getInt(context, R.string.auto_resume_track_timeout_key, AUTO_RESUME_TRACK_TIMEOUT);
+    }
+
+    public static boolean isRecordingTrackPaused(Context context) {
+        final boolean RECORDING_TRACK_PAUSED = context.getResources().getBoolean(R.bool.recording_track_paused_default);
+        return PreferencesUtils.getBoolean(context, R.string.recording_track_paused_key, RECORDING_TRACK_PAUSED);
+    }
+
+    public static void defaultRecordingTrackPaused(Context context) {
+        final boolean RECORDING_TRACK_PAUSED = context.getResources().getBoolean(R.bool.recording_track_paused_default);
+        PreferencesUtils.setBoolean(context, R.string.recording_track_paused_key, RECORDING_TRACK_PAUSED);
+    }
+
     public static boolean isChartByDistance(Context context) {
+        final String CHART_X_AXIS_DEFAULT = context.getString(R.string.chart_x_axis_default);
         return CHART_X_AXIS_DEFAULT.equals(getString(context, R.string.chart_x_axis_key, CHART_X_AXIS_DEFAULT));
     }
 
+    public static boolean shouldChartShowCadence(Context context) {
+        final boolean CHART_SHOW_CADENCE = context.getResources().getBoolean(R.bool.chart_show_cadence_default);
+        return PreferencesUtils.getBoolean(context, R.string.chart_show_cadence_key, CHART_SHOW_CADENCE);
+    }
+
+    public static boolean shouldChartShowElevation(Context context) {
+        final boolean CHART_SHOW_ELEVATION = context.getResources().getBoolean(R.bool.chart_show_elevation_default);
+        return PreferencesUtils.getBoolean(context, R.string.chart_show_elevation_key, CHART_SHOW_ELEVATION);
+    }
+
+    public static boolean shouldChartShowHeartRate(Context context) {
+        final boolean CHART_SHOW_HEARTRATE = context.getResources().getBoolean(R.bool.chart_show_heart_rate_default);
+        return PreferencesUtils.getBoolean(context, R.string.chart_show_heart_rate_key, CHART_SHOW_HEARTRATE);
+    }
+
+    public static boolean shouldChartShowPower(Context context) {
+        final boolean CHART_SHOW_POWER = context.getResources().getBoolean(R.bool.chart_show_power_default);
+        return PreferencesUtils.getBoolean(context, R.string.chart_show_power_key, CHART_SHOW_POWER);
+    }
+
+    public static boolean shouldChartShowSpeed(Context context) {
+        final boolean CHART_SHOW_SPEED = context.getResources().getBoolean(R.bool.chart_show_speed_default);
+        return PreferencesUtils.getBoolean(context, R.string.chart_show_speed_key, CHART_SHOW_SPEED);
+    }
+
+    public static boolean shouldShowStatsOnLockscreen(Context context) {
+        final boolean STATS_SHOW_ON_LOCKSCREEN_DEFAULT = context.getResources().getBoolean(R.bool.stats_show_on_lockscreen_while_recording_default);
+        return getBoolean(context, R.string.stats_show_on_lockscreen_while_recording_key, STATS_SHOW_ON_LOCKSCREEN_DEFAULT);
+    }
+
+    public static boolean isShowStatsGradeElevation(Context context) {
+        final boolean STATS_SHOW_GRADE_ELEVATION = context.getResources().getBoolean(R.bool.stats_show_grade_elevation_default);
+        return PreferencesUtils.getBoolean(context, R.string.stats_show_grade_elevation_key, STATS_SHOW_GRADE_ELEVATION);
+    }
+
+    public static boolean isStatsShowCoordinate(Context context) {
+        final boolean STATS_SHOW_COORDINATE = context.getResources().getBoolean(R.bool.stats_show_coordinate_default);
+        return PreferencesUtils.getBoolean(context, R.string.stats_show_coordinate_key, STATS_SHOW_COORDINATE);
+    }
+
+    public static int getVoiceFrequency(Context context) {
+        final int VOICE_FREQUENCY_DEFAULT = Integer.parseInt(context.getResources().getString(R.string.voice_frequency_default));
+        return PreferencesUtils.getInt(context, R.string.voice_frequency_key, VOICE_FREQUENCY_DEFAULT);
+    }
+
+    public static int getSplitFrequency(Context context) {
+        final int SPLIT_FREQUENCY_DEFAULT = Integer.parseInt(context.getResources().getString(R.string.split_frequency_default));
+        return PreferencesUtils.getInt(context, R.string.split_frequency_key, SPLIT_FREQUENCY_DEFAULT);
+    }
+
+    public static int getRecordingDistanceInterval(Context context) {
+        final int RECORDING_DISTANCE_INTERVAL = Integer.parseInt(context.getResources().getString(R.string.recording_distance_interval_default));
+        return PreferencesUtils.getInt(context, R.string.recording_distance_interval_key, RECORDING_DISTANCE_INTERVAL);
+    }
+
+    public static int getMaxRecordingDistance(Context context) {
+        final int MAX_RECORDING_DISTANCE = Integer.parseInt(context.getResources().getString(R.string.max_recording_distance_default));
+        return PreferencesUtils.getInt(context, R.string.max_recording_distance_key, MAX_RECORDING_DISTANCE);
+    }
+
+    public static int getMinRecordingInterval(Context context) {
+        final int MIN_RECORDING_INTERVAL = Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default));
+        return PreferencesUtils.getInt(context, R.string.min_recording_interval_key, MIN_RECORDING_INTERVAL);
+    }
+
+    public static int getRecordingGPSAccuracy(Context context) {
+        final int RECORDING_GPS_ACCURACY = Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_default));
+        return PreferencesUtils.getInt(context, R.string.recording_gps_accuracy_key, RECORDING_GPS_ACCURACY);
+    }
+
     public static boolean isRecording(Context context) {
-        long recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
+        long recordingTrackId = PreferencesUtils.getRecordingTrackId(context);
         return recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
     }
 
@@ -263,6 +368,10 @@ public class PreferencesUtils {
     }
 
     public static void resetPreferences(Context context, boolean readAgain) {
+        if (readAgain) {
+            // We want to really clear settings now.
+            getSharedPreferences(context).edit().clear().commit();
+        }
         PreferenceManager.setDefaultValues(context, R.xml.settings, readAgain);
     }
 }

src/main/java/de/dennisguse/opentracks/util/StatsUtils.java

@@ -70,7 +70,7 @@ public class StatsUtils {
         }
 
         // Set elevation
-        boolean showGradeElevation = PreferencesUtils.getBoolean(activity, R.string.stats_show_grade_elevation_key, PreferencesUtils.STATS_SHOW_ELEVATION_DEFAULT) && isRecording;
+        boolean showGradeElevation = isRecording && PreferencesUtils.isShowStatsGradeElevation(activity);
         View elevationContainer = activity.findViewById(R.id.stats_elevation);
         elevationContainer.setVisibility(showGradeElevation ? View.VISIBLE : View.GONE);
 
@@ -85,7 +85,7 @@ public class StatsUtils {
         }
 
         // Set coordinate
-        boolean showCoordinate = isRecording && PreferencesUtils.getBoolean(activity, R.string.stats_show_coordinate_key, PreferencesUtils.STATS_SHOW_COORDINATE_DEFAULT);
+        boolean showCoordinate = isRecording && PreferencesUtils.isStatsShowCoordinate(activity);
 
         View coordinateSeparator = activity.findViewById(R.id.stats_coordinate_separator);
         coordinateSeparator.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
@@ -108,7 +108,7 @@ public class StatsUtils {
     public static void setSensorData(Activity activity, SensorDataSet sensorDataSet, boolean isRecording) {
         // heart rate
         int isVisible = View.VISIBLE;
-        if (!isRecording || PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT.equals(PreferencesUtils.getString(activity, R.string.bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT))) {
+        if (!isRecording || PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT.equals(PreferencesUtils.getString(activity, R.string.settings_sensor_bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT))) {
             isVisible = View.INVISIBLE;
         }
         activity.findViewById(R.id.stats_sensor_container).setVisibility(isVisible);
@@ -151,6 +151,7 @@ public class StatsUtils {
     public static void setTripStatisticsValues(Activity activity, TripStatistics tripStatistics, String trackIconValue) {
         boolean metricUnits = PreferencesUtils.isMetricUnits(activity);
         boolean reportSpeed = PreferencesUtils.isReportSpeed(activity);
+        boolean isRecording = PreferencesUtils.isRecording(activity);
 
         // Set total distance
         {
@@ -173,6 +174,7 @@ public class StatsUtils {
             if (trackIconValue != null) {
                 TrackIconUtils.setIconSpinner(spinner, trackIconValue);
             }
+            spinner.setEnabled(isRecording);
         }
 
         // Set time
@@ -241,7 +243,7 @@ public class StatsUtils {
 
         // Set elevation
         {
-            boolean showElevation = PreferencesUtils.getBoolean(activity, R.string.stats_show_grade_elevation_key, PreferencesUtils.STATS_SHOW_ELEVATION_DEFAULT);
+            boolean showElevation = PreferencesUtils.isShowStatsGradeElevation(activity);
             View gradeElevationSeparator = activity.findViewById(R.id.stats_elevation_separator);
             gradeElevationSeparator.setVisibility(showElevation ? View.VISIBLE : View.GONE);
 

src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java

@@ -47,7 +47,7 @@ public class TrackNameUtils {
      * @param startTime the track start time
      */
     public static String getTrackName(Context context, long trackId, long startTime) {
-        String trackName = PreferencesUtils.getString(context, R.string.track_name_key, PreferencesUtils.TRACK_NAME_DEFAULT);
+        String trackName = PreferencesUtils.getString(context, R.string.track_name_key, context.getString(R.string.track_name_default));
 
         if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_local_value))) {
             return StringUtils.formatDateTime(context, startTime);

src/main/res/values/do_not_translate.xml

@@ -15,20 +15,68 @@ limitations under the License.
 -->
 <resources>
     <string name="app_web_url" translatable="false">https://github.com/dennisguse/opentracks</string>
-    <string name="chart_x_axis_distance" translatable="false">DISTANCE</string>
-    <string name="chart_x_axis_time" translatable="false">TIME</string>
+
     <!-- List here all used libraries (will be shown in the about activity -->
     <string name="third_party_libraries" translatable="false"><a href="https://developer.android.com/topic/libraries/support-library/">Google\'s androidX support</a> (Apache License, Version 2.0)</string>
+
     <string name="marker_statistics_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
     <string name="marker_waypoint_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
-    <string name="sensor_type_value_none" translatable="false">NONE</string>
+
     <string name="sensor_unit_beats_per_minute" translatable="false">BPM</string>
-    <string name="settings_recording_track_name_date_iso_8601_value" translatable="false">DATE_ISO_8601</string>
-    <string name="settings_recording_track_name_date_local_value" translatable="false">DATE_LOCAL</string>
-    <string name="settings_recording_track_name_number_value" translatable="false">NUMBER</string>
-    <string name="stats_rate_pace" translatable="false">PACE</string>
-    <string name="stats_rate_speed" translatable="false">SPEED</string>
-    <string name="stats_units_imperial" translatable="false">IMPERIAL</string>
-    <string name="stats_units_metric" translatable="false">METRIC</string>
+
     <string name="value_unknown" translatable="false">-</string>
+
+    <string-array name="waypoint_types">
+        <item>@string/waypoint_type_atm</item>
+        <item>@string/waypoint_type_bank</item>
+        <item>@string/waypoint_type_bar</item>
+        <item>@string/waypoint_type_barbecue</item>
+        <item>@string/waypoint_type_building</item>
+        <item>@string/waypoint_type_bus_stop</item>
+        <item>@string/waypoint_type_cafe</item>
+        <item>@string/waypoint_type_campfire</item>
+        <item>@string/waypoint_type_campground</item>
+        <item>@string/waypoint_type_church</item>
+        <item>@string/waypoint_type_coffee_house</item>
+        <item>@string/waypoint_type_convenience_store</item>
+        <item>@string/waypoint_type_drinking_water</item>
+        <item>@string/waypoint_type_falling_rocks</item>
+        <item>@string/waypoint_type_ferry</item>
+        <item>@string/waypoint_type_fire_place</item>
+        <item>@string/waypoint_type_fire_station</item>
+        <item>@string/waypoint_type_fishing</item>
+        <item>@string/waypoint_type_gas_station</item>
+        <item>@string/waypoint_type_golf_course</item>
+        <item>@string/waypoint_type_grocery_store</item>
+        <item>@string/waypoint_type_hair_dresser</item>
+        <item>@string/waypoint_type_harbor</item>
+        <item>@string/waypoint_type_hiking_path</item>
+        <item>@string/waypoint_type_hotel</item>
+        <item>@string/waypoint_type_house</item>
+        <item>@string/waypoint_type_information</item>
+        <item>@string/waypoint_type_intersection</item>
+        <item>@string/waypoint_type_mail_box</item>
+        <item>@string/waypoint_type_market</item>
+        <item>@string/waypoint_type_meeting_point</item>
+        <item>@string/waypoint_type_opera</item>
+        <item>@string/waypoint_type_parking</item>
+        <item>@string/waypoint_type_police_station</item>
+        <item>@string/waypoint_type_post_office</item>
+        <item>@string/waypoint_type_pothole</item>
+        <item>@string/waypoint_type_railway_crossing</item>
+        <item>@string/waypoint_type_restaurant</item>
+        <item>@string/waypoint_type_shopping</item>
+        <item>@string/waypoint_type_sight</item>
+        <item>@string/waypoint_type_store</item>
+        <item>@string/waypoint_type_swimming_pool</item>
+        <item>@string/waypoint_type_telephone</item>
+        <item>@string/waypoint_type_theater</item>
+        <item>@string/waypoint_type_toilet</item>
+        <item>@string/waypoint_type_tourist_information</item>
+        <item>@string/waypoint_type_tree</item>
+        <item>@string/waypoint_type_tunnel</item>
+        <item>@string/waypoint_type_waterfall</item>
+        <item>@string/waypoint_type_water_fountain</item>
+        <item>@string/waypoint_type_waypoint</item>
+    </string-array>
 </resources>

src/main/res/values/preference_keys.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-    <!-- Keys for persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
-    <string name="auto_resume_track_timeout_key" translatable="false">autoResumeTrackTimeout</string>
-    <string name="chart_show_cadence_key" translatable="false">chartShowCadence</string>
-    <string name="chart_show_elevation_key" translatable="false">chartShowElevation</string>
-    <string name="chart_show_heart_rate_key" translatable="false">chartShowHeartRate</string>
-    <string name="chart_show_power_key" translatable="false">chartShowPower</string>
-    <string name="chart_show_speed_key" translatable="false">chartShowSpeed</string>
-    <string name="chart_x_axis_key" translatable="false">chartXAxis</string>
-    <string name="default_activity_key" translatable="false">defaultActivity</string>
-    <string name="max_recording_distance_key" translatable="false">maxRecordingDistance</string>
-    <string name="min_recording_interval_key" translatable="false">minRecordingInterval</string>
-    <string name="recording_distance_interval_key" translatable="false">recordingDistanceInterval</string>
-    <string name="recording_gps_accuracy_key" translatable="false">recordingGpsAccuracy</string>
-    <string name="split_frequency_key" translatable="false">splitFrequency</string>
-
-    <string name="stats_rate_key" translatable="false">statsRate</string>
-    <string name="stats_show_coordinate_key" translatable="false">statsShowCoordinate</string>
-    <string name="stats_show_grade_elevation_key" translatable="false">statsShowGradeElevation</string>
-    <string name="stats_units_key" translatable="false">statsUnits</string>
-    <string name="trackdetail_show_on_lockscreen_while_recording_key" translatable="false">trackdetail_show_on_lockscreen_while_recording</string>
-    <string name="track_name_key" translatable="false">trackName</string>
-    <string name="voice_frequency_key" translatable="false">voiceFrequency</string>
-    <!-- Keys for persistend preferences. But they should not get backed up or restored. -->
-    <string name="auto_resume_track_current_retry_key" translatable="false">autoResumeTrackCurrentRetry</string>
-    <string name="bluetooth_sensor_key" translatable="false">bluetoothSensor</string>
-    <string name="recording_track_id_key" translatable="false">recordingTrackId</string>
-    <string name="recording_track_paused_key" translatable="false">recordingTrackPaused</string>
-    <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
-    <string name="settings_recording_key" translatable="false">settingsRecording</string>
-    <string name="settings_reset_key" translatable="false">settingsReset</string>
-    <string name="settings_sensor_bluetooth_pairing_key" translatable="false">settingsSensorBluetoothPairing</string>
-    <string name="settings_stats_key" translatable="false">settingsStats</string>
-</resources>

src/main/res/values/preferences_internal.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <!-- Keys for persisted preferences that are used by internally. -->
+    <!--But they should not get backed up or restored.-->
+    <string name="auto_resume_track_current_retry_key" translatable="false">autoResumeTrackCurrentRetry</string>
+    <string name="recording_track_id_key" translatable="false">recordingTrackId</string>
+
+    <string name="recording_track_paused_key" translatable="false">recordingTrackPaused</string>
+    <bool name="recording_track_paused_default" translatable="false">true</bool>
+</resources>

src/main/res/values/settings.xml

@@ -1,20 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Do not translate any arrays in this file. -->
+    <!-- Do not translate anything in this file directly. -->
+    <string name="chart_show_cadence_key" translatable="false">chartShowCadence</string>
+    <bool name="chart_show_cadence_default" translatable="false">true</bool>
+
+    <string name="chart_show_elevation_key" translatable="false">chartShowElevation</string>
+    <bool name="chart_show_elevation_default" translatable="false">true</bool>
+
+    <string name="chart_show_heart_rate_key" translatable="false">chartShowHeartRate</string>
+    <bool name="chart_show_heart_rate_default" translatable="false">true</bool>
+
+    <string name="chart_show_power_key" translatable="false">chartShowPower</string>
+    <bool name="chart_show_power_default" translatable="false">true</bool>
+
+    <string name="chart_show_speed_key" translatable="false">chartShowSpeed</string>
+    <bool name="chart_show_speed_default" translatable="false">true</bool>
+
+    <string name="stats_show_coordinate_key" translatable="false">statsShowCoordinate</string>
+    <bool name="stats_show_coordinate_default" translatable="false">false</bool>
+
+    <string name="stats_show_grade_elevation_key" translatable="false">statsShowGradeElevation</string>
+    <bool name="stats_show_grade_elevation_default" translatable="false">false</bool>
+
+    <string name="stats_show_on_lockscreen_while_recording_key" translatable="false">trackdetail_show_on_lockscreen_while_recording</string>
+    <bool name="stats_show_on_lockscreen_while_recording_default" translatable="false">false</bool>
+
+    <string name="settings_reset_key" translatable="false">settingsReset</string>
+
+    <string name="settings_sensor_bluetooth_sensor_key" translatable="false">bluetoothSensor</string>
+    <string name="settings_sensor_bluetooth_pairing_key" translatable="false">settingsSensorBluetoothPairing</string>
+    <string name="sensor_type_value_none" translatable="false">NONE</string>
+
+    <string name="default_activity_key" translatable="false">defaultActivity</string>
     <string-array name="activity_types">
         <item>@string/activity_type_airplane</item>
         <item>@string/activity_type_atv</item>
@@ -83,23 +100,39 @@ limitations under the License.
         <item>@string/activity_type_water_skiing</item>
         <item>@string/activity_type_wind_surfing</item>
     </string-array>
+
+    <string name="auto_resume_track_timeout_key" translatable="false">autoResumeTrackTimeout</string>
+    <string name="auto_resume_track_timeout_default" translatable="false">10</string>
+    <string name="auto_resume_track_timeout_always" translatable="false">-1</string>
+    <string name="auto_resume_track_timeout_never" translatable="false">0</string>
     <string-array name="auto_resume_track_timeout_values">
-        <item>0</item>
+        <item>@string/auto_resume_track_timeout_never</item>
         <item>5</item>
-        <item>10</item>
+        <item>@string/auto_resume_track_timeout_default</item>
         <item>15</item>
-        <item>-1</item>
-    </string-array>
-    <string-array name="chart_x_axis_options">
-        <item>@string/settings_chart_by_distance</item>
-        <item>@string/settings_chart_by_time</item>
+        <item>@string/auto_resume_track_timeout_always</item>
     </string-array>
+
+    <string name="chart_x_axis_key" translatable="false">chartXAxis</string>
+    <string name="chart_x_axis_default" translatable="false">@string/chart_x_axis_distance</string>
     <string-array name="chart_x_axis_values">
         <item>@string/chart_x_axis_distance</item>
         <item>@string/chart_x_axis_time</item>
     </string-array>
+    <string name="chart_x_axis_time" translatable="false">TIME</string>
+    <string name="chart_x_axis_distance" translatable="false">DISTANCE</string>
+    <string-array name="chart_x_axis_options">
+        <item>@string/settings_chart_by_distance</item>
+        <item>@string/settings_chart_by_time</item>
+    </string-array>
+
+    <string name="split_frequency_key" translatable="false">splitFrequency</string>
+    <string name="split_frequency_default" translatable="false">@string/frequency_default</string>
+    <string name="voice_frequency_key" translatable="false">voiceFrequency</string>
+    <string name="voice_frequency_default" translatable="false">@string/frequency_default</string>
+    <string name="frequency_default" translatable="false">0</string>
     <string-array name="frequency_values">
-        <item>0</item>
+        <item>@string/frequency_default</item>
         <item>1</item>
         <item>2</item>
         <item>5</item>
@@ -114,18 +147,38 @@ limitations under the License.
         <item>-50</item>
         <item>-100</item>
     </string-array>
+
+    <string name="recording_distance_interval_key" translatable="false">recordingDistanceInterval</string>
+    <string name="recording_distance_interval_default" translatable="false">10</string>
+    <string-array name="recording_distance_interval_values">
+        <item>1</item>
+        <item>2</item>
+        <item>5</item>
+        <item>@string/recording_distance_interval_default</item>
+        <item>20</item>
+        <item>50</item>
+        <item>100</item>
+    </string-array>
+
+    <string name="max_recording_distance_key" translatable="false">maxRecordingDistance</string>
+    <string name="max_recording_distance_default" translatable="false">200</string>
     <string-array name="max_recording_distance_values">
         <item>50</item>
         <item>100</item>
-        <item>200</item>
+        <item>@string/max_recording_distance_default</item>
         <item>500</item>
         <item>1000</item>
         <item>5000</item>
     </string-array>
+
+    <string name="min_recording_interval_key" translatable="false">minRecordingInterval</string>
+    <string name="min_recording_interval_default" translatable="false">0</string>
+    <string name="min_recording_interval_adapt_accuracy" translatable="false">-1</string>
+    <string name="min_recording_interval_adapt_battery_life" translatable="false">-2</string>
     <string-array name="min_recording_interval_values">
-        <item>-2</item>
-        <item>-1</item>
-        <item>0</item>
+        <item>@string/min_recording_interval_adapt_battery_life</item>
+        <item>@string/min_recording_interval_adapt_accuracy</item>
+        <item>@string/min_recording_interval_default</item>
         <item>2</item>
         <item>3</item>
         <item>4</item>
@@ -140,26 +193,25 @@ limitations under the License.
         <item>900</item>
         <item>1800</item>
     </string-array>
-    <string-array name="recording_distance_interval_values">
-        <item>1</item>
-        <item>2</item>
-        <item>5</item>
-        <item>10</item>
-        <item>20</item>
-        <item>50</item>
-        <item>100</item>
-    </string-array>
+
+    <string name="recording_gps_accuracy_key" translatable="false">recordingGpsAccuracy</string>
+    <string name="recording_gps_accuracy_default" translatable="false">50</string>
+    <string name="recording_gps_accuracy_excellent" translatable="false">10</string>
+    <string name="recording_gps_accuracy_poor" translatable="false">2000</string>
     <string-array name="recording_gps_accuracy_values">
-        <item>10</item>
+        <item>@string/recording_gps_accuracy_excellent</item>
         <item>20</item>
         <item>30</item>
-        <item>50</item>
+        <item>@string/recording_gps_accuracy_default</item>
         <item>100</item>
         <item>200</item>
         <item>500</item>
         <item>1000</item>
-        <item>2000</item>
+        <item>@string/recording_gps_accuracy_poor</item>
     </string-array>
+
+    <string name="stats_rate_key" translatable="false">statsRate</string>
+    <string name="stats_rate_default" translatable="false">@string/stats_rate_speed</string>
     <string-array name="stats_rate_imperial_options">
         <item>@string/description_speed_imperial</item>
         <item>@string/description_pace_imperial</item>
@@ -168,79 +220,40 @@ limitations under the License.
         <item>@string/description_speed_metric</item>
         <item>@string/description_pace_metric</item>
     </string-array>
+
+    <string name="stats_rate_pace" translatable="false">PACE</string>
+    <string name="stats_rate_speed" translatable="false">SPEED</string>
     <string-array name="stats_rate_values">
         <item>@string/stats_rate_speed</item>
         <item>@string/stats_rate_pace</item>
     </string-array>
+
+    <string name="stats_units_key" translatable="false">statsUnits</string>
+    <string name="stats_units_default" translatable="false">@string/stats_units_metric</string>
+    <string-array name="stats_units_values">
+        <item>@string/stats_units_metric</item>
+        <item>@string/stats_units_imperial</item>
+    </string-array>
+    <string name="stats_units_metric" translatable="false">METRIC</string>
+    <string name="stats_units_imperial" translatable="false">IMPERIAL</string>
     <string-array name="stats_units_options">
         <item>@string/settings_stats_units_metric</item>
         <item>@string/settings_stats_units_imperial</item>
     </string-array>
-    <string-array name="stats_units_values">
-        <item>@string/stats_units_metric</item>
-        <item>@string/stats_units_imperial</item>
+
+    <string name="track_name_key" translatable="false">trackName</string>
+    <string name="track_name_default" translatable="false">@string/settings_recording_track_name_date_iso_8601_value</string>
+    <string name="settings_recording_track_name_date_iso_8601_value" translatable="false">DATE_ISO_8601</string>
+    <string name="settings_recording_track_name_date_local_value" translatable="false">DATE_LOCAL</string>
+    <string name="settings_recording_track_name_number_value" translatable="false">NUMBER</string>
+    <string-array name="track_name_values">
+        <item>@string/settings_recording_track_name_date_local_value</item>
+        <item>@string/settings_recording_track_name_date_iso_8601_value</item>
+        <item>@string/settings_recording_track_name_number_value</item>
     </string-array>
     <string-array name="track_name_options">
         <item>@string/settings_recording_track_name_date_local_option</item>
         <item>@string/settings_recording_track_name_date_iso_8601_option</item>
         <item>@string/settings_recording_track_name_number_option</item>
     </string-array>
-    <string-array name="track_name_values">
-        <item>@string/settings_recording_track_name_date_local_value</item>
-        <item>@string/settings_recording_track_name_date_iso_8601_value</item>
-        <item>@string/settings_recording_track_name_number_value</item>
-    </string-array>
-    <string-array name="waypoint_types">
-        <item>@string/waypoint_type_atm</item>
-        <item>@string/waypoint_type_bank</item>
-        <item>@string/waypoint_type_bar</item>
-        <item>@string/waypoint_type_barbecue</item>
-        <item>@string/waypoint_type_building</item>
-        <item>@string/waypoint_type_bus_stop</item>
-        <item>@string/waypoint_type_cafe</item>
-        <item>@string/waypoint_type_campfire</item>
-        <item>@string/waypoint_type_campground</item>
-        <item>@string/waypoint_type_church</item>
-        <item>@string/waypoint_type_coffee_house</item>
-        <item>@string/waypoint_type_convenience_store</item>
-        <item>@string/waypoint_type_drinking_water</item>
-        <item>@string/waypoint_type_falling_rocks</item>
-        <item>@string/waypoint_type_ferry</item>
-        <item>@string/waypoint_type_fire_place</item>
-        <item>@string/waypoint_type_fire_station</item>
-        <item>@string/waypoint_type_fishing</item>
-        <item>@string/waypoint_type_gas_station</item>
-        <item>@string/waypoint_type_golf_course</item>
-        <item>@string/waypoint_type_grocery_store</item>
-        <item>@string/waypoint_type_hair_dresser</item>
-        <item>@string/waypoint_type_harbor</item>
-        <item>@string/waypoint_type_hiking_path</item>
-        <item>@string/waypoint_type_hotel</item>
-        <item>@string/waypoint_type_house</item>
-        <item>@string/waypoint_type_information</item>
-        <item>@string/waypoint_type_intersection</item>
-        <item>@string/waypoint_type_mail_box</item>
-        <item>@string/waypoint_type_market</item>
-        <item>@string/waypoint_type_meeting_point</item>
-        <item>@string/waypoint_type_opera</item>
-        <item>@string/waypoint_type_parking</item>
-        <item>@string/waypoint_type_police_station</item>
-        <item>@string/waypoint_type_post_office</item>
-        <item>@string/waypoint_type_pothole</item>
-        <item>@string/waypoint_type_railway_crossing</item>
-        <item>@string/waypoint_type_restaurant</item>
-        <item>@string/waypoint_type_shopping</item>
-        <item>@string/waypoint_type_sight</item>
-        <item>@string/waypoint_type_store</item>
-        <item>@string/waypoint_type_swimming_pool</item>
-        <item>@string/waypoint_type_telephone</item>
-        <item>@string/waypoint_type_theater</item>
-        <item>@string/waypoint_type_toilet</item>
-        <item>@string/waypoint_type_tourist_information</item>
-        <item>@string/waypoint_type_tree</item>
-        <item>@string/waypoint_type_tunnel</item>
-        <item>@string/waypoint_type_waterfall</item>
-        <item>@string/waypoint_type_water_fountain</item>
-        <item>@string/waypoint_type_waypoint</item>
-    </string-array>
 </resources>

src/main/res/values/strings.xml

@@ -1219,7 +1219,11 @@ limitations under the License.
     All settings have been reverted to the default values
   </string>
 
-    <!-- Settings Sensor -->
+  <string name="settings_error_initial_values_restored" translation_description="If the ">
+    Sorry, but an error occurred: and the all settings were reset to there default values.
+  </string>
+
+  <!-- Settings Sensor -->
     <string name="settings_sensor" translation_description="In the 'Settings' page, the option to change the sensor settings.
 
       Character limit: ~26 (1 line)">

src/main/res/xml/settings.xml

@@ -14,44 +14,45 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/menu_settings">
 
     <PreferenceCategory android:title="@string/track_detail_stats_tab">
         <ListPreference
-            android:defaultValue="@string/stats_units_metric"
+            android:defaultValue="@string/stats_units_default"
             android:entries="@array/stats_units_options"
             android:entryValues="@array/stats_units_values"
             android:key="@string/stats_units_key"
-            android:summary="%s"
-            android:title="@string/settings_stats_units_title" />
+            android:title="@string/settings_stats_units_title"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="@string/stats_rate_speed"
+            android:defaultValue="@string/stats_rate_default"
             android:entries="@array/stats_rate_metric_options"
             android:entryValues="@array/stats_rate_values"
             android:key="@string/stats_rate_key"
-            android:summary="%s"
-            android:title="@string/settings_stats_rate_title" />
+            android:title="@string/settings_stats_rate_title"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/settings_show">
         <CheckBoxPreference
-            android:defaultValue="false"
+            android:defaultValue="@bool/stats_show_grade_elevation_default"
             android:key="@string/stats_show_grade_elevation_key"
             android:title="@string/settings_stats_grade_elevation" />
         <CheckBoxPreference
-            android:defaultValue="false"
+            android:defaultValue="@bool/stats_show_coordinate_default"
             android:key="@string/stats_show_coordinate_key"
             android:title="@string/settings_stats_coordinate" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/track_detail_chart_tab">
         <ListPreference
-            android:defaultValue="@string/chart_x_axis_distance"
+            android:defaultValue="@string/chart_x_axis_default"
             android:entries="@array/chart_x_axis_options"
             android:entryValues="@array/chart_x_axis_values"
             android:key="@string/chart_x_axis_key"
-            android:summary="%s"
-            android:title="@string/settings_chart_x_axis" />
+            android:title="@string/settings_chart_x_axis"
+            app:useSimpleSummaryProvider="true" />
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/chart_show_elevation_key"
@@ -68,73 +69,72 @@ limitations under the License.
 
     <PreferenceCategory android:title="@string/settings_recording">
         <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="@string/trackdetail_show_on_lockscreen_while_recording_key"
+            android:defaultValue="@bool/stats_show_on_lockscreen_while_recording_default"
+            android:key="@string/stats_show_on_lockscreen_while_recording_key"
             android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary"
             android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />
         <ListPreference
-            android:defaultValue="0"
+            android:defaultValue="@string/voice_frequency_default"
             android:entryValues="@array/frequency_values"
             android:key="@string/voice_frequency_key"
-            android:summary="%s"
-            android:title="@string/menu_voice_frequency" />
+            android:title="@string/menu_voice_frequency"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="0"
+            android:defaultValue="@string/split_frequency_default"
             android:entryValues="@array/frequency_values"
             android:key="@string/split_frequency_key"
-            android:summary="%s"
-            android:title="@string/menu_split_frequency" />
+            android:title="@string/menu_split_frequency"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="@string/settings_recording_track_name_date_iso_8601_value"
+            android:defaultValue="@string/track_name_default"
             android:entries="@array/track_name_options"
             android:entryValues="@array/track_name_values"
             android:key="@string/track_name_key"
-            android:summary="%s"
-            android:title="@string/settings_recording_track_name_title" />
+            android:title="@string/settings_recording_track_name_title"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
             android:defaultValue="0"
             android:entryValues="@array/min_recording_interval_values"
             android:key="@string/min_recording_interval_key"
-            android:summary="%s"
-            android:title="@string/settings_recording_min_recording_interval_title" />
+            android:title="@string/settings_recording_min_recording_interval_title"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="10"
+            android:defaultValue="@string/recording_distance_interval_default"
             android:entryValues="@array/recording_distance_interval_values"
             android:key="@string/recording_distance_interval_key"
-            android:summary="%s"
-            android:title="@string/settings_recording_min_recording_distance_title" />
+            android:title="@string/settings_recording_min_recording_distance_title"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="200"
+            android:defaultValue="@string/max_recording_distance_default"
             android:entryValues="@array/max_recording_distance_values"
             android:key="@string/max_recording_distance_key"
-            android:summary="%s"
-            android:title="@string/settings_recording_max_recording_distance_title" />
+            android:title="@string/settings_recording_max_recording_distance_title"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
             android:defaultValue="50"
             android:entryValues="@array/recording_gps_accuracy_values"
             android:key="@string/recording_gps_accuracy_key"
-            android:summary="%s"
-            android:title="@string/settings_recording_min_required_accuracy_title" />
+            android:title="@string/settings_recording_min_required_accuracy_title"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
             android:defaultValue="10"
             android:entries="@array/auto_resume_track_timeout_values"
             android:entryValues="@array/auto_resume_track_timeout_values"
             android:key="@string/auto_resume_track_timeout_key"
-            android:summary="%s"
-            android:title="@string/settings_recording_auto_resume_track_timeout_title" />
+            android:title="@string/settings_recording_auto_resume_track_timeout_title"
+            app:useSimpleSummaryProvider="true" />
         <de.dennisguse.opentracks.settings.ActivityTypePreference
             android:defaultValue="@string/activity_type_running"
             android:key="@string/default_activity_key"
             android:title="@string/settings_recording_default_activity_title" />
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:title="@string/settings_sensor">
+    <PreferenceCategory android:title="@string/settings_sensor">
         <ListPreference
             android:defaultValue="@string/sensor_type_value_none"
-            android:key="@string/bluetooth_sensor_key"
-            android:summary="%s"
-            android:title="@string/settings_sensor_bluetooth_sensor" />
+            android:key="@string/settings_sensor_bluetooth_sensor_key"
+            android:title="@string/settings_sensor_bluetooth_sensor"
+            app:useSimpleSummaryProvider="true" />
         <Preference
             android:key="@string/settings_sensor_bluetooth_pairing_key"
             android:persistent="false"
@@ -159,8 +159,8 @@ limitations under the License.
 
     <PreferenceCategory android:title="@string/settings_reset">
         <de.dennisguse.opentracks.settings.ResetDialogPreference
-            android:dialogTitle="@string/settings_reset_confirm_title"
             android:dialogMessage="@string/settings_reset_confirm_message"
+            android:dialogTitle="@string/settings_reset_confirm_title"
             android:key="@string/settings_reset_key"
             android:negativeButtonText="@string/generic_cancel"
             android:persistent="false"