Bugfix: crash if heart rate sensor was null (i.e., preference not initialized).

Initialization of looper was missing.

.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.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,10 @@
+# Thanks for your contribution.
+
+**Describe the pull request**
+A clear and concise description of what the pull request changes/adds.
+
+**Link to the the issue**
+(If available): The link to the issue that this pull request solves.
+
+**License agreement**
+By opening this pull request, you are providing your contribution under the _Apache License 2.0_ (see [LICENSE.md](LICENSE.md)).

.idea/render.experimental.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RenderSettings">
+    <option name="showDecorations" value="true" />
+  </component>
+</project>

.travis.yml

@@ -1,12 +1,45 @@
+#See https://docs.travis-ci.com/user/languages/android/
+#See https://github.com/ankidroid/Anki-Android/blob/master/.travis.yml
 language: android
-dist: trusty
+
+env:
+  global:
+    - ADB_INSTALL_TIMEOUT=8
+    - ABI=armeabi-v7a
+    - EMU_FLAVOR=default
+    # PATH order is incredibly important. e.g. the 'emulator' script exists in more than one place!
+    - ANDROID_HOME=/usr/local/android-sdk
+    - TOOLS=${ANDROID_HOME}/tools
+    - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
+  matrix:
+    - API=27 ABI=x86_64
 
 android:
   components:
+    # installing tools to start, then use `sdkmanager` below to get the rest
+    - tools
     - build-tools-28.0.3
-    - android-29
+    - android-28
+
+# Emulator Management: Create, Start and Wait
+install:
+  - echo y | sdkmanager "platform-tools"
+  - echo y | sdkmanager --channel=4 "emulator"
+  - echo y | sdkmanager "system-images;android-$API;$EMU_FLAVOR;$ABI"
+  - echo no | avdmanager create avd --force -n test -k "system-images;android-$API;$EMU_FLAVOR;$ABI" -c 10M
+  - emulator -verbose -avd test -no-accel -no-snapshot -no-window -camera-back none -camera-front none -selinux permissive -qemu -m 2048 &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
 
 script:
-  - ./gradlew build
+  - ./gradlew clean build
-  #TODO: When all tests are passing, CI should also execute them.
+  - ./gradlew connectedCheck
-  #- ./gradlew connectedCheck
+
+sbefore_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache

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
+6. Tag newly create commit with _version name_ (e.g., v3.2.1)
-7. Tag newly create commit with _version name_ (e.g., v3.2.1)
+7. Push commits and tags to public repository
-8. Push the tagged commit 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/).

README.md

@@ -30,6 +30,14 @@ To show your tracks on a map, a 3rd party application (e.g., [OsmAnd](https://pl
     <img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="45">
 </a>
 
+## Screenshots
+<div>
+    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_1.png">
+    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_2.png">
+    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_3.png">
+    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_4.png">
+</div>
+
 ## Project history
 
 _OpenTracks_ is based upon Google _My Tracks app_ ([code](https://code.google.com/archive/p/mytracks/)).

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
     }
 }
 
@@ -35,10 +35,14 @@ def getVersionName = { ->
     try {
         def stdout = new ByteArrayOutputStream()
         exec {
-            commandLine 'git', 'describe', '--tags', '--dirty'
+            commandLine 'git', 'describe', '--tags'
             standardOutput = stdout
         }
-        return stdout.toString().trim()
+        exec {
+            commandLine 'git', 'log', '--format="%h"', '-n 1'
+            standardOutput = stdout
+        }
+        return stdout.toString().replace('\n', '-').replace('"', '').trim()
     }
     catch (ignored) {
         return null
@@ -75,10 +79,6 @@ android {
     applicationVariants.all { variant ->
         variant.resValue "string", "applicationId", variant.applicationId
     }
-
-    lintOptions {
-        disable "AppCompatResource" // TODO Disable complaint to use androidx's SearchView as it is null.
-    }
 }
 
 dependencies {

fastlane/metadata/android/de-DE/full_description.txt

@@ -1,4 +1,4 @@
-Open Tracks – ein GPS-Tracker, der deine Daten für sich behält.
+OpenTracks – ein GPS-Tracker, der deine Daten für sich behält.
 Erfasst deine Kilometer, ohne dass es jemand anderes tut.
 
 Funktionen & Features:

fastlane/metadata/android/de-DE/short_description.txt

@@ -1 +1 @@
-Open Tracks – ein GPS-Tracker, der deine Daten für sich behält.
+OpenTracks – ein GPS-Tracker, der deine Daten für sich behält.

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

@@ -0,0 +1,14 @@
+v3.2.3: OpenTracks
+
+Changes:
+- Sharing: use Android Sharesheet
+- Sharing: share multiple tracks as individual files
+- Use Android ShareSheet
+- Heart rate sensor (Bluetooth LE): automatic reconnect
+
+Bugfix:
+- Heart rate sensor (Bluetooth LE): disconnect properly
+- Heart rate wasn't always shown while recording
+
+Developer:
+- Enabled TravisCI instrumentation tests

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

@@ -0,0 +1,5 @@
+v3.2.4: OpenTracks
+
+Bugfix:
+- Settings activity crashes
+  Removed possibility to change voice/split frequency from the context menu

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

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

@@ -0,0 +1,8 @@
+v3.2.6: OpenTracks
+
+Changes:
+- Heart rate monitor: scan for available devices
+- Remove shortcut to Bluetooth settings
+
+Developer:
+- Preferences: moved default of preferences from code to xml

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

@@ -0,0 +1,10 @@
+v3.2.7: OpenTracks
+
+Changes:
+- Notification show GPS accuracy
+- Show heads-up notification if GPS accuracy drops beyond threshold
+- Always show chart by time as well as by distance
+- Added help (in Settings)
+
+Bugfix:
+- TrackDetailActivity: disabled non-working landscape mode (temporary)

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

@@ -0,0 +1,10 @@
+v3.2.8: OpenTracks
+
+Changes:
+- Chart: zoom via gestures
+
+Bugfixes:
+- Export via KMZ did not export picture filenames correctly
+- Sharing multiple tracks did not include KMZ files
+- MarkerDetailActivity's UI was not shown
+- Settings crashed if preference of heart rate was not initialized

fastlane/metadata/android/es-ES/full_description.txt

@@ -0,0 +1,8 @@
+OpenTracks es un tracker deportivo que respeta tu privacidad.
+
+Funciones:
+* Tracker deportivo: haz un seguimiento de tus actividades al aire libre
+* Marca lugares de interés, incluso agrega fotos a los marcadores
+* Pulsómetro (compatible con dispositivos Bluetooth LE)
+* Exporta tus rutas como KML o GPX
+* Completamente offline, no necesitas internet

fastlane/metadata/android/es-ES/short_description.txt

@@ -0,0 +1 @@
+OpenTracks es un tracker deportivo que respeta tu privacidad.

fastlane/metadata/android/es-ES/title.txt

@@ -0,0 +1 @@
+OpenTracks

fastlane/metadata/android/fr-FR/full_description.txt

@@ -0,0 +1,9 @@
+OpenTracks est une application de suivi d'activités sportives qui respecte totalement votre vie privée.
+
+Fonctionnalités :
+
+* Suivi d'activité : enregistre vos activités sportives et de plein air
+* Photos et repères : ajout de photos et de repères pendant l'enregistrement de l'activité
+* Rythme cardiaque : support des capteurs Bluetooth LE
+* Export : export des traces au format KML ou GPX
+* Pas d'accès internet requis : Internet n'est pas nécessaire pour le fonctionnement de l'application

fastlane/metadata/android/fr-FR/short_description.txt

@@ -0,0 +1 @@
+OpenTracks est une application de suivi d'activités sportives qui respecte totalement votre vie privée.

src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package de.dennisguse.opentracks;
+package de.dennisguse.opentracks.chart;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -23,6 +23,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import de.dennisguse.opentracks.R;
+
 /**
  * Tests {@link ChartValueSeries}.
  *

src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsTest.java

@@ -35,22 +35,19 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationFactory;
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
 import de.dennisguse.opentracks.content.Waypoint.WaypointType;
 import de.dennisguse.opentracks.stats.TripStatistics;
 
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
- * A unit test for {@link ContentProviderUtilsImpl}.
+ * A unit test for {@link ContentProviderUtils}.
  *
  * @author Bartlomiej Niechwiej
  * @author Youtao Liu
  */
 @RunWith(MockitoJUnitRunner.class)
-public class CustomContentProviderUtilsImplTest {
+public class CustomContentProviderUtilsTest {
     private static final String NAME_PREFIX = "test name";
     private static final String MOCK_DESC = "Mock Next Waypoint Desc!";
     private static final String TEST_DESC = "Test Desc!";
@@ -70,13 +67,13 @@ public class CustomContentProviderUtilsImplTest {
 
     @Before
     public void setUp() {
-        providerUtils = ContentProviderUtils.Factory.get(context);
+        providerUtils = new ContentProviderUtils(context);
         providerUtils.deleteAllTracks(context);
     }
 
     @Test
     public void testLocationIterator_noPoints() {
-        testIterator(1, 0, 1, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 0, 1, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
     }
 
     @Test
@@ -106,36 +103,36 @@ public class CustomContentProviderUtilsImplTest {
 
     @Test
     public void testLocationIterator_noBatchAscending() {
-        testIterator(1, 50, 100, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 100, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 50, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(2, 50, 50, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
     }
 
     @Test
     public void testLocationIterator_noBatchDescending() {
-        testIterator(1, 50, 100, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 100, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 50, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(2, 50, 50, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
     }
 
     @Test
     public void testLocationIterator_batchAscending() {
-        testIterator(1, 50, 11, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 11, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 25, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(2, 50, 25, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
     }
 
     @Test
     public void testLocationIterator_batchDescending() {
-        testIterator(1, 50, 11, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 11, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 25, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(2, 50, 25, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
     }
 
     @Test
     public void testLocationIterator_largeTrack() {
-        testIterator(1, 20000, 2000, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 20000, 2000, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
     }
 
     private List<Location> testIterator(long trackId, int numPoints, int batchSize, boolean descending, LocationFactory locationFactory) {
         long lastPointId = initializeTrack(trackId, numPoints);
-        ((ContentProviderUtilsImpl) providerUtils).setDefaultCursorBatchSize(batchSize);
+        ((ContentProviderUtils) providerUtils).setDefaultCursorBatchSize(batchSize);
         List<Location> locations = new ArrayList<Location>(numPoints);
         try (LocationIterator it = providerUtils.getTrackPointLocationIterator(trackId, -1L, descending, locationFactory)) {
             while (it.hasNext()) {
@@ -174,7 +171,7 @@ public class CustomContentProviderUtilsImplTest {
         // Load all inserted locations.
         long lastPointId = -1;
         int counter = 0;
-        try (LocationIterator it = providerUtils.getTrackPointLocationIterator(id, -1L, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY)) {
+        try (LocationIterator it = providerUtils.getTrackPointLocationIterator(id, -1L, false, LocationFactory.DEFAULT_LOCATION_FACTORY)) {
             while (it.hasNext()) {
                 it.next();
                 lastPointId = it.getLocationId();
@@ -190,7 +187,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#createTrack(Cursor)}.
+     * Tests the method {@link ContentProviderUtils#createTrack(Cursor)}.
      */
     @Test
     public void testCreateTrack() {
@@ -214,11 +211,10 @@ public class CustomContentProviderUtilsImplTest {
         Track track = providerUtils.createTrack(cursorMock);
         Assert.assertEquals(trackId, track.getId());
         Assert.assertEquals(name, track.getName());
-        verify(cursorMock);
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#deleteAllTracks(Context)}
+     * Tests the method {@link ContentProviderUtils#deleteAllTracks(Context)}
      */
     @Test
     public void testDeleteAllTracks() {
@@ -247,7 +243,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#deleteTrack(Context, long)}.
+     * Tests the method {@link ContentProviderUtils#deleteTrack(Context, long)}.
      */
     @Test
     public void testDeleteTrack() {
@@ -282,7 +278,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getAllTracks()}
+     * Tests the method {@link ContentProviderUtils#getAllTracks()}
      */
     @Test
     public void testGetAllTracks() {
@@ -295,7 +291,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getLastTrack()}
+     * Tests the method {@link ContentProviderUtils#getLastTrack()}
      */
     @Test
     public void testGetLastTrack() {
@@ -305,7 +301,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrack(long)}
+     * Tests the method {@link ContentProviderUtils#getTrack(long)}
      */
     @Test
     public void testGetTrack() {
@@ -315,7 +311,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#updateTrack(Track)}
+     * Tests the method {@link ContentProviderUtils#updateTrack(Track)}
      */
     @Test
     public void testUpdateTrack() {
@@ -332,7 +328,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#createContentValues(Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#createContentValues(Waypoint)}.
      */
     @Test
     public void testCreateContentValues_waypoint() {
@@ -370,7 +366,7 @@ public class CustomContentProviderUtilsImplTest {
         waypoint.setLocation(location);
         providerUtils.insertWaypoint(waypoint);
 
-        ContentProviderUtilsImpl contentProviderUtils = new ContentProviderUtilsImpl(contentResolverMock);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(contentResolverMock);
 
         long waypointId = System.currentTimeMillis();
         waypoint.setId(waypointId);
@@ -383,7 +379,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#createWaypoint(Cursor)}.
+     * Tests the method {@link ContentProviderUtils#createWaypoint(Cursor)}.
      */
     @Test
     public void testCreateWaypoint() {
@@ -414,12 +410,11 @@ public class CustomContentProviderUtilsImplTest {
         Assert.assertEquals(id, waypoint.getId());
         Assert.assertEquals(name, waypoint.getName());
         Assert.assertEquals(trackId, waypoint.getTrackId());
-        verify(cursorMock);
     }
 
     /**
      * Tests the method
-     * {@link ContentProviderUtilsImpl#deleteWaypoint(Context, long, DescriptionGenerator)}
+     * {@link ContentProviderUtils#deleteWaypoint(Context, long, DescriptionGenerator)}
      * when there is only one waypoint in the track.
      */
     @Test
@@ -440,7 +435,7 @@ public class CustomContentProviderUtilsImplTest {
 
             @Override
             public String generateWaypointDescription(TripStatistics tripStatistics) {
-                return CustomContentProviderUtilsImplTest.MOCK_DESC;
+                return CustomContentProviderUtilsTest.MOCK_DESC;
             }
 
             @Override
@@ -455,7 +450,7 @@ public class CustomContentProviderUtilsImplTest {
 
     /**
      * Tests the method
-     * {@link ContentProviderUtilsImpl#deleteWaypoint(Context, long, DescriptionGenerator)}
+     * {@link ContentProviderUtils#deleteWaypoint(Context, long, DescriptionGenerator)}
      * when there is more than one waypoint in the track.
      */
     @Test
@@ -498,7 +493,7 @@ public class CustomContentProviderUtilsImplTest {
         DescriptionGenerator descriptionGenerator = new DescriptionGenerator() {
             @Override
             public String generateWaypointDescription(TripStatistics tripStatistics) {
-                return CustomContentProviderUtilsImplTest.MOCK_DESC;
+                return CustomContentProviderUtilsTest.MOCK_DESC;
             }
 
             @Override
@@ -511,12 +506,12 @@ public class CustomContentProviderUtilsImplTest {
         providerUtils.deleteWaypoint(context, waypoint1Id, descriptionGenerator);
         Assert.assertNull(providerUtils.getWaypoint(waypoint1Id));
 
-        Assert.assertEquals(CustomContentProviderUtilsImplTest.MOCK_DESC, providerUtils.getWaypoint(waypoint2Id)
+        Assert.assertEquals(CustomContentProviderUtilsTest.MOCK_DESC, providerUtils.getWaypoint(waypoint2Id)
                 .getDescription());
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getFirstWaypointId(long)}.
+     * Tests the method {@link ContentProviderUtils#getFirstWaypointId(long)}.
      */
     @Test
     public void testGetFirstWaypointId() {
@@ -538,7 +533,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getNextWaypointNumber(long, WaypointType)}.
+     * Tests the method {@link ContentProviderUtils#getNextWaypointNumber(long, WaypointType)}.
      */
     @Test
     public void testGetNextWaypointNumber() {
@@ -597,8 +592,8 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#insertWaypoint(Waypoint)} and
+     * Tests the method {@link ContentProviderUtils#insertWaypoint(Waypoint)} and
-     * {@link ContentProviderUtilsImpl#getWaypoint(long)}.
+     * {@link ContentProviderUtils#getWaypoint(long)}.
      */
     @Test
     public void testInsertAndGetWaypoint() {
@@ -615,7 +610,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#updateWaypoint(Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#updateWaypoint(Waypoint)}.
      */
     @Test
     public void testUpdateWaypoint() {
@@ -637,7 +632,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#bulkInsertTrackPoint(Location[], int, long)}.
+     * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(Location[], int, long)}.
      */
     @Test
     public void testBulkInsertTrackPoint() {
@@ -653,7 +648,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#createTrackPoint(Cursor)}.
+     * Tests the method {@link ContentProviderUtils#createTrackPoint(Cursor)}.
      */
     @Test
     public void testCreateTrackPoint() {
@@ -709,12 +704,11 @@ public class CustomContentProviderUtilsImplTest {
         Assert.assertEquals((double) latitude, location.getLatitude(), 0.01);
         Assert.assertEquals(time, location.getTime(), 0.01);
         Assert.assertEquals(speed, location.getSpeed(), 0.01);
-        verify(cursorMock);
     }
 
     /**
      * Tests the method
-     * {@link ContentProviderUtilsImpl#insertTrackPoint(Location, long)}.
+     * {@link ContentProviderUtils#insertTrackPoint(Location, long)}.
      */
     @Test
     public void testInsertTrackPoint() {
@@ -728,7 +722,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getFirstTrackPointId(long)}.
+     * Tests the method {@link ContentProviderUtils#getFirstTrackPointId(long)}.
      */
     @Test
     public void testGetFirstTrackPointId() {
@@ -741,7 +735,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getLastTrackPointId(long)}.
+     * Tests the method {@link ContentProviderUtils#getLastTrackPointId(long)}.
      */
     @Test
     public void testGetLastTrackPointId() {
@@ -754,7 +748,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getLastValidTrackPoint(long)}.
+     * Tests the method {@link ContentProviderUtils#getLastValidTrackPoint(long)}.
      */
     @Test
     public void testGetLastValidTrackPoint() {
@@ -768,7 +762,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrackPointCursor(long, long, int, boolean)} in descending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointCursor(long, long, int, boolean)} in descending.
      */
     @Test
     public void testGetTrackPointCursor_desc() {
@@ -787,7 +781,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrackPointCursor(long, long, int, boolean)} in ascending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointCursor(long, long, int, boolean)} in ascending.
      */
     @Test
     public void testGetTrackPointCursor_asc() {
@@ -806,7 +800,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in descending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in descending.
      */
     @Test
     public void testGetTrackPointLocationIterator_desc() {
@@ -822,7 +816,7 @@ public class CustomContentProviderUtilsImplTest {
 
         long startTrackPointId = trackpointIds[9];
 
-        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
         for (int i = 0; i < trackpointIds.length; i++) {
             Assert.assertTrue(locationIterator.hasNext());
             Location location = locationIterator.next();
@@ -833,7 +827,7 @@ public class CustomContentProviderUtilsImplTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in ascending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in ascending.
      */
     @Test
     public void testGetTrackPointLocationIterator_asc() {
@@ -849,7 +843,7 @@ public class CustomContentProviderUtilsImplTest {
 
         long startTrackPointId = trackpointIds[0];
 
-        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
         for (int i = 0; i < trackpointIds.length; i++) {
             Assert.assertTrue(locationIterator.hasNext());
             Location location = locationIterator.next();
@@ -896,7 +890,7 @@ public class CustomContentProviderUtilsImplTest {
     /**
      * Checks the value of a location.
      *
-     * @param i        the index of this location which created in the method {@link CustomContentProviderUtilsImplTest#getTrack(long, int)}
+     * @param i        the index of this location which created in the method {@link CustomContentProviderUtilsTest#getTrack(long, int)}
      * @param location the location to be checked
      */
     private void checkLocation(int i, Location location) {

src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java

@@ -58,7 +58,7 @@ public class SearchEngineTest {
 
     @Before
     public void setUp() {
-        providerUtils = ContentProviderUtils.Factory.get(context);
+        providerUtils = new ContentProviderUtils(context);
         engine = new SearchEngine(providerUtils);
     }
 

src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java

@@ -17,17 +17,20 @@
 package de.dennisguse.opentracks.fragments;
 
 import android.location.Location;
+import android.os.Looper;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import de.dennisguse.opentracks.ChartView;
 import de.dennisguse.opentracks.TrackStubUtils;
+import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.util.UnitConversions;
@@ -44,10 +47,23 @@ public class ChartFragmentTest {
 
     private ChartFragment chartFragment;
 
+    @BeforeClass
+    public static void preSetUp() {
+        // Prepare looper for Android's message queue
+        if (Looper.myLooper() == null) Looper.prepare();
+    }
+
+    @AfterClass
+    public static void finalTearDown() {
+        if (Looper.myLooper() != null) Looper.myLooper().quit();
+    }
+
     @Before
     public void setUp() {
-        chartFragment = new ChartFragment();
+        boolean chartByDistance = false;
-        chartFragment.setChartView(new ChartView(ApplicationProvider.getApplicationContext()));
+        chartFragment = new ChartFragment(chartByDistance) {
+        };
+        chartFragment.setChartView(new ChartView(ApplicationProvider.getApplicationContext(), chartByDistance));
         chartFragment.setTripStatisticsUpdater(TrackStubUtils.INITIAL_TIME);
     }
 

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

@@ -112,7 +112,7 @@ public abstract class AbstractTestFileTrackImporter {
      * @param lastTrack   true if it is the last track in the gpx
      * @param trackId     the track id
      */
-    protected void expectUpdateTrack(ArgumentCaptor<Track> trackCaptor, boolean lastTrack, long trackId) {
+    protected void expectTrackUpdate(ArgumentCaptor<Track> trackCaptor, boolean lastTrack, long trackId) {
         contentProviderUtils.updateTrack(trackCaptor.capture());
 
         when(contentProviderUtils.insertWaypoint((Waypoint) any())).thenReturn(WAYPOINT_ID_O_URI);

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

@@ -27,13 +27,13 @@ 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;
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -84,8 +84,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
 
     @Test
     public void testOneTrackOneSegment() throws Exception {
-        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        // given
-
         Location location0 = createLocation(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
         Location location1 = createLocation(1, DATE_FORMAT_1.parse(TRACK_TIME_1).getTime());
 
@@ -95,25 +94,28 @@ 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);
-        expectUpdateTrack(trackCaptor, true, TRACK_ID_0);
+        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        expectTrackUpdate(trackCaptor, true, TRACK_ID_0);
 
+        // when
         InputStream inputStream = new ByteArrayInputStream(VALID_ONE_TRACK_ONE_SEGMENT_GPX.getBytes());
         GpxFileTrackImporter gpxFileTrackImporter = new GpxFileTrackImporter(context, contentProviderUtils);
         long trackId = gpxFileTrackImporter.importFile(inputStream);
+
+        // then
         Assert.assertEquals(TRACK_ID_0, trackId);
 
+        verify(contentProviderUtils, atLeastOnce()).updateTrack(trackCaptor.capture());
         long time0 = DATE_FORMAT_0.parse(TRACK_TIME_0).getTime();
         long time1 = DATE_FORMAT_1.parse(TRACK_TIME_1).getTime();
         Assert.assertEquals(time1 - time0, trackCaptor.getValue().getTripStatistics().getTotalTime());
-        verify(contentProviderUtils);
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, time0);
     }
 
     @Test
     public void testOneTrackTwoSegments() throws Exception {
-        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        // given
-
         Location location0 = createLocation(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
 
         when(contentProviderUtils.insertTrack((Track) any())).thenReturn(TRACK_ID_0_URI);
@@ -121,12 +123,18 @@ 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);
-        expectUpdateTrack(trackCaptor, true, TRACK_ID_0);
 
+        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        expectTrackUpdate(trackCaptor, true, TRACK_ID_0);
+
+        // when
         InputStream inputStream = new ByteArrayInputStream(VALID_ONE_TRACK_TWO_SEGMENTS_GPX.getBytes());
         GpxFileTrackImporter gpxFileTrackImporter = new GpxFileTrackImporter(context, contentProviderUtils);
         long trackId = gpxFileTrackImporter.importFile(inputStream);
+
+        // then
+        verify(contentProviderUtils, atLeastOnce()).updateTrack(trackCaptor.capture());
         Assert.assertEquals(TRACK_ID_0, trackId);
 
         long time0 = DATE_FORMAT_0.parse(TRACK_TIME_0).getTime();
@@ -135,30 +143,33 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         long time3 = DATE_FORMAT_1.parse(TRACK_TIME_3).getTime();
         Assert.assertEquals(time1 - time0 + time3 - time2, trackCaptor.getValue().getTripStatistics().getTotalTime());
 
-        verify(contentProviderUtils);
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
     }
 
     @Test
     public void testOneTrackTwoSegmentsNoTime() {
-        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        // given
-
         when(contentProviderUtils.insertTrack((Track) any())).thenReturn(TRACK_ID_0_URI);
         expectFirstTrackPoint(null, TRACK_ID_0, TRACK_POINT_ID_0);
 
         // 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);
-        expectUpdateTrack(trackCaptor, true, TRACK_ID_0);
 
+        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        expectTrackUpdate(trackCaptor, true, TRACK_ID_0);
+
+        // when
         InputStream inputStream = new ByteArrayInputStream(VALID_ONE_TRACK_TWO_SEGMENTS_NO_TIME_GPX.getBytes());
         GpxFileTrackImporter gpxFileTrackImporter = new GpxFileTrackImporter(context, contentProviderUtils);
         long trackId = gpxFileTrackImporter.importFile(inputStream);
-        Assert.assertEquals(TRACK_ID_0, trackId);
-        Assert.assertEquals(0, trackCaptor.getValue().getTripStatistics().getTotalTime());
 
-        verify(contentProviderUtils);
+        // then
+        verify(contentProviderUtils, atLeastOnce()).updateTrack(trackCaptor.capture());
+        Assert.assertEquals(TRACK_ID_0, trackId);
+
+        Assert.assertEquals(0, trackCaptor.getValue().getTripStatistics().getTotalTime());
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, -1L);
     }
 
@@ -199,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,11 +27,11 @@ 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;
 
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -68,8 +68,7 @@ public class KmlFileTrackImporterTest extends AbstractTestFileTrackImporter {
 
     @Test
     public void testOneTrackOneSegment() throws Exception {
-        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        // given
-
         Location location0 = createLocation(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
         Location location1 = createLocation(1, DATE_FORMAT_1.parse(TRACK_TIME_1).getTime());
 
@@ -77,27 +76,31 @@ public class KmlFileTrackImporterTest extends AbstractTestFileTrackImporter {
         expectFirstTrackPoint(location0, TRACK_ID_0, TRACK_POINT_ID_0);
 
         // A flush happens at the end
-        when(contentProviderUtils.bulkInsertTrackPoint(new Location[]{location1}, eq(1), eq(TRACK_ID_0))).thenReturn(1);
+        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);
-        expectUpdateTrack(trackCaptor, true, TRACK_ID_0);
 
+        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        expectTrackUpdate(trackCaptor, true, TRACK_ID_0);
+
+        // when
         InputStream inputStream = new ByteArrayInputStream(VALID_ONE_TRACK_ONE_SEGMENT_GPX.getBytes());
         KmlFileTrackImporter kmlFileTrackImporter = new KmlFileTrackImporter(context, TRACK_ID_0, contentProviderUtils);
         long trackId = kmlFileTrackImporter.importFile(inputStream);
+
+        // then
+        verify(contentProviderUtils, atLeastOnce()).updateTrack(trackCaptor.capture());
         Assert.assertEquals(TRACK_ID_0, trackId);
 
         long time0 = DATE_FORMAT_0.parse(TRACK_TIME_0).getTime();
         long time1 = DATE_FORMAT_1.parse(TRACK_TIME_1).getTime();
         Assert.assertEquals(time1 - time0, trackCaptor.getValue().getTripStatistics().getTotalTime());
-        verify(contentProviderUtils);
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, time0);
     }
 
     @Test
     public void testOneTrackTwoSegments() throws Exception {
-        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        // given
-
         Location location0 = createLocation(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
 
         contentProviderUtils.clearTrack(context, TRACK_ID_0);
@@ -106,12 +109,18 @@ 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);
-        expectUpdateTrack(trackCaptor, true, TRACK_ID_0);
 
+        ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
+        expectTrackUpdate(trackCaptor, true, TRACK_ID_0);
+
+        // when
         InputStream inputStream = new ByteArrayInputStream(VALID_ONE_TRACK_TWO_SEGMENTS_GPX.getBytes());
         KmlFileTrackImporter kmlFileTrackImporter = new KmlFileTrackImporter(context, TRACK_ID_0, contentProviderUtils);
         long trackId = kmlFileTrackImporter.importFile(inputStream);
+
+        // then
+        verify(contentProviderUtils, atLeastOnce()).updateTrack(trackCaptor.capture());
         Assert.assertEquals(TRACK_ID_0, trackId);
 
         long time0 = DATE_FORMAT_0.parse(TRACK_TIME_0).getTime();
@@ -120,7 +129,6 @@ public class KmlFileTrackImporterTest extends AbstractTestFileTrackImporter {
         long time3 = DATE_FORMAT_1.parse(TRACK_TIME_3).getTime();
         Assert.assertEquals(time1 - time0 + time3 - time2, trackCaptor.getValue().getTripStatistics().getTotalTime());
 
-        verify(contentProviderUtils);
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
     }
 }

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

@@ -0,0 +1,54 @@
+package de.dennisguse.opentracks.services;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.location.Location;
+
+import androidx.core.app.NotificationCompat;
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TrackRecordingServiceNotificationManagerTest {
+
+    private Context context = ApplicationProvider.getApplicationContext();
+
+    @Mock
+    private Location locationMock;
+
+    @Mock
+    private NotificationCompat.Builder notificationCompatBuilder;
+
+    @Mock
+    private NotificationManager notificationManager;
+
+    @Test
+    public void updateLocation_triggersAlertOnlyOnFirstInaccurateLocation() {
+        when(locationMock.hasAccuracy()).thenReturn(true);
+        when(locationMock.getAccuracy()).thenReturn(999f);
+        when(notificationCompatBuilder.setContentText(anyString())).thenReturn(notificationCompatBuilder);
+        when(notificationCompatBuilder.setOnlyAlertOnce(anyBoolean())).thenReturn(notificationCompatBuilder);
+
+        TrackRecordingServiceNotificationManager subject = new TrackRecordingServiceNotificationManager(notificationManager, notificationCompatBuilder);
+
+        // when
+        subject.updateLocation(context, locationMock, 100);
+        subject.updateLocation(context, locationMock, 100);
+        subject.updateLocation(context, locationMock, 1000);
+        subject.updateLocation(context, locationMock, 100);
+
+        // then
+        verify(notificationCompatBuilder, times(6)).setOnlyAlertOnce(true);
+        verify(notificationCompatBuilder, times(2)).setOnlyAlertOnce(false);
+    }
+}

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

@@ -15,14 +15,12 @@
  */
 package de.dennisguse.opentracks.services;
 
-import android.content.BroadcastReceiver;
 import android.content.ContentProvider;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.location.Location;
 import android.os.IBinder;
-import android.util.Log;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -38,7 +36,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -77,14 +74,12 @@ public class TrackRecordingServiceTest {
     private long trackId = Math.abs(new Random().nextLong());
 
     static Intent createStartIntent(Context context) {
-        Intent startIntent = new Intent();
+        return new Intent(context, TrackRecordingService.class);
-        startIntent.setClass(context, TrackRecordingService.class);
-        return startIntent;
     }
 
     static void updateAutoResumePrefs(Context context, int attempts, int timeoutMins) {
         PreferencesUtils.setInt(context, R.string.auto_resume_track_current_retry_key, attempts);
-        PreferencesUtils.setInt(context, R.string.auto_resume_track_timeout_key, timeoutMins);
+        PreferencesUtils.setString(context, R.string.auto_resume_track_timeout_key, "" + timeoutMins);
     }
 
     @Before
@@ -94,7 +89,7 @@ public class TrackRecordingServiceTest {
         };
         customContentProvider.attachInfo(context, null);
 
-        providerUtils = ContentProviderUtils.Factory.get(context);
+        providerUtils = new ContentProviderUtils(context);
 
         // Let's use default values.
         SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
@@ -140,12 +135,15 @@ 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);
         startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
+        mServiceRule.startService(startIntent);
         ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
+
+        // then
         Assert.assertNotNull(service);
 
         // We expect to resume the previous track.
@@ -156,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());
 
@@ -165,15 +163,17 @@ 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).
+
         Intent startIntent = createStartIntent(context);
         startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
         mServiceRule.startService(startIntent);
         service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
-        Assert.assertNotNull(service);
 
+        // then
+        Assert.assertNotNull(service);
         Assert.assertTrue(service.isRecording());
     }
 
@@ -184,12 +184,15 @@ 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);
         startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
+        mServiceRule.startService(startIntent);
         ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
+
+        // then
         Assert.assertNotNull(service);
 
         // We don't expect to resume the previous track, because it was stopped.
@@ -201,15 +204,18 @@ public class TrackRecordingServiceTest {
     @Test
     public void testResumeAfterReboot_expiredTrack() throws Exception {
         // Insert a dummy track last updated 20 min ago.
-        createDummyTrack(trackId, System.currentTimeMillis() - 20 * 60 * 1000, true);
+        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);
         startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
+        mServiceRule.startService(startIntent);
         ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
+
+        // then
         Assert.assertNotNull(service);
 
         // We don't expect to resume the previous track, because it has expired.
@@ -224,16 +230,15 @@ 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);
         startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
-
+        mServiceRule.startService(startIntent);
-        //Explicit start service, so `startCommand()` is executed - which would be called by BootReceiver.
-        context.startService(startIntent);
-
         ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
+
+        //then
         Assert.assertNotNull(service);
 
         // We don't expect to resume the previous track, because there were already too many attempts.
@@ -247,7 +252,10 @@ public class TrackRecordingServiceTest {
         List<Track> tracks = providerUtils.getAllTracks();
         Assert.assertTrue(tracks.isEmpty());
 
-        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
+        Intent startIntent = createStartIntent(context);
+        mServiceRule.startService(startIntent);
+        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
+
         // Test if we start in no-recording mode by default.
         Assert.assertFalse(service.isRecording());
         Assert.assertEquals(-1L, service.getRecordingTrackId());
@@ -266,11 +274,14 @@ public class TrackRecordingServiceTest {
     @MediumTest
     @Test
     public void testRecording_orphanedRecordingTrack() throws Exception {
+        Intent startIntent = createStartIntent(context);
+        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
+
         // Just set recording track to a bogus value.
+        // Make sure that the service will not start recording and will clear the bogus track.
         PreferencesUtils.setLong(context, R.string.recording_track_id_key, 123L);
 
-        // Make sure that the service will not start recording and will clear the bogus track.
+        // then
-        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
         Assert.assertFalse(service.isRecording());
         Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, service.getRecordingTrackId());
     }
@@ -286,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());
     }
 
@@ -299,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());
     }
 
@@ -405,45 +416,4 @@ public class TrackRecordingServiceTest {
         Assert.assertNotNull(wpt.getLocation());
         Assert.assertNull(wpt.getTripStatistics());
     }
-
-    /**
-     * Synchronous/waitable broadcast receiver to be used in testing.
-     */
-    private class BlockingBroadcastReceiver extends BroadcastReceiver {
-        private static final long MAX_WAIT_TIME_MS = 3000;
-        private final List<Intent> receivedIntents = new ArrayList<>();
-
-        public List<Intent> getReceivedIntents() {
-            return receivedIntents;
-        }
-
-        @Override
-        public void onReceive(Context ctx, Intent intent) {
-            Log.d("Test", "Got broadcast: " + intent);
-            synchronized (receivedIntents) {
-                receivedIntents.add(intent);
-                receivedIntents.notifyAll();
-            }
-        }
-
-        public boolean waitUntilReceived(int receiveCount) {
-            long deadline = System.currentTimeMillis() + MAX_WAIT_TIME_MS;
-            synchronized (receivedIntents) {
-                while (receivedIntents.size() < receiveCount) {
-                    try {
-                        // Wait releases synchronized lock until it returns
-                        receivedIntents.wait(500);
-                    } catch (InterruptedException e) {
-                        // Do nothing
-                    }
-
-                    if (System.currentTimeMillis() > deadline) {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        }
-    }
 }

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

@@ -68,7 +68,7 @@ public class TrackRecordingServiceTestLooper {
         };
         customContentProvider.attachInfo(context, null);
 
-        providerUtils = ContentProviderUtils.Factory.get(context);
+        providerUtils = new ContentProviderUtils(context);
 
         // Let's use default values.
         SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
@@ -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();
     }
 
@@ -139,7 +139,8 @@ public class TrackRecordingServiceTestLooper {
     @MediumTest
     @Test
     public void testWithProperties_minRecordingDistanceDefault() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.recording_distance_interval_key, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
+        int minRecordingIntervalDefault = Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default));
+        PreferencesUtils.setInt(context, R.string.recording_distance_interval_key, minRecordingIntervalDefault);
         fullRecordingSession();
     }
 
@@ -153,7 +154,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 +175,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 +189,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();
     }
 
@@ -202,7 +203,8 @@ public class TrackRecordingServiceTestLooper {
     @MediumTest
     @Test
     public void testWithProperties_minRequiredAccuracyDefault() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key, PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
+        int recordingGPSAccuracyDefault = Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_default));
+        PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key, recordingGPSAccuracyDefault);
         fullRecordingSession();
     }
 
@@ -225,7 +227,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/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskTest.java

@@ -1,557 +0,0 @@
-/*
- * 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.
- */
-package de.dennisguse.opentracks.services.tasks;
-
-import android.content.Context;
-import android.os.Looper;
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeech.OnInitListener;
-import android.speech.tts.TextToSpeech.OnUtteranceCompletedListener;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import de.dennisguse.opentracks.stats.TripStatistics;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.same;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-/**
- * Tests for {@link AnnouncementPeriodicTask}.
- *
- * WARNING: I'm not responsible if your eyes start bleeding while reading this code.
- * You have been warned.
- * It's still better than no test, though.
- *
- * @author Rodrigo Damazio
- */
-@RunWith(MockitoJUnitRunner.class)
-public class AnnouncementPeriodicTaskTest {
-
-    // Use something other than our hardcoded value
-    private static final Locale DEFAULT_LOCALE = Locale.KOREAN;
-    private static final String ANNOUNCEMENT = "I can haz cheeseburger?";
-    private Locale oldDefaultLocale;
-
-    private Context context = ApplicationProvider.getApplicationContext();
-
-    private AnnouncementPeriodicTask task;
-    @Mock
-    private AnnouncementPeriodicTask mockTask;
-    private ArgumentCaptor<OnInitListener> initListenerCapture = ArgumentCaptor.forClass(OnInitListener.class);
-    private ArgumentCaptor<PhoneStateListener> phoneListenerCapture = ArgumentCaptor.forClass(PhoneStateListener.class);
-    private TextToSpeechDelegate ttsDelegate;
-    @Mock
-    private TextToSpeechInterface tts;
-
-    @BeforeClass
-    public static void preSetUp() {
-        // Prepare looper for Android's message queue
-        if (Looper.myLooper() == null) Looper.prepare();
-    }
-
-    @AfterClass
-    public static void finalTearDown() {
-        if (Looper.myLooper() != null) Looper.myLooper().quit();
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        oldDefaultLocale = Locale.getDefault();
-        Locale.setDefault(DEFAULT_LOCALE);
-
-        // Eww, the effort required just to mock TextToSpeech is insane
-        final AtomicBoolean listenerCalled = new AtomicBoolean();
-        OnInitListener blockingListener = new OnInitListener() {
-            @Override
-            public void onInit(int status) {
-                synchronized (this) {
-                    listenerCalled.set(true);
-                    notify();
-                }
-            }
-        };
-
-        ttsDelegate = new TextToSpeechDelegate(context, blockingListener);
-
-        // Wait for all async operations done in the constructor to finish.
-        synchronized (blockingListener) {
-            while (!listenerCalled.get()) {
-                // Releases the synchronized lock until we're woken up.
-                blockingListener.wait();
-            }
-        }
-
-        // Create a partial forwarding mock
-        task = new AnnouncementPeriodicTask(context) {
-            @Override
-            protected TextToSpeech newTextToSpeech(Context ctx, OnInitListener onInitListener) {
-                return mockTask.newTextToSpeech(ctx, onInitListener);
-            }
-
-            @Override
-            protected String getAnnouncement(TripStatistics stats) {
-                return mockTask.getAnnouncement(stats);
-            }
-
-            @Override
-            protected void listenToPhoneState(PhoneStateListener listener, int events) {
-                mockTask.listenToPhoneState(listener, events);
-            }
-        };
-    }
-
-    @After
-    public void tearDown() {
-        Locale.setDefault(oldDefaultLocale);
-    }
-
-    @Test
-    public void testStart() {
-        doStart();
-        OnInitListener ttsInitListener = initListenerCapture.getValue();
-        Assert.assertNotNull(ttsInitListener);
-
-        ttsInitListener.onInit(TextToSpeech.SUCCESS);
-        //TODO
-        //verify(mockTask, tts);
-    }
-
-    @Test
-    public void testStart_notReady() {
-        doStart();
-        OnInitListener ttsInitListener = initListenerCapture.getValue();
-        Assert.assertNotNull(ttsInitListener);
-
-        ttsInitListener.onInit(TextToSpeech.ERROR);
-        //TODO
-        //AndroidMock.verify(mockTask, tts);
-    }
-
-    @Test
-    public void testShutdown() {
-        // First, start
-        doStart();
-        verify(mockTask);
-        reset(mockTask);
-
-        // Then, shut down
-        PhoneStateListener phoneListener = phoneListenerCapture.getValue();
-        mockTask.listenToPhoneState(
-                same(phoneListener), eq(PhoneStateListener.LISTEN_NONE));
-        tts.shutdown();
-        task.shutdown();
-        //TODO
-        //AndroidMock.verify(mockTask, tts);
-    }
-
-    @Test
-    public void testRun() {
-        // when service data calls
-        TripStatistics stats = new TripStatistics();
-
-        // when announcement building call
-        when(mockTask.getAnnouncement(same(stats))).thenReturn(ANNOUNCEMENT);
-
-        // Put task in "ready" state
-        startTask(TextToSpeech.SUCCESS);
-
-        when(tts.isLanguageAvailable(DEFAULT_LOCALE)).thenReturn(TextToSpeech.LANG_AVAILABLE);
-        when(tts.setLanguage(DEFAULT_LOCALE)).thenReturn(TextToSpeech.LANG_AVAILABLE);
-        when(tts.setSpeechRate(AnnouncementPeriodicTask.TTS_SPEECH_RATE)).thenReturn(TextToSpeech.SUCCESS);
-        when(tts.setOnUtteranceCompletedListener((OnUtteranceCompletedListener) any())).thenReturn(0);
-
-        // Run the announcement
-        task.announce(stats);
-        //TODO
-        //AndroidMock.verify(mockTask, tts);
-    }
-
-    @Test
-    public void testRun_notReady() {
-        // Put task in "not ready" state
-        startTask(TextToSpeech.ERROR);
-
-        // Run the announcement
-        task.run(null);
-        //TODO
-        //verify(mockTask, tts);
-    }
-
-    @Test
-    public void testRun_duringCall() {
-        startTask(TextToSpeech.SUCCESS);
-
-        when(tts.isSpeaking()).thenReturn(false);
-
-        // Run the announcement
-        PhoneStateListener phoneListener = phoneListenerCapture.getValue();
-        phoneListener.onCallStateChanged(TelephonyManager.CALL_STATE_OFFHOOK, null);
-        task.run(null);
-        //TODO
-        //verify(mockTask, tts);
-    }
-
-    @Test
-    public void testRun_ringWhileSpeaking() {
-        startTask(TextToSpeech.SUCCESS);
-
-        when(tts.isSpeaking()).thenReturn(true);
-        when(tts.stop()).thenReturn(TextToSpeech.SUCCESS);
-
-        // Update the state to ringing - this should stop the current announcement.
-        PhoneStateListener phoneListener = phoneListenerCapture.getValue();
-        phoneListener.onCallStateChanged(TelephonyManager.CALL_STATE_RINGING, null);
-
-        // Run the announcement - this should do nothing.
-        task.run(null);
-        //TODO
-        //AndroidMock.verify(mockTask, tts);
-    }
-
-    @Test
-    public void testRun_whileRinging() {
-        startTask(TextToSpeech.SUCCESS);
-
-        when(tts.isSpeaking()).thenReturn(false);
-
-        // Run the announcement
-        PhoneStateListener phoneListener = phoneListenerCapture.getValue();
-        phoneListener.onCallStateChanged(TelephonyManager.CALL_STATE_RINGING, null);
-        task.run(null);
-        //TODO
-        //AndroidMock.verify(mockTask, tts);
-    }
-
-    @Test
-    public void testRun_noService() {
-        startTask(TextToSpeech.SUCCESS);
-
-        // Run the announcement
-        task.run(null);
-        //TODO
-        //AndroidMock.verify(mockTask, tts);
-    }
-
-    @Test
-    public void testRun_noStats() {
-        // when service data calls
-
-        startTask(TextToSpeech.SUCCESS);
-
-        // Run the announcement
-        task.run(null);
-        //TODO
-        //AndroidMock.verify(mockTask, tts);
-    }
-
-    /**
-     * Tests {@link AnnouncementPeriodicTask#getAnnounceTime(long)} with time zero.
-     */
-    @Test
-    public void testGetAnnounceTime_time_zero() {
-        long time = 0; // 0 seconds
-        Assert.assertEquals("0 minutes 0 seconds", task.getAnnounceTime(time));
-    }
-
-    /**
-     * Tests {@link AnnouncementPeriodicTask#getAnnounceTime(long)} with time one.
-     */
-    @Test
-    public void testGetAnnounceTime_time_one() {
-        long time = 1000; // 1 second
-        Assert.assertEquals("0 minutes 1 second", task.getAnnounceTime(time));
-    }
-
-    /**
-     * Tests {@link AnnouncementPeriodicTask#getAnnounceTime(long)} with singular
-     * numbers with the hour unit.
-     */
-    @Test
-    public void testGetAnnounceTime_singular_has_hour() {
-        long time = (60 * 60 * 1000) + (60 * 1000) + (1000); // 1 hour 1 minute 1 second
-        Assert.assertEquals("1 hour 1 minute 1 second", task.getAnnounceTime(time));
-    }
-
-    /**
-     * Tests {@link AnnouncementPeriodicTask#getAnnounceTime(long)} with plural numbers
-     * with the hour unit.
-     */
-    @Test
-    public void testGetAnnounceTime_plural_has_hour() {
-        long time = (2 * 60 * 60 * 1000) + (2 * 60 * 1000) + (2 * 1000); // 2 hours 2 minutes 2 seconds
-        Assert.assertEquals("2 hours 2 minutes 2 seconds", task.getAnnounceTime(time));
-    }
-
-    /**
-     * Tests {@link AnnouncementPeriodicTask#getAnnounceTime(long)} with singular
-     * numbers without the hour unit.
-     */
-    @Test
-    public void testGetAnnounceTime_singular_no_hour() {
-        long time = (1 * 60 * 1000) + (1 * 1000); // 1 minute 1 second
-        Assert.assertEquals("1 minute 1 second", task.getAnnounceTime(time));
-    }
-
-    /**
-     * Tests {@link AnnouncementPeriodicTask#getAnnounceTime(long)} with plural numbers
-     * without the hour unit.
-     */
-    @Test
-    public void testGetAnnounceTime_plural_no_hour() {
-        long time = (2 * 60 * 1000) + (2 * 1000); // 2 minutes 2 seconds
-        Assert.assertEquals("2 minutes 2 seconds", task.getAnnounceTime(time));
-    }
-
-    private void startTask(int state) {
-        reset(tts);
-        doStart();
-        OnInitListener ttsInitListener = initListenerCapture.getValue();
-        ttsInitListener.onInit(state);
-        //TODO
-        reset(tts);
-        //AndroidMock.resetToDefault(tts);
-    }
-
-    private void doStart() {
-        mockTask.listenToPhoneState(phoneListenerCapture.capture(), eq(PhoneStateListener.LISTEN_CALL_STATE));
-        when(mockTask.newTextToSpeech(same(context), initListenerCapture.capture())).thenReturn(ttsDelegate);
-
-        task.start();
-    }
-
-    /**
-     * Mockable interface that we delegate TTS calls to.
-     */
-    interface TextToSpeechInterface {
-        int addEarcon(String earcon, String packagename, int resourceId);
-
-        int addEarcon(String earcon, String filename);
-
-        int addSpeech(String text, String packagename, int resourceId);
-
-        int addSpeech(String text, String filename);
-
-        boolean areDefaultsEnforced();
-
-        String getDefaultEngine();
-
-        Locale getLanguage();
-
-        int isLanguageAvailable(Locale loc);
-
-        boolean isSpeaking();
-
-        int playEarcon(String earcon, int queueMode,
-                       HashMap<String, String> params);
-
-        int playSilence(long durationInMs, int queueMode, HashMap<String, String> params);
-
-        int setLanguage(Locale loc);
-
-        int setOnUtteranceCompletedListener(OnUtteranceCompletedListener listener);
-
-        int setPitch(float pitch);
-
-        int setSpeechRate(float speechRate);
-
-        void shutdown();
-
-        int speak(String text, int queueMode, HashMap<String, String> params);
-
-        int stop();
-
-        int synthesizeToFile(String text, HashMap<String, String> params, String filename);
-    }
-
-    /**
-     * Subclass of {@link TextToSpeech} which delegates calls to the interface
-     * above.
-     * The logic here is stupid and the author is ashamed of having to write it
-     * like this, but basically the issue is that TextToSpeech cannot be mocked
-     * without running its constructor, its constructor runs async operations
-     * which call other methods (and then if the methods are part of a mock we'd
-     * have to set a behavior, but we can't 'cause the object hasn't been fully
-     * built yet).
-     * The logic is that calls made during the constructor (when tts is not yet
-     * set) will go up to the original class, but after tts is set we'll forward
-     * them all to the mock.
-     */
-    private class TextToSpeechDelegate extends TextToSpeech implements TextToSpeechInterface {
-        public TextToSpeechDelegate(Context context, OnInitListener listener) {
-            super(context, listener);
-        }
-
-        @Override
-        public int addEarcon(String earcon, String packagename, int resourceId) {
-            if (tts == null) {
-                return super.addEarcon(earcon, packagename, resourceId);
-            }
-            return tts.addEarcon(earcon, packagename, resourceId);
-        }
-
-        @Override
-        public int addEarcon(String earcon, String filename) {
-            if (tts == null) {
-                return super.addEarcon(earcon, filename);
-            }
-            return tts.addEarcon(earcon, filename);
-        }
-
-        @Override
-        public int addSpeech(String text, String packagename, int resourceId) {
-            if (tts == null) {
-                return super.addSpeech(text, packagename, resourceId);
-            }
-            return tts.addSpeech(text, packagename, resourceId);
-        }
-
-        @Override
-        public int addSpeech(String text, String filename) {
-            if (tts == null) {
-                return super.addSpeech(text, filename);
-            }
-            return tts.addSpeech(text, filename);
-        }
-
-        @Override
-        public Locale getLanguage() {
-            if (tts == null) {
-                return super.getLanguage();
-            }
-            return tts.getLanguage();
-        }
-
-        @Override
-        public int isLanguageAvailable(Locale loc) {
-            if (tts == null) {
-                return super.isLanguageAvailable(loc);
-            }
-            return tts.isLanguageAvailable(loc);
-        }
-
-        @Override
-        public boolean isSpeaking() {
-            if (tts == null) {
-                return super.isSpeaking();
-            }
-            return tts.isSpeaking();
-        }
-
-        @Override
-        public int playEarcon(String earcon, int queueMode, HashMap<String, String> params) {
-            if (tts == null) {
-                return super.playEarcon(earcon, queueMode, params);
-            }
-            return tts.playEarcon(earcon, queueMode, params);
-        }
-
-        @Override
-        public int playSilence(long durationInMs, int queueMode, HashMap<String, String> params) {
-            if (tts == null) {
-                return super.playSilence(durationInMs, queueMode, params);
-            }
-            return tts.playSilence(durationInMs, queueMode, params);
-        }
-
-        @Override
-        public int setLanguage(Locale loc) {
-            if (tts == null) {
-                return super.setLanguage(loc);
-            }
-            return tts.setLanguage(loc);
-        }
-
-        @Override
-        public int setOnUtteranceCompletedListener(OnUtteranceCompletedListener listener) {
-            if (tts == null) {
-                return super.setOnUtteranceCompletedListener(listener);
-            }
-            return tts.setOnUtteranceCompletedListener(listener);
-        }
-
-        @Override
-        public int setPitch(float pitch) {
-            if (tts == null) {
-                return super.setPitch(pitch);
-            }
-            return tts.setPitch(pitch);
-        }
-
-        @Override
-        public int setSpeechRate(float speechRate) {
-            if (tts == null) {
-                return super.setSpeechRate(speechRate);
-            }
-            return tts.setSpeechRate(speechRate);
-        }
-
-        @Override
-        public void shutdown() {
-            if (tts == null) {
-                super.shutdown();
-                return;
-            }
-            tts.shutdown();
-        }
-
-        @Override
-        public int speak(
-                String text, int queueMode, HashMap<String, String> params) {
-            if (tts == null) {
-                return super.speak(text, queueMode, params);
-            }
-            return tts.speak(text, queueMode, params);
-        }
-
-        @Override
-        public int stop() {
-            if (tts == null) {
-                return super.stop();
-            }
-            return tts.stop();
-        }
-
-        @Override
-        public int synthesizeToFile(String text, HashMap<String, String> params, String filename) {
-            if (tts == null) {
-                return super.synthesizeToFile(text, params, filename);
-            }
-            return tts.synthesizeToFile(text, params, filename);
-        }
-    }
-}

src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java

@@ -60,10 +60,15 @@ public class FileUtilsTest extends TestCase {
      */
     public void testSanitizeFileName() {
         String name = "Swim\10ming-^across:/the/ pacific (ocean).";
-        String expected = "Swim_ming-^across_the_ pacific (ocean)_";
+        String expected = "Swim_ming-^across_the_ pacific (ocean).";
         assertEquals(expected, FileUtils.sanitizeFileName(name));
     }
 
+    public void testSanitizeFileNameWithSuffix() {
+        String name = "FileName.jpeg";
+        assertEquals(name, FileUtils.sanitizeFileName(name));
+    }
+
     /**
      * Tests {@link FileUtils#sanitizeFileName(String)} with i18n characters (in Chinese and Russian).
      * Verifies that they are allowed.

src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java

@@ -131,7 +131,7 @@ public class StringUtilsTest {
         assertGetTime("2010-05-04T03:02:01.3", 2010, 5, 4, 3, 2, 1, 300);
         assertGetTime("2010-05-04T03:02:01.35", 2010, 5, 4, 3, 2, 1, 350);
         assertGetTime("2010-05-04T03:02:01.352Z", 2010, 5, 4, 3, 2, 1, 352);
-        assertGetTime("2010-05-04T03:02:01.3525Z", 2010, 5, 4, 3, 2, 1, 352);
+        assertGetTime("2010-05-04T03:02:01.3529Z", 2010, 5, 4, 3, 2, 1, 353);
     }
 
     /**
@@ -199,4 +199,24 @@ public class StringUtilsTest {
         Assert.assertEquals(-1, parts[1]);
         Assert.assertEquals(0, parts[2]);
     }
+
+    @Test
+    public void testFormatDecimal() {
+        Assert.assertEquals("0", StringUtils.formatDecimal(0.0, 0));
+        Assert.assertEquals("0", StringUtils.formatDecimal(0.1, 0));
+        Assert.assertEquals("1", StringUtils.formatDecimal(1.1, 0));
+        Assert.assertEquals("10", StringUtils.formatDecimal(10, 0));
+        Assert.assertEquals("10", StringUtils.formatDecimal(10.1, 0));
+        Assert.assertEquals("0", StringUtils.formatDecimal(-0.1, 0));
+
+        Assert.assertEquals("0", StringUtils.formatDecimal(0.0, 2));
+        Assert.assertEquals("0.1", StringUtils.formatDecimal(0.1, 2));
+        Assert.assertEquals("1.1", StringUtils.formatDecimal(1.1, 2));
+        Assert.assertEquals("10", StringUtils.formatDecimal(10, 2));
+        Assert.assertEquals("10.1", StringUtils.formatDecimal(10.1, 2));
+        Assert.assertEquals("10.11", StringUtils.formatDecimal(10.111, 2));
+        Assert.assertEquals("-0.1", StringUtils.formatDecimal(-0.1, 2));
+
+        Assert.assertEquals("1", StringUtils.formatDecimal(0.99, 1));
+    }
 }

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="3079"
+    android:versionCode="3162"
-    android:versionName="v3.2.2"> <!-- For FDroid. -->
+    android:versionName="v3.2.8"> <!-- For FDroid. -->
     <!-- Permission to initialize services -->
     <application
         android:name=".Startup"
@@ -32,6 +32,10 @@ limitations under the License.
 
         <activity android:name=".DeleteActivity" />
 
+        <activity
+            android:name=".HelpActivity"
+            android:label="@string/menu_help" />
+
         <activity
             android:name=".io.file.importer.ImportActivity"
             android:theme="@style/ThemeCustomTransparent">
@@ -50,10 +54,10 @@ limitations under the License.
             </intent-filter>
         </activity>
 
-        <activity android:name=".MarkerEditActivity" />
-
         <activity android:name=".MarkerDetailActivity" />
 
+        <activity android:name=".MarkerEditActivity" />
+
         <activity
             android:name=".MarkerListActivity"
             android:label="@string/menu_markers">
@@ -79,7 +83,9 @@ limitations under the License.
 
         <activity android:name=".TrackEditActivity" />
 
-        <activity android:name=".TrackListActivity">
+        <activity
+            android:name=".TrackListActivity"
+            android:screenOrientation="userPortrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -124,6 +130,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/AbstractActivity.java

@@ -17,11 +17,12 @@
 package de.dennisguse.opentracks;
 
 import android.os.Bundle;
-import android.speech.tts.TextToSpeech;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
+import de.dennisguse.opentracks.util.TTSUtils;
+
 /**
  * @author Jimmy Shih
  */
@@ -32,7 +33,7 @@ public abstract class AbstractActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         // Set volume control stream for text to speech
-        setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
+        setVolumeControlStream(TTSUtils.getTTSStream());
 
         setContentView(getLayoutResId());
 

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/DeleteAsyncTask.java

@@ -69,7 +69,7 @@ public class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
 
     @Override
     protected Boolean doInBackground(Void... params) {
-        ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
 
         if (trackIds.length == 1 && trackIds[0] == -1L) {
             contentProviderUtils.deleteAllTracks(context);

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

@@ -0,0 +1,9 @@
+package de.dennisguse.opentracks;
+
+public class HelpActivity extends AbstractActivity {
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.help;
+    }
+}

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

@@ -61,7 +61,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
             return;
         }
 
-        ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(this);
         Waypoint waypoint = contentProviderUtils.getWaypoint(markerId);
 
         markerIds = new ArrayList<>();

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

@@ -127,7 +127,7 @@ public class MarkerEditActivity extends AbstractActivity {
         if (newMarker) {
             statisticsSection.setVisibility(View.GONE);
             waypointSection.setVisibility(View.VISIBLE);
-            int nextWaypointNumber = trackId == -1L ? -1 : ContentProviderUtils.Factory.get(this).getNextWaypointNumber(trackId, WaypointType.WAYPOINT);
+            int nextWaypointNumber = trackId == -1L ? -1 : new ContentProviderUtils(this).getNextWaypointNumber(trackId, WaypointType.WAYPOINT);
             if (nextWaypointNumber == -1) {
                 nextWaypointNumber = 0;
             }
@@ -136,7 +136,7 @@ public class MarkerEditActivity extends AbstractActivity {
             waypointMarkerType.setText("");
             waypointDescription.setText("");
         } else {
-            waypoint = ContentProviderUtils.Factory.get(this).getWaypoint(markerId);
+            waypoint = new ContentProviderUtils(this).getWaypoint(markerId);
             if (waypoint == null) {
                 Log.d(TAG, "waypoint is null");
                 finish();
@@ -182,6 +182,6 @@ public class MarkerEditActivity extends AbstractActivity {
             waypoint.setCategory(waypointMarkerType.getText().toString());
             waypoint.setDescription(waypointDescription.getText().toString());
         }
-        ContentProviderUtils.Factory.get(this).updateWaypoint(waypoint);
+        new ContentProviderUtils(this).updateWaypoint(waypoint);
     }
 }

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

@@ -69,7 +69,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     private SharedPreferences sharedPreferences;
 
     private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
-    private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
+    private boolean recordingTrackPaused;
     /*
      * Note that sharedPreferenceChangeListener cannot be an anonymous inner
      * class. Anonymous inner class will get garbage collected.
@@ -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))) {
+            if (PreferencesUtils.isKey(MarkerListActivity.this, R.string.recording_track_id_key, key)) {
-                recordingTrackId = PreferencesUtils.getLong(MarkerListActivity.this, R.string.recording_track_id_key);
+                recordingTrackId = PreferencesUtils.getRecordingTrackId(MarkerListActivity.this);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(MarkerListActivity.this, R.string.recording_track_paused_key))) {
+            if (PreferencesUtils.isKey(MarkerListActivity.this, R.string.recording_track_paused_key, key)) {
-                recordingTrackPaused = PreferencesUtils.getBoolean(MarkerListActivity.this, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(MarkerListActivity.this);
             }
             if (key != null) {
                 runOnUiThread(new Runnable() {
@@ -128,7 +128,9 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
+
+        contentProviderUtils = new ContentProviderUtils(this);
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
         long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L);

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

@@ -57,7 +57,6 @@ import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.ListItemUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.ToolbarUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 
 /**
@@ -102,7 +101,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
 
     private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
 
-    private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
+    private boolean recordingTrackPaused;
 
     // Callback when an item is selected in the contextual action mode
     private ContextualActionModeCallback contextualActionModeCallback = new ContextualActionModeCallback() {
@@ -123,10 +122,6 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
             MenuItem shareMenuItem = menu.findItem(R.id.list_context_menu_share);
             if (isSingleSelectionTrack) {
                 shareMenuItem.setVisible(!isRecording);
-                Map<String, Object> item = arrayAdapter.getItem(positions[0]);
-                Long trackId = (Long) item.get(TRACK_ID_FIELD);
-
-                ToolbarUtils.setupShareActionProvider(SearchListActivity.this, shareMenuItem, new long[]{trackId});
             }
 
             // One item, item is a marker
@@ -148,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))) {
+            if (PreferencesUtils.isKey(SearchListActivity.this, R.string.recording_track_id_key, key)) {
-                recordingTrackId = PreferencesUtils.getLong(SearchListActivity.this, R.string.recording_track_id_key);
+                recordingTrackId = PreferencesUtils.getRecordingTrackId(SearchListActivity.this);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(SearchListActivity.this, R.string.recording_track_paused_key))) {
+            if (PreferencesUtils.isKey(SearchListActivity.this, R.string.recording_track_paused_key, key)) {
-                recordingTrackPaused = PreferencesUtils.getBoolean(SearchListActivity.this, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(SearchListActivity.this);
             }
             if (key != null) {
                 runOnUiThread(new Runnable() {
@@ -173,7 +168,9 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
         super.onCreate(savedInstanceState);
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
+
+        contentProviderUtils = new ContentProviderUtils(this);
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
         searchEngine = new SearchEngine(contentProviderUtils);
@@ -290,6 +287,11 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
             case R.id.list_context_menu_show_on_map:
                 IntentUtils.showCoordinateOnMap(this, (double) item.get(MARKER_LATITUDE_FIELD), (double) item.get(MARKER_LONGITUDE_FIELD), item.get(NAME_FIELD) + "");
                 return true;
+            case R.id.list_context_menu_share:
+                intent = IntentUtils.newShareFileIntent(this, new long[]{trackId});
+                intent = Intent.createChooser(intent, null);
+                startActivity(intent);
+                return true;
             case R.id.list_context_menu_edit:
                 if (markerId != null) {
                     intent = IntentUtils.newIntent(this, MarkerEditActivity.class)

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

@@ -45,17 +45,17 @@ import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.Waypoint;
 import de.dennisguse.opentracks.content.Waypoint.WaypointType;
 import de.dennisguse.opentracks.content.WaypointCreationRequest;
-import de.dennisguse.opentracks.fragments.ChartFragment;
+import de.dennisguse.opentracks.fragments.ChartDistanceFragment;
+import de.dennisguse.opentracks.fragments.ChartTimeFragment;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
-import de.dennisguse.opentracks.fragments.FrequencyDialogFragment;
 import de.dennisguse.opentracks.fragments.StatsFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.ToolbarUtils;
+import de.dennisguse.opentracks.util.StatsUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackUtils;
 
@@ -95,8 +95,7 @@ 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 recordingTrackPaused;
-    private boolean showOnLockScreen = PreferencesUtils.SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN;
 
     private final Runnable bindChangedCallback = new Runnable() {
         @Override
@@ -123,20 +122,18 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
      * Note that sharedPreferenceChangeListener cannot be an anonymous inner
      * class. Anonymous inner class will get garbage collected.
      */
-    private final OnSharedPreferenceChangeListener
+    private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
-            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))) {
+            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.recording_track_id_key, key)) {
-                recordingTrackId = PreferencesUtils.getLong(TrackDetailActivity.this, R.string.recording_track_id_key);
+                recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackDetailActivity.this);
             }
 
-            if (key == null || key.equals(PreferencesUtils.getKey(TrackDetailActivity.this, R.string.recording_track_paused_key))) {
+            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.recording_track_paused_key, key)) {
-                recordingTrackPaused = PreferencesUtils.getBoolean(TrackDetailActivity.this, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(TrackDetailActivity.this);
             }
 
-            if (key == null || key.equals(PreferencesUtils.getKey(TrackDetailActivity.this, R.string.trackdetail_show_on_lockscreen_while_recording_key))) {
+            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.stats_show_on_lockscreen_while_recording_key, key)) {
-                showOnLockScreen = PreferencesUtils.getBoolean(TrackDetailActivity.this, R.string.trackdetail_show_on_lockscreen_while_recording_key, PreferencesUtils.SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN);
                 setLockscreenPolicy();
             }
 
@@ -157,8 +154,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     private MenuItem insertPhotoMenuItem;
     private MenuItem markerListMenuItem;
     private MenuItem shareMenuItem;
-    private MenuItem voiceFrequencyMenuItem;
-    private MenuItem splitFrequencyMenuItem;
 
     private final OnClickListener recordListener = new OnClickListener() {
         @Override
@@ -188,11 +183,13 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
+
         hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
         photoUri = savedInstanceState != null ? (Uri) savedInstanceState.getParcelable(PHOTO_URI_KEY) : null;
         hasPhoto = savedInstanceState != null && savedInstanceState.getBoolean(HAS_PHOTO_KEY, false);
 
-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        contentProviderUtils = new ContentProviderUtils(this);
         handleIntent(getIntent());
 
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
@@ -209,8 +206,11 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         TabSpec statsTabSpec = tabHost.newTabSpec(StatsFragment.STATS_FRAGMENT_TAG).setIndicator(getString(R.string.track_detail_stats_tab));
         tabsAdapter.addTab(statsTabSpec, StatsFragment.class, null);
 
-        TabSpec chartTabSpec = tabHost.newTabSpec(ChartFragment.CHART_FRAGMENT_TAG).setIndicator(getString(R.string.track_detail_chart_tab));
+        TabSpec chartTimeTabSpec = tabHost.newTabSpec(ChartTimeFragment.CHART_FRAGMENT_TAG).setIndicator(getString(R.string.settings_chart_by_time));
-        tabsAdapter.addTab(chartTabSpec, ChartFragment.class, null);
+        tabsAdapter.addTab(chartTimeTabSpec, ChartTimeFragment.class, null);
+
+        TabSpec chartDistanceTabSpec = tabHost.newTabSpec(ChartDistanceFragment.CHART_FRAGMENT_TAG).setIndicator(getString(R.string.settings_chart_by_distance));
+        tabsAdapter.addTab(chartDistanceTabSpec, ChartDistanceFragment.class, null);
 
         if (savedInstanceState != null) {
             tabHost.setCurrentTabByTag(savedInstanceState.getString(CURRENT_TAB_TAG_KEY));
@@ -231,12 +231,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().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-                getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-            else getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
         }
     }
 
@@ -276,7 +278,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) {
@@ -316,12 +318,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
         insertPhotoMenuItem = menu.findItem(R.id.track_detail_insert_photo);
         insertPhotoMenuItem.setVisible(new Intent(MediaStore.ACTION_IMAGE_CAPTURE).resolveActivity(getPackageManager()) != null);
-
         shareMenuItem = menu.findItem(R.id.track_detail_share);
-        ToolbarUtils.setupShareActionProviderCompat(this, shareMenuItem, new long[]{trackId});
-
-        voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency);
-        splitFrequencyMenuItem = menu.findItem(R.id.track_detail_split_frequency);
         markerListMenuItem = menu.findItem(R.id.track_detail_markers);
 
         return super.onCreateOptionsMenu(menu);
@@ -343,6 +340,11 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                         .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId);
                 startActivity(intent);
                 return true;
+            case R.id.track_detail_share:
+                intent = IntentUtils.newShareFileIntent(this, new long[]{trackId});
+                intent = Intent.createChooser(intent, null);
+                startActivity(intent);
+                return true;
             case R.id.track_detail_insert_photo:
                 if (!FileUtils.isExternalStorageWriteable() || ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
                     ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
@@ -358,12 +360,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                         .putExtra(MarkerListActivity.EXTRA_TRACK_ID, trackId);
                 startActivity(intent);
                 return true;
-            case R.id.track_detail_voice_frequency:
-                FrequencyDialogFragment.showDialog(getSupportFragmentManager(), R.string.voice_frequency_key, PreferencesUtils.VOICE_FREQUENCY_DEFAULT, R.string.menu_voice_frequency);
-                return true;
-            case R.id.track_detail_split_frequency:
-                FrequencyDialogFragment.showDialog(getSupportFragmentManager(), R.string.split_frequency_key, PreferencesUtils.SPLIT_FREQUENCY_DEFAULT, R.string.menu_split_frequency);
-                return true;
             case R.id.track_detail_edit:
                 intent = IntentUtils.newIntent(this, TrackEditActivity.class)
                         .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId);
@@ -420,10 +416,16 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     /**
      * Gets the track id.
      */
+    // TODO Seems to be no used.
+    @Deprecated
     public long getTrackId() {
         return trackId;
     }
 
+    private void setBluetoothHeartRateSensorName(String sensorName) {
+        StatsUtils.setBluetoothHeartRateSensorName(this, sensorName, isRecording());
+    }
+
     /**
      * Handles the data in the intent.
      */
@@ -465,8 +467,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         insertPhotoMenuItem.setVisible(hasCamera && isRecording() && !isPaused);
         shareMenuItem.setVisible(!isRecording());
         markerListMenuItem.setShowAsAction(isRecording() ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        voiceFrequencyMenuItem.setVisible(isRecording());
-        splitFrequencyMenuItem.setVisible(isRecording());
         String title;
         if (isRecording()) {
             title = getString(isPaused ? R.string.generic_paused : R.string.generic_recording);

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

@@ -73,7 +73,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
             return;
         }
 
-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        contentProviderUtils = new ContentProviderUtils(this);
         track = contentProviderUtils.getTrack(trackId);
         if (track == null) {
             Log.e(TAG, "No track for " + trackId);

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

@@ -60,8 +60,8 @@ import de.dennisguse.opentracks.util.ActivityUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.ListItemUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.ServiceUtils;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.ToolbarUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackUtils;
 
@@ -115,9 +115,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         public void onPrepare(Menu menu, int[] positions, long[] trackIds, boolean showSelectAll) {
             boolean isSingleSelection = trackIds.length == 1;
 
-            MenuItem shareMenuItem = menu.findItem(R.id.list_context_menu_share);
-            ToolbarUtils.setupShareActionProvider(TrackListActivity.this, shareMenuItem, trackIds);
-
             menu.findItem(R.id.list_context_menu_edit).setVisible(isSingleSelection);
             menu.findItem(R.id.list_context_menu_select_all).setVisible(showSelectAll);
         }
@@ -128,7 +125,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         }
     };
 
-    private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
+    private boolean recordingTrackPaused;
 
     /*
      * Note that sharedPreferenceChangeListener cannot be an anonymous inner class.
@@ -138,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(
+            if (PreferencesUtils.isKey(TrackListActivity.this, R.string.recording_track_id_key, key)) {
-                    PreferencesUtils.getKey(TrackListActivity.this, R.string.recording_track_id_key))) {
+                recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackListActivity.this);
-                recordingTrackId = PreferencesUtils.getLong(
-                        TrackListActivity.this, R.string.recording_track_id_key);
                 if (key != null && PreferencesUtils.isRecording(recordingTrackId)) {
                     trackRecordingServiceConnection.startAndBind();
                 }
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(
+            if (PreferencesUtils.isKey(TrackListActivity.this, R.string.recording_track_paused_key, key)) {
-                    TrackListActivity.this, R.string.recording_track_paused_key))) {
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(TrackListActivity.this);
-                recordingTrackPaused = PreferencesUtils.getBoolean(TrackListActivity.this,
-                        R.string.recording_track_paused_key,
-                        PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
             }
             if (key != null) {
                 runOnUiThread(new Runnable() {
@@ -229,12 +221,11 @@ 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();
-            } else {
+            } else if (recordingTrackPaused) {
-                if (recordingTrackPaused) {
                     // Paused -> Resume
                     updateMenuItems(false, true);
                     trackRecordingServiceConnection.resumeTrack();
@@ -245,7 +236,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                     trackRecordingServiceConnection.pauseTrack();
                     trackController.update(true, true);
                 }
-            }
         }
     };
 
@@ -253,7 +243,9 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
+
+        contentProviderUtils = new ContentProviderUtils(this);
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, bindChangedCallback);
@@ -386,7 +378,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        boolean isGpsStarted = TrackRecordingServiceConnection.isRecordingServiceRunning(this);
+        boolean isGpsStarted = ServiceUtils.isTrackRecordingServiceRunning(this);
         boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
         updateMenuItems(isGpsStarted, isRecording);
 
@@ -406,7 +398,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                     intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
                     startActivity(intent);
                 } else {
-                    startGps = !TrackRecordingServiceConnection.isRecordingServiceRunning(this);
+                    startGps = !ServiceUtils.isTrackRecordingServiceRunning(this);
 
                     // Show toast
                     Toast toast = Toast.makeText(this, startGps ? R.string.gps_starting : R.string.gps_stopping, Toast.LENGTH_SHORT);
@@ -531,12 +523,18 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
      * @return true if handled.
      */
     private boolean handleContextItem(int itemId, long[] trackIds) {
+        Intent intent;
         switch (itemId) {
             case R.id.list_context_menu_show_on_map:
                 IntentUtils.showTrackOnMap(this, trackIds);
                 return true;
+            case R.id.list_context_menu_share:
+                intent = IntentUtils.newShareFileIntent(this, trackIds);
+                intent = Intent.createChooser(intent, null);
+                startActivity(intent);
+                return true;
             case R.id.list_context_menu_edit:
-                Intent intent = IntentUtils.newIntent(this, TrackEditActivity.class)
+                intent = IntentUtils.newIntent(this, TrackEditActivity.class)
                         .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackIds[0]);
                 startActivity(intent);
                 return true;

src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package de.dennisguse.opentracks;
+package de.dennisguse.opentracks.chart;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/main/java/de/dennisguse/opentracks/chart/ChartView.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package de.dennisguse.opentracks;
+package de.dennisguse.opentracks.chart;
 
 import android.content.Context;
 import android.content.Intent;
@@ -27,15 +27,19 @@ import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.view.GestureDetector;
 import android.view.MotionEvent;
-import android.view.VelocityTracker;
+import android.view.ScaleGestureDetector;
 import android.view.View;
-import android.view.ViewConfiguration;
 import android.widget.Scroller;
 
+import androidx.core.view.GestureDetectorCompat;
+
 import java.text.NumberFormat;
 import java.util.ArrayList;
 
+import de.dennisguse.opentracks.MarkerDetailActivity;
+import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.Waypoint;
 import de.dennisguse.opentracks.stats.ExtremityMonitor;
 import de.dennisguse.opentracks.util.IntentUtils;
@@ -44,6 +48,7 @@ import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
  * Visualization of the chart.
+ * Provides support for zooming (via pinch), scrolling, flinging, and selecting shown markers (single touch).
  *
  * @author Sandor Dornbush
  * @author Leif Hendrik Wilden
@@ -91,8 +96,6 @@ public class ChartView extends View {
     private final int markerHeight;
     private final Scroller scroller;
     private double maxX = 1.0;
-    private VelocityTracker velocityTracker = null;
-    private float lastMotionEventX = -1;
     private int zoomLevel = 1;
 
     private int leftBorder = BORDER;
@@ -107,18 +110,84 @@ public class ChartView extends View {
     private int effectiveWidth = 0;
     private int effectiveHeight = 0;
 
-    private boolean chartByDistance = true;
+    private boolean chartByDistance;
     private boolean metricUnits = true;
     private boolean reportSpeed = true;
     private boolean showPointer = false;
 
-    /**
+    private GestureDetectorCompat detectorScrollFlingTab = new GestureDetectorCompat(getContext(), new GestureDetector.SimpleOnGestureListener() {
-     * Constructor.
+
-     *
+        @Override
-     * @param context the context
+        public boolean onDown(MotionEvent e) {
-     */
+            if (!scroller.isFinished()) {
-    public ChartView(Context context) {
+                scroller.abortAnimation();
+            }
+            return true;
+        }
+
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            if (Math.abs(distanceX) > 0) {
+                int availableToScroll = effectiveWidth * (zoomLevel - 1) - getScrollX();
+                if (availableToScroll > 0) {
+                    scrollBy(Math.min(availableToScroll, (int) distanceX));
+                }
+            }
+            return true;
+        }
+
+        @Override
+        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+            fling((int) -velocityX);
+            return true;
+        }
+
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent event) {
+            // Check if the y event is within markerHeight of the marker center
+            if (Math.abs(event.getY() - topBorder - spacer - markerHeight / 2) < markerHeight) {
+                int minDistance = Integer.MAX_VALUE;
+                Waypoint nearestWaypoint = null;
+                synchronized (waypoints) {
+                    for (Waypoint waypoint : waypoints) {
+                        int distance = Math.abs(getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX());
+                        if (distance < minDistance) {
+                            minDistance = distance;
+                            nearestWaypoint = waypoint;
+                        }
+                    }
+                }
+                if (nearestWaypoint != null && minDistance < markerWidth) {
+                    Intent intent = IntentUtils.newIntent(getContext(), MarkerDetailActivity.class)
+                            .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, nearestWaypoint.getId());
+                    getContext().startActivity(intent);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    });
+
+    private ScaleGestureDetector detectorZoom = new ScaleGestureDetector(getContext(), new ScaleGestureDetector.SimpleOnScaleGestureListener() {
+
+        @Override
+        public boolean onScale(ScaleGestureDetector detector) {
+            float scaleFactor = detector.getScaleFactor();
+            if (scaleFactor >= 1.1f) {
+                zoomIn();
+                return true;
+            } else if (scaleFactor <= 0.9) {
+                zoomOut();
+                return true;
+            }
+            return false;
+        }
+    });
+
+    public ChartView(Context context, boolean chartByDistance) {
         super(context);
+        this.chartByDistance = chartByDistance;
 
         series[ELEVATION_SERIES] = new ChartValueSeries(context,
                 Integer.MIN_VALUE,
@@ -222,16 +291,6 @@ public class ChartView extends View {
         series[index].setEnabled(enabled);
     }
 
-    /**
-     * Sets chart by distance.
-     * It is expected that after changing this value, data will be reloaded.
-     *
-     * @param value true for by distance, false for by time
-     */
-    public void setChartByDistance(boolean value) {
-        chartByDistance = value;
-    }
-
     /**
      * Sets metric units.
      *
@@ -410,79 +469,14 @@ public class ChartView extends View {
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        if (velocityTracker == null) {
+        boolean isZoom = detectorZoom.onTouchEvent(event);
-            velocityTracker = VelocityTracker.obtain();
+        boolean isScrollTab = detectorScrollFlingTab.onTouchEvent(event);
-        }
+        return isZoom || isScrollTab;
-        velocityTracker.addMovement(event);
-        float x = event.getX();
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                // Stop the fling
-                if (!scroller.isFinished()) {
-                    scroller.abortAnimation();
-                }
-                lastMotionEventX = x;
-                break;
-            case MotionEvent.ACTION_MOVE:
-                if (lastMotionEventX == -1) {
-                    break;
-                }
-                // Scroll to follow the motion event
-                int deltaX = (int) (lastMotionEventX - x);
-                lastMotionEventX = x;
-                if (deltaX < 0) {
-                    if (getScrollX() > 0) {
-                        scrollBy(deltaX);
-                    }
-                } else if (deltaX > 0) {
-                    int availableToScroll = effectiveWidth * (zoomLevel - 1) - getScrollX();
-                    if (availableToScroll > 0) {
-                        scrollBy(Math.min(availableToScroll, deltaX));
-                    }
-                }
-                break;
-            case MotionEvent.ACTION_UP:
-                // Check if the y event is within markerHeight of the marker center
-                if (Math.abs(event.getY() - topBorder - spacer - markerHeight / 2) < markerHeight) {
-                    int minDistance = Integer.MAX_VALUE;
-                    Waypoint nearestWaypoint = null;
-                    synchronized (waypoints) {
-                        for (int i = 0; i < waypoints.size(); i++) {
-                            Waypoint waypoint = waypoints.get(i);
-                            int distance = Math.abs(getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX());
-                            if (distance < minDistance) {
-                                minDistance = distance;
-                                nearestWaypoint = waypoint;
-                            }
-                        }
-                    }
-                    if (nearestWaypoint != null && minDistance < markerWidth) {
-                        Intent intent = IntentUtils.newIntent(getContext(), MarkerDetailActivity.class)
-                                .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, nearestWaypoint.getId());
-                        getContext().startActivity(intent);
-                        return true;
-                    }
-                }
-
-                VelocityTracker myVelocityTracker = velocityTracker;
-                myVelocityTracker.computeCurrentVelocity(1000);
-                int initialVelocity = (int) myVelocityTracker.getXVelocity();
-                if (Math.abs(initialVelocity) > ViewConfiguration.getMinimumFlingVelocity()) {
-                    fling(-initialVelocity);
-                }
-                if (velocityTracker != null) {
-                    velocityTracker.recycle();
-                    velocityTracker = null;
-                }
-                break;
-        }
-        return true;
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        updateEffectiveDimensionsIfChanged(
+        updateEffectiveDimensionsIfChanged(View.MeasureSpec.getSize(widthMeasureSpec), View.MeasureSpec.getSize(heightMeasureSpec));
-                View.MeasureSpec.getSize(widthMeasureSpec), View.MeasureSpec.getSize(heightMeasureSpec));
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
@@ -632,8 +626,7 @@ public class ChartView extends View {
     private String getXAxisLabel() {
         Context context = getContext();
         if (chartByDistance) {
-            return metricUnits ? context.getString(R.string.unit_kilometer)
+            return metricUnits ? context.getString(R.string.unit_kilometer) : context.getString(R.string.unit_mile);
-                    : context.getString(R.string.unit_mile);
         } else {
             return context.getString(R.string.description_time);
         }
@@ -733,8 +726,7 @@ public class ChartView extends View {
      * @param yValue           the y value
      * @return the marker width.
      */
-    private float drawYAxisMarker(
+    private float drawYAxisMarker(ChartValueSeries chartValueSeries, Canvas canvas, int xPosition, int yValue) {
-            ChartValueSeries chartValueSeries, Canvas canvas, int xPosition, int yValue) {
         String marker = chartValueSeries.formatMarker(yValue);
         Paint paint = chartValueSeries.getMarkerPaint();
         Rect rect = getRect(paint, marker);
@@ -869,8 +861,7 @@ public class ChartView extends View {
         topBorder = (int) (density * BORDER + titleDimensions[0] * (titleDimensions[1] + spacer));
         Rect xAxisLabelRect = getRect(axisPaint, getXAxisLabel());
         // border + x axis marker + spacer + .5 x axis label
-        bottomBorder = (int) (density * BORDER + getRect(xAxisMarkerPaint, "1").height() + spacer
+        bottomBorder = (int) (density * BORDER + getRect(xAxisMarkerPaint, "1").height() + spacer + (xAxisLabelRect.height() / 2));
-                + (xAxisLabelRect.height() / 2));
         rightBorder = (int) (density * BORDER + xAxisLabelRect.width() + spacer);
         updateEffectiveDimensions();
     }

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

@@ -0,0 +1,20 @@
+package de.dennisguse.opentracks.content;
+
+import android.location.Location;
+import android.location.LocationManager;
+
+/**
+ * Creates a new {@link SensorDataSetLocation}.
+ * An implementation can create new instances or reuse existing instances for optimization.
+ */
+public class LocationFactory {
+
+    /**
+     * The default {@link LocationFactory} which creates a location each time.
+     */
+    public static LocationFactory DEFAULT_LOCATION_FACTORY = new LocationFactory();
+
+    public Location createLocation() {
+        return new SensorDataSetLocation(LocationManager.GPS_PROVIDER);
+    }
+}

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

@@ -0,0 +1,22 @@
+package de.dennisguse.opentracks.content;
+
+import android.database.Cursor;
+import android.location.Location;
+
+import java.util.Iterator;
+
+/**
+ * A lightweight wrapper around the original {@link Cursor} with a method to clean up.
+ */
+public interface LocationIterator extends Iterator<Location>, AutoCloseable {
+
+    /**
+     * Gets the most recently retrieved track point id by {@link #next()}.
+     */
+    long getLocationId();
+
+    /**
+     * Closes the iterator.
+     */
+    void close();
+}

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/ShareContentProvider.java

@@ -198,7 +198,7 @@ public class ShareContentProvider extends CustomContentProvider implements ICont
     @Nullable
     @Override
     public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
-        ContentProviderUtils contentProviderUtils = new ContentProviderUtilsImpl(this);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(this);
 
         long[] trackIds = parseURI(uri);
         final Track[] tracks = new Track[trackIds.length];

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

@@ -30,7 +30,6 @@ import java.util.EnumSet;
 import java.util.Set;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
@@ -45,7 +44,7 @@ public class TrackDataHub implements DataSourceListener {
      * Target number of track points displayed by the map overlay.
      * We may display more than this number of points.
      */
-    static final int TARGET_DISPLAYED_TRACK_POINTS = 5000;
+    private static final int TARGET_DISPLAYED_TRACK_POINTS = 5000;
 
     /**
      * Maximum number of waypoints to displayed.
@@ -97,8 +96,7 @@ public class TrackDataHub implements DataSourceListener {
     }
 
     public synchronized static TrackDataHub newInstance(Context context) {
-        return new TrackDataHub(context, new TrackDataManager(), ContentProviderUtils.Factory.get(
+        return new TrackDataHub(context, new TrackDataManager(), new ContentProviderUtils(context), TARGET_DISPLAYED_TRACK_POINTS);
-                context), TARGET_DISPLAYED_TRACK_POINTS);
     }
 
     public void start() {
@@ -254,13 +252,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))) {
+                if (PreferencesUtils.isKey(context, R.string.recording_track_id_key, key)) {
-                    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))) {
+                if (PreferencesUtils.isKey(context, R.string.recording_track_paused_key, key)) {
-                    recordingTrackPaused = PreferencesUtils.getBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+                    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 +268,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 +278,8 @@ public class TrackDataHub implements DataSourceListener {
                         }
                     }
                 }
-                if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_gps_accuracy_key))) {
+                if (PreferencesUtils.isKey(context, R.string.recording_gps_accuracy_key, key)) {
-                    recordingGpsAccuracy = PreferencesUtils.getInt(context, R.string.recording_gps_accuracy_key, PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
+                    recordingGpsAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
                     if (key != null) {
                         for (TrackDataListener trackDataListener : trackDataManager.getListeners(TrackDataType.PREFERENCE)) {
                             if (trackDataListener.onRecordingGpsAccuracy(recordingGpsAccuracy)) {
@@ -290,8 +288,8 @@ public class TrackDataHub implements DataSourceListener {
                         }
                     }
                 }
-                if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_distance_interval_key))) {
+                if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) {
-                    recordingDistanceInterval = PreferencesUtils.getInt(context, R.string.recording_distance_interval_key, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
+                    recordingDistanceInterval = PreferencesUtils.getRecordingDistanceInterval(context);
                     if (key != null) {
                         for (TrackDataListener trackDataListener : trackDataManager.getListeners(TrackDataType.PREFERENCE)) {
                             if (trackDataListener.onRecordingDistanceIntervalChanged(recordingDistanceInterval)) {
@@ -448,7 +446,7 @@ public class TrackDataHub implements DataSourceListener {
         int samplingFrequency = -1;
         boolean includeNextPoint = false;
 
-        try (LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, localLastSeenLocationId + 1, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY)) {
+        try (LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, localLastSeenLocationId + 1, false, LocationFactory.DEFAULT_LOCATION_FACTORY)) {
 
             while (locationIterator.hasNext()) {
                 Location location = locationIterator.next();

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;
@@ -40,7 +40,7 @@ public final class SensorDataSet {
     }
 
     public boolean hasHeartRate() {
-        return !Float.isNaN(heartRate);
+        return !Float.isNaN(heartRate) && heartRate > 0;
     }
 
     public float getHeartRate() {

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

@@ -8,6 +8,7 @@ public enum SensorState {
     NONE,
     CONNECTING,
     CONNECTED,
+    DISCONNECTING,
     DISCONNECTED;
 
     public static String getStateAsString(SensorState state, Context c) {
@@ -18,6 +19,8 @@ public enum SensorState {
                 return c.getString(R.string.sensor_state_connecting);
             case CONNECTED:
                 return c.getString(R.string.sensor_state_connected);
+            case DISCONNECTING:
+                return c.getString(R.string.sensor_state_disconnected);
             case DISCONNECTED:
                 return c.getString(R.string.sensor_state_disconnected);
             default:

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

@@ -0,0 +1,10 @@
+package de.dennisguse.opentracks.fragments;
+
+public class ChartDistanceFragment extends ChartFragment {
+
+    public static final String CHART_FRAGMENT_TAG = ChartDistanceFragment.class.getSimpleName();
+
+    public ChartDistanceFragment() {
+        super(true);
+    }
+}

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

@@ -22,9 +22,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
-import android.widget.ZoomControls;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -32,9 +32,9 @@ import androidx.fragment.app.FragmentActivity;
 import java.util.ArrayList;
 import java.util.EnumSet;
 
-import de.dennisguse.opentracks.ChartView;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.TrackDataHub;
@@ -54,9 +54,9 @@ import de.dennisguse.opentracks.util.UnitConversions;
  * @author Sandor Dornbush
  * @author Rodrigo Damazio
  */
-public class ChartFragment extends Fragment implements TrackDataListener {
+public abstract class ChartFragment extends Fragment implements TrackDataListener {
 
-    public static final String CHART_FRAGMENT_TAG = "chartFragment";
+    private static final String STATE_CHART_VIEW_BY_DISTANCE_KEY = "chartViewByDistance";
 
     private final ArrayList<double[]> pendingPoints = new ArrayList<>();
 
@@ -68,18 +68,17 @@ public class ChartFragment extends Fragment implements TrackDataListener {
 
     private boolean metricUnits = true;
     private boolean reportSpeed = true;
-    private int recordingDistanceInterval = PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT;
+    private int recordingDistanceInterval;
 
     // Modes of operation
-    private boolean chartByDistance = true;
+    private boolean chartByDistance;
     private boolean[] chartShow = new boolean[]{true, true, true, true, true, true};
 
     // UI elements
     private ChartView chartView;
-    private ZoomControls zoomControls;
 
     /**
-     * A runnable that will enable/disable zoom controls and orange pointer as appropriate and redraw.
+     * A runnable that will set the orange pointer as appropriate and redraw.
      */
     private final Runnable updateChart = new Runnable() {
         @Override
@@ -88,46 +87,34 @@ public class ChartFragment extends Fragment implements TrackDataListener {
                 return;
             }
 
-            zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
-            zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
             chartView.setShowPointer(isSelectedTrackRecording());
             chartView.invalidate();
         }
     };
 
+    public ChartFragment(boolean chartByDistance) {
+        this.chartByDistance = chartByDistance;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        /*
+        recordingDistanceInterval = PreferencesUtils.getRecordingDistanceIntervalDefault(getContext());
-         * Create a chartView here to store data thus won't need to reload all the data on every onStart or onResume.
+
-         */
+        // Create a chartView here to store data thus won't need to reload all the data on every onStart or onResume.
-        chartView = new ChartView(getActivity());
+        chartView = new ChartView(getActivity(), chartByDistance);
     }
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.chart, container, false);
+        return inflater.inflate(R.layout.chart, container, false);
-        zoomControls = view.findViewById(R.id.chart_zoom_controls);
-        zoomControls.setOnZoomInClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                zoomIn();
-            }
-        });
-        zoomControls.setOnZoomOutClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                zoomOut();
-            }
-        });
-        return view;
     }
 
     @Override
     public void onStart() {
         super.onStart();
-        ViewGroup layout = getActivity().findViewById(R.id.chart_view_layout);
+        ViewGroup layout = getView().findViewById(R.id.chart_view_layout);
         LayoutParams layoutParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         layout.addView(chartView, layoutParams);
     }
@@ -149,10 +136,24 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     @Override
     public void onStop() {
         super.onStop();
-        ViewGroup layout = getActivity().findViewById(R.id.chart_view_layout);
+        ViewGroup layout = getView().findViewById(R.id.chart_view_layout);
         layout.removeView(chartView);
     }
 
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(STATE_CHART_VIEW_BY_DISTANCE_KEY, chartByDistance);
+    }
+
+    @Override
+    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+        super.onViewStateRestored(savedInstanceState);
+        if (savedInstanceState != null) {
+            chartByDistance = savedInstanceState.getBoolean(STATE_CHART_VIEW_BY_DISTANCE_KEY);
+        }
+    }
+
     @Override
     public void onTrackUpdated(Track track) {
         if (isResumed()) {
@@ -263,8 +264,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
             }
             reportSpeed = speed;
             chartView.setReportSpeed(reportSpeed);
-            boolean chartShowSpeed = PreferencesUtils.getBoolean(
+            boolean chartShowSpeed = PreferencesUtils.shouldChartShowSpeed(getActivity());
-                    getActivity(), R.string.chart_show_speed_key, PreferencesUtils.CHART_SHOW_SPEED_DEFAULT);
             setSeriesEnabled(ChartView.SPEED_SERIES, chartShowSpeed && reportSpeed);
             setSeriesEnabled(ChartView.PACE_SERIES, chartShowSpeed && !reportSpeed);
             runOnUiThread(new Runnable() {
@@ -303,30 +303,24 @@ public class ChartFragment extends Fragment implements TrackDataListener {
      */
     private void checkChartSettings() {
         boolean needUpdate = false;
-        if (chartByDistance != PreferencesUtils.isChartByDistance(getActivity())) {
+        if (setSeriesEnabled(ChartView.ELEVATION_SERIES, PreferencesUtils.shouldChartShowElevation(getActivity()))) {
-            chartByDistance = !chartByDistance;
-            chartView.setChartByDistance(chartByDistance);
-            reloadTrackDataHub();
-            needUpdate = true;
-        }
-        if (setSeriesEnabled(ChartView.ELEVATION_SERIES, PreferencesUtils.getBoolean(getActivity(), R.string.chart_show_elevation_key, PreferencesUtils.CHART_SHOW_ELEVATION_DEFAULT))) {
             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) {
@@ -389,18 +383,6 @@ public class ChartFragment extends Fragment implements TrackDataListener {
         }
     }
 
-    private void zoomIn() {
-        chartView.zoomIn();
-        zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
-        zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
-    }
-
-    private void zoomOut() {
-        chartView.zoomOut();
-        zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
-        zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
-    }
-
     /**
      * Runs a runnable on the UI thread if possible.
      *

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

@@ -0,0 +1,10 @@
+package de.dennisguse.opentracks.fragments;
+
+public class ChartTimeFragment extends ChartFragment {
+
+    public static final String CHART_FRAGMENT_TAG = ChartTimeFragment.class.getSimpleName();
+
+    public ChartTimeFragment() {
+        super(false);
+    }
+}

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/DeleteMarkerDialogFragment.java

@@ -81,7 +81,7 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
                         new Thread(new Runnable() {
                             @Override
                             public void run() {
-                                ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(fragmentActivity);
+                                ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity);
                                 for (long markerId : markerIds) {
                                     contentProviderUtils.deleteWaypoint(fragmentActivity,
                                             markerId, new DescriptionGeneratorImpl(fragmentActivity));

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

@@ -1,105 +0,0 @@
-/*
- * Copyright 2012 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.fragments;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.StringUtils;
-
-/**
- * A DialogFragment to configure frequency.
- *
- * @author Jimmy Shih
- */
-public class FrequencyDialogFragment extends DialogFragment {
-
-    private static final String FREQUENCY_DIALOG_TAG = "frequencyDialog";
-    private int preferenceId;
-    private int defaultValue;
-    private int titleId;
-
-    public FrequencyDialogFragment(int preferenceId, int defaultValue, int titleId) {
-        this.preferenceId = preferenceId;
-        this.defaultValue = defaultValue;
-        this.titleId = titleId;
-    }
-
-    public static void showDialog(FragmentManager fragmentManager, int preferenceId, int defaultValue, int titleId) {
-        new FrequencyDialogFragment(preferenceId, defaultValue, titleId).show(fragmentManager, FREQUENCY_DIALOG_TAG);
-    }
-
-    @Override
-    @NonNull
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        FragmentActivity fragmentActivity = getActivity();
-
-        int frequencyValue = PreferencesUtils.getInt(fragmentActivity, preferenceId, defaultValue);
-
-        return new AlertDialog.Builder(fragmentActivity).setPositiveButton(
-                R.string.generic_ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        int listIndex = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
-                        PreferencesUtils.setInt(getActivity(), preferenceId, getFrequencyValue(listIndex));
-                    }
-                }).setSingleChoiceItems(
-                getFrequencyDisplayOptions(fragmentActivity), getListIndex(frequencyValue), null)
-                .setTitle(titleId).create();
-    }
-
-    /**
-     * Gets the frequency display options.
-     */
-    private String[] getFrequencyDisplayOptions(FragmentActivity fragmentActivity) {
-        boolean metricUnits = PreferencesUtils.isMetricUnits(fragmentActivity);
-        return StringUtils.getFrequencyOptions(fragmentActivity, metricUnits);
-    }
-
-    /**
-     * Gets the list index for a frequency value.
-     * Returns 0 if the value is not on the list.
-     */
-    private int getListIndex(int frequencyValue) {
-        String[] values = getResources().getStringArray(R.array.frequency_values);
-        for (int i = 0; i < values.length; i++) {
-            if (frequencyValue == Integer.parseInt(values[i])) {
-                return i;
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * Gets the frequency value from a list index.
-     *
-     * @param listIndex the list index
-     */
-    private int getFrequencyValue(int listIndex) {
-        String[] values = getResources().getStringArray(R.array.frequency_values);
-        return Integer.parseInt(values[listIndex]);
-    }
-}

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

@@ -110,7 +110,7 @@ public class MarkerDetailFragment extends Fragment {
             getFragmentManager().popBackStack();
             return;
         }
-        contentProviderUtils = ContentProviderUtils.Factory.get(getActivity());
+        contentProviderUtils = new ContentProviderUtils(getActivity());
         handler = new Handler();
         setHasOptionsMenu(true);
     }

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

@@ -43,10 +43,8 @@ import de.dennisguse.opentracks.content.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.ITrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.services.sensors.RemoteSensorManager;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.LocationUtils;
-import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StatsUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
@@ -59,7 +57,7 @@ import de.dennisguse.opentracks.util.UnitConversions;
  */
 public class StatsFragment extends Fragment implements TrackDataListener {
 
-    public static final String STATS_FRAGMENT_TAG = "statsFragment";
+    public static final String STATS_FRAGMENT_TAG = StatsFragment.class.getSimpleName();
 
     private TrackDataHub trackDataHub;
     private Handler handlerUpdateUI;
@@ -68,7 +66,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() {
@@ -83,7 +80,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
         }
     };
     private String category = "";
-    private int recordingGpsAccuracy = PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT;
+    private int recordingGpsAccuracy;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -93,9 +90,10 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+
+        recordingGpsAccuracy = Integer.parseInt(getContext().getResources().getString(R.string.recording_gps_accuracy_default));
+
         handlerUpdateUI = new Handler();
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection(getContext(), null);
-        trackRecordingServiceConnection.startConnection(getContext());
 
         Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon);
         activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), ""));
@@ -123,6 +121,10 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     public void onResume() {
         super.onResume();
         resumeTrackDataHub();
+
+        trackRecordingServiceConnection = new TrackRecordingServiceConnection(getContext(), null);
+        trackRecordingServiceConnection.startConnection(getContext());
+
         updateUi(getActivity());
         if (isSelectedTrackRecording()) {
             handlerUpdateUI.post(updateUIeachSecond);
@@ -140,6 +142,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     public void onStop() {
         super.onStop();
         trackRecordingServiceConnection.unbind();
+        trackRecordingServiceConnection = null;
     }
 
     @Override
@@ -298,13 +301,14 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     }
 
     /**
-     * Tries to fetch most recent {@link SensorDataSet} {@link RemoteSensorManager}.
+     * Tries to fetch most recent {@link SensorDataSet} {@link de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager}.
      */
     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/TrackFileFormat.java

@@ -173,10 +173,12 @@ public enum TrackFileFormat {
 
     private static final String MIME_KML = "application/vnd.google-earth.kml+xml";
 
-    public TrackExporter newTrackExporter(Context context, Track[] tracks, TrackExporterListener trackExporterListener) {
+    private static TrackExporter newKmzTrackExporter(Context context, TrackWriter trackWriter, Track[] tracks, TrackExporterListener trackExporterListener, boolean exportPhotos) {
-        ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
-        TrackWriter trackWriter = this.newTrackWriter(context, tracks.length > 1);
+
-        return new FileTrackExporter(contentProviderUtils, trackWriter, tracks, trackExporterListener);
+        FileTrackExporter fileTrackExporter = new FileTrackExporter(contentProviderUtils, trackWriter, tracks, trackExporterListener);
+
+        return new KmzTrackExporter(contentProviderUtils, fileTrackExporter, tracks, exportPhotos);
     }
 
     /**
@@ -184,12 +186,10 @@ public enum TrackFileFormat {
      */
     public abstract String getMimeType();
 
-    private static TrackExporter newKmzTrackExporter(Context context, TrackWriter trackWriter, Track[] tracks, TrackExporterListener trackExporterListener, boolean exportPhotos) {
+    public TrackExporter newTrackExporter(Context context, Track[] tracks, TrackExporterListener trackExporterListener) {
-        ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
-
+        TrackWriter trackWriter = this.newTrackWriter(context, tracks.length > 1);
-        FileTrackExporter fileTrackExporter = new FileTrackExporter(contentProviderUtils, trackWriter, tracks, trackExporterListener);
+        return new FileTrackExporter(contentProviderUtils, trackWriter, tracks, trackExporterListener);
-
-        return new KmzTrackExporter(contentProviderUtils, fileTrackExporter, tracks, exportPhotos);
     }
 
     /**

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;
@@ -69,7 +68,7 @@ public class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
         this.trackFileFormat = trackFileFormat;
         this.directory = directory;
         context = exportActivity.getApplicationContext();
-        contentProviderUtils = ContentProviderUtils.Factory.get(context);
+        contentProviderUtils = new ContentProviderUtils(context);
 
         completed = false;
         processedTrackCount = 0;
@@ -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/exporter/FileTrackExporter.java

@@ -26,7 +26,8 @@ import androidx.annotation.NonNull;
 import java.io.OutputStream;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.content.LocationFactory;
+import de.dennisguse.opentracks.content.LocationIterator;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.Waypoint;
@@ -63,7 +64,7 @@ public class FileTrackExporter implements TrackExporter {
     }
 
     @Override
-    public boolean writeTrack(Context context, @NonNull OutputStream outputStream) {
+    public boolean writeTrack(@NonNull Context context, @NonNull OutputStream outputStream) {
         try {
             trackWriter.prepare(outputStream);
             trackWriter.writeHeader(tracks);
@@ -209,7 +210,7 @@ public class FileTrackExporter implements TrackExporter {
      *
      * @author Jimmy Shih
      */
-    private class TrackWriterLocationFactory implements ContentProviderUtils.LocationFactory {
+    private class TrackWriterLocationFactory extends LocationFactory {
         Location currentLocation;
         Location lastLocation;
 

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

@@ -89,7 +89,7 @@ public class KmlTrackWriter implements TrackWriter {
         this.exportSensorData = exportSensorData;
         this.exportPhotos = exportPhotos;
         this.descriptionGenerator = new DescriptionGeneratorImpl(context);
-        this.contentProviderUtils = ContentProviderUtils.Factory.get(context);
+        this.contentProviderUtils = new ContentProviderUtils(context);
     }
 
     @Override

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

@@ -19,7 +19,6 @@ package de.dennisguse.opentracks.io.file.exporter;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.io.OutputStream;
 
@@ -37,5 +36,5 @@ public interface TrackExporter {
      * @param context the context
      * @param outputStream the output stream
      */
-    boolean writeTrack(@Nullable Context context, @NonNull OutputStream outputStream);
+    boolean writeTrack(@NonNull Context context, @NonNull OutputStream outputStream);
 }

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

@@ -39,8 +39,9 @@ import javax.xml.parsers.SAXParserFactory;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
 import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
+import de.dennisguse.opentracks.content.LocationFactory;
+import de.dennisguse.opentracks.content.LocationIterator;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.Waypoint;
 import de.dennisguse.opentracks.content.Waypoint.WaypointType;
@@ -102,7 +103,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<>();
     }
@@ -165,7 +166,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
         TripStatisticsUpdater trackTripStatisticstrackUpdater = new TripStatisticsUpdater(track.getTripStatistics().getStartTime());
         TripStatisticsUpdater markerTripStatisticsUpdater = new TripStatisticsUpdater(track.getTripStatistics().getStartTime());
 
-        try (LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY)) {
+        try (LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false, LocationFactory.DEFAULT_LOCATION_FACTORY)) {
 
             while (true) {
                 if (waypoint == null) {

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

@@ -55,7 +55,7 @@ public class GpxFileTrackImporter extends AbstractFileTrackImporter {
      * @param context the context
      */
     public GpxFileTrackImporter(Context context) {
-        this(context, ContentProviderUtils.Factory.get(context));
+        this(context, new ContentProviderUtils(context));
     }
 
     @VisibleForTesting

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;
@@ -46,7 +45,9 @@ public class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
     private static final String TAG = ImportAsyncTask.class.getSimpleName();
     private final TrackFileFormat trackFileFormat;
     private final String path;
-    private final Context context;
+    // TODO Can be removed, or?
+    private Context context;
+    // TODO Use weak reference
     private ImportActivity importActivity;
     private WakeLock wakeLock;
 
@@ -101,10 +102,10 @@ public class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
     @Override
     protected Boolean doInBackground(Void... params) {
         try {
-            Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
+            Thread.currentThread().setPriority(Thread.MAX_PRIORITY); // TODO Should be set to previous level at the end of this method.
             // 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);
             }
@@ -150,9 +151,11 @@ public class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
 
     @Override
     protected void onCancelled() {
+        context = null;
         completed = true;
         if (importActivity != null) {
             importActivity.onAsyncTaskCompleted(importTrackCount, totalTrackCount);
+            importActivity = null;
         }
     }
 
@@ -164,17 +167,17 @@ public class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
     private boolean importFile(final File file) {
         TrackImporter trackImporter;
         if (trackFileFormat == TrackFileFormat.GPX) {
-            trackImporter = new GpxFileTrackImporter(context);
+            trackImporter = new GpxFileTrackImporter(importActivity);
         } else { //KML or KMZ
             String extension = FileUtils.getExtension(file.getName());
             if (TrackFileFormat.KML_ONLY_TRACK.getExtension().equals(extension)) {
-                trackImporter = new KmlFileTrackImporter(context, -1L);
+                trackImporter = new KmlFileTrackImporter(importActivity, -1L);
             } else {
-                ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
+                ContentProviderUtils contentProviderUtils = new ContentProviderUtils(importActivity);
                 Uri uri = contentProviderUtils.insertTrack(new Track());
                 long newId = Long.parseLong(uri.getLastPathSegment());
 
-                trackImporter = new KmzTrackImporter(context, newId);
+                trackImporter = new KmzTrackImporter(importActivity, newId);
             }
         }
 

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

@@ -81,7 +81,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
      * @param importTrackId track id to import to. -1L to import to a new track.
      */
     public KmlFileTrackImporter(Context context, long importTrackId) {
-        this(context, importTrackId, ContentProviderUtils.Factory.get(context));
+        this(context, importTrackId, new ContentProviderUtils(context));
     }
 
     @VisibleForTesting
@@ -182,6 +182,10 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
      * On waypoint end.
      */
     private void onWaypointEnd() throws SAXException {
+        if (waypointType == null) {
+            return;
+        }
+
         // Add a waypoint if the waypointType matches
         WaypointType type;
         switch (waypointType) {

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

@@ -72,7 +72,7 @@ public class KmzTrackImporter implements TrackImporter {
                     return -1L;
                 }
                 String fileName = zipEntry.getName();
-                if (fileName.equals(KmzTrackExporter.KMZ_KML_FILE)) {
+                if (KmzTrackExporter.KMZ_KML_FILE.equals(fileName)) {
                     trackId = parseKml(zipInputStream);
                     if (trackId == -1L) {
                         Log.d(TAG, "Unable to parse kml in kmz");
@@ -101,8 +101,8 @@ 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 contentProviderUtils = new ContentProviderUtils(context);
             contentProviderUtils.deleteTrack(context, trackId);
         }
 
@@ -125,15 +125,10 @@ public class KmzTrackImporter implements TrackImporter {
      * @return the imported track id or -1L
      */
     private long parseKml(ZipInputStream zipInputStream) throws IOException {
-        ByteArrayInputStream byteArrayInputStream = null;
+        KmlFileTrackImporter kmlFileTrackImporter = new KmlFileTrackImporter(context, importTrackId);
-        try {
+
-            KmlFileTrackImporter kmlFileTrackImporter = new KmlFileTrackImporter(context, importTrackId);
+        try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(getKml(zipInputStream))) {
-            byteArrayInputStream = new ByteArrayInputStream(getKml(zipInputStream));
             return kmlFileTrackImporter.importFile(byteArrayInputStream);
-        } finally {
-            if (byteArrayInputStream != null) {
-                byteArrayInputStream.close();
-            }
         }
     }
 
@@ -160,12 +155,10 @@ public class KmzTrackImporter implements TrackImporter {
      * @param fileName       the file name
      */
     private void readImageFile(ZipInputStream zipInputStream, String fileName) throws IOException {
-        if (importTrackId == -1L) {
+        if (importTrackId == -1L || fileName.equals("")) {
-            return;
-        }
-        if (fileName.equals("")) {
             return;
         }
+
         File dir = FileUtils.getPhotoDir(importTrackId);
         FileUtils.ensureDirectoryExists(dir);
         File file = new File(dir, fileName);

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

@@ -33,10 +33,6 @@ public class LocationManagerConnector {
     private final Handler handler;
     private final LocationManager locationManager;
 
-    private LocationListener requestLocationUpdates;
-    private float requestLocationUpdatesDistance;
-    private long requestLocationUpdatesTime;
-
     public LocationManagerConnector(Context context, Looper looper) {
         this.handler = new Handler(looper);
 
@@ -55,10 +51,7 @@ public class LocationManagerConnector {
             @Override
             @SuppressLint("MissingPermission")
             public void run() {
-                requestLocationUpdatesTime = minTime;
+                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, minTime, minDistance, locationListener);
-                requestLocationUpdatesDistance = minDistance;
-                requestLocationUpdates = locationListener;
-                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, requestLocationUpdatesTime, requestLocationUpdatesDistance, locationListener);
             }
         });
     }
@@ -70,6 +63,5 @@ public class LocationManagerConnector {
      */
     public void removeLocationUpdates(final LocationListener locationListener) {
         locationManager.removeUpdates(locationListener);
-        requestLocationUpdates = null;
     }
 }

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

@@ -16,9 +16,6 @@
 
 package de.dennisguse.opentracks.services;
 
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
@@ -30,7 +27,6 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -38,7 +34,6 @@ import android.os.PowerManager.WakeLock;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.core.app.NotificationCompat;
 import androidx.core.app.TaskStackBuilder;
 
 import java.util.concurrent.ExecutorService;
@@ -48,17 +43,17 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackDetailActivity;
 import de.dennisguse.opentracks.TrackListActivity;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
 import de.dennisguse.opentracks.content.CustomContentProvider;
 import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
+import de.dennisguse.opentracks.content.LocationFactory;
+import de.dennisguse.opentracks.content.LocationIterator;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.Waypoint;
 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.RemoteSensorManager;
+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;
@@ -81,13 +76,13 @@ import de.dennisguse.opentracks.util.UnitConversions;
 public class TrackRecordingService extends Service {
 
     // The name of extra intent property to indicate whether we want to resume a previously recorded track.
-    public static final String RESUME_TRACK_EXTRA_NAME = "de.dennisguse.opentracks.RESUME_TRACK";
+    public static final String RESUME_TRACK_EXTRA_NAME = "RESUME_TRACK";
+    private static final int NOTIFICATION_ID = 123;
 
     public static final double PAUSE_LATITUDE = 100.0;
     public static final double RESUME_LATITUDE = 200.0;
 
     // Anything faster than that (in meters per second) will be considered moving.
-
     public static final double MAX_NO_MOVEMENT_SPEED = 0.224;
     @VisibleForTesting
     static final int MAX_AUTO_RESUME_TRACK_RETRY_ATTEMPTS = 3;
@@ -96,13 +91,13 @@ public class TrackRecordingService extends Service {
     private static final long ONE_MINUTE = (long) (UnitConversions.MIN_TO_S * UnitConversions.S_TO_MS);
     // The following variables are set in onCreate:
     private ExecutorService executorService;
-    private Context context;
     private ContentProviderUtils contentProviderUtils;
     private Handler handler;
     private LocationManagerConnector locationManagerConnector;
     private PeriodicTaskExecutor voiceExecutor;
     private PeriodicTaskExecutor splitExecutor;
     private SharedPreferences sharedPreferences;
+    private TrackRecordingServiceNotificationManager notificationManager;
     private long recordingTrackId;
     private boolean recordingTrackPaused;
     private LocationListenerPolicy locationListenerPolicy;
@@ -118,58 +113,56 @@ 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))) {
+            Context context = TrackRecordingService.this;
+            if (PreferencesUtils.isKey(TrackRecordingService.this, 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)) {
+                if (PreferencesUtils.isRecording(TrackRecordingService.this)) {
-                    recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
+                    recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackRecordingService.this);
                 }
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_track_paused_key))) {
+            if (PreferencesUtils.isKey(context, R.string.recording_track_paused_key, key)) {
-                recordingTrackPaused = PreferencesUtils.getBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+                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))) {
+            if (PreferencesUtils.isKey(context, R.string.voice_frequency_key, key)) {
-                voiceExecutor.setTaskFrequency(PreferencesUtils.getInt(context, R.string.voice_frequency_key, PreferencesUtils.VOICE_FREQUENCY_DEFAULT));
+                voiceExecutor.setTaskFrequency(PreferencesUtils.getVoiceFrequency(context));
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.split_frequency_key))) {
+            if (PreferencesUtils.isKey(context, R.string.split_frequency_key, key)) {
-                splitExecutor.setTaskFrequency(PreferencesUtils.getInt(context, R.string.split_frequency_key, PreferencesUtils.SPLIT_FREQUENCY_DEFAULT));
+                splitExecutor.setTaskFrequency(PreferencesUtils.getSplitFrequency(context));
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.min_recording_interval_key))) {
+            if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) {
-                int minRecordingInterval = PreferencesUtils.getInt(context, R.string.min_recording_interval_key, PreferencesUtils.MIN_RECORDING_INTERVAL_DEFAULT);
+                int minRecordingInterval = PreferencesUtils.getMinRecordingInterval(context);
-                switch (minRecordingInterval) {
+                if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) {
-                    case PreferencesUtils.MIN_RECORDING_INTERVAL_ADAPT_BATTERY_LIFE:
+                    // Choose battery life over moving time accuracy.
-                        // Choose battery life over moving time accuracy.
+                    locationListenerPolicy = new AdaptiveLocationListenerPolicy(30 * UnitConversions.ONE_SECOND, 5 * ONE_MINUTE, 5);
-                        locationListenerPolicy = new AdaptiveLocationListenerPolicy(30 * UnitConversions.ONE_SECOND, 5 * ONE_MINUTE, 5);
+                } else if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptAccuracy(context)) {
-                        break;
+                    // Get all the updates.
-                    case PreferencesUtils.MIN_RECORDING_INTERVAL_ADAPT_ACCURACY:
+                    locationListenerPolicy = new AdaptiveLocationListenerPolicy(UnitConversions.ONE_SECOND, 30 * UnitConversions.ONE_SECOND, 0);
-                        // Get all the updates.
+                } else {
-                        locationListenerPolicy = new AdaptiveLocationListenerPolicy(UnitConversions.ONE_SECOND, 30 * UnitConversions.ONE_SECOND, 0);
+                    locationListenerPolicy = new AbsoluteLocationListenerPolicy(minRecordingInterval * UnitConversions.ONE_SECOND);
-                        break;
-                    default:
-                        locationListenerPolicy = new AbsoluteLocationListenerPolicy(minRecordingInterval * UnitConversions.ONE_SECOND);
                 }
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_distance_interval_key))) {
+            if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) {
-                recordingDistanceInterval = PreferencesUtils.getInt(context, R.string.recording_distance_interval_key, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
+                recordingDistanceInterval = PreferencesUtils.getRecordingDistanceInterval(context);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.max_recording_distance_key))) {
+            if (PreferencesUtils.isKey(context, R.string.max_recording_distance_key, key)) {
-                maxRecordingDistance = PreferencesUtils.getInt(context, R.string.max_recording_distance_key, PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT);
+                maxRecordingDistance = PreferencesUtils.getMaxRecordingDistance(context);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_gps_accuracy_key))) {
+            if (PreferencesUtils.isKey(context, R.string.recording_gps_accuracy_key, key)) {
-                recordingGpsAccuracy = PreferencesUtils.getInt(context, R.string.recording_gps_accuracy_key, PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
+                recordingGpsAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
             }
-            if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.auto_resume_track_timeout_key))) {
+            if (PreferencesUtils.isKey(context, R.string.auto_resume_track_timeout_key, key)) {
-                autoResumeTrackTimeout = PreferencesUtils.getInt(context, R.string.auto_resume_track_timeout_key, PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_DEFAULT);
+                autoResumeTrackTimeout = PreferencesUtils.getAutoResumeTrackTimeout(context);
             }
         }
     };
     private TripStatisticsUpdater markerTripStatisticsUpdater;
     private WakeLock wakeLock;
-    private RemoteSensorManager remoteSensorManager;
+    private BluetoothRemoteSensorManager remoteSensorManager;
     private Location lastLocation;
     private boolean currentSegmentHasLocation;
     private boolean isIdle; // true if idle
@@ -222,14 +215,14 @@ public class TrackRecordingService extends Service {
     public void onCreate() {
         super.onCreate();
         executorService = Executors.newSingleThreadExecutor();
-        context = this;
+        contentProviderUtils = new ContentProviderUtils(this);
-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
         handler = new Handler();
         locationManagerConnector = new LocationManagerConnector(this, handler.getLooper());
         voiceExecutor = new PeriodicTaskExecutor(this, new AnnouncementPeriodicTaskFactory());
         splitExecutor = new PeriodicTaskExecutor(this, new SplitPeriodicTaskFactory());
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
         sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
+        notificationManager = new TrackRecordingServiceNotificationManager(this);
 
         // onSharedPreferenceChanged might not set recordingTrackId.
         recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
@@ -266,12 +259,12 @@ public class TrackRecordingService extends Service {
     @Override
     public void onDestroy() {
         if (remoteSensorManager != null) {
-            RemoteSensorManagerFactory.releaseSystemSensorManager();
+            remoteSensorManager.stop();
             remoteSensorManager = null;
         }
 
         // Reverse order from onCreate
-        showNotification(false);
+        showNotification(false); //TODO Why?
 
         handler.removeCallbacks(registerLocationRunnable);
         unregisterLocationListener();
@@ -404,40 +397,6 @@ public class TrackRecordingService extends Service {
         return Long.parseLong(uri.getLastPathSegment());
     }
 
-    /**
-     * Starts the service as a foreground service.
-     *
-     * @param pendingIntent the notification pending intent
-     * @param messageId     the notification message id
-     */
-    @VisibleForTesting
-    protected void startForegroundService(PendingIntent pendingIntent, int messageId) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel notificationChannel = new NotificationChannel(getString(R.string.app_name), getString(R.string.app_name), NotificationManager.IMPORTANCE_DEFAULT);
-            NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-            if (manager != null) {
-                manager.createNotificationChannel(notificationChannel);
-            }
-        }
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, getString(R.string.app_name))
-                .setContentIntent(pendingIntent)
-                .setContentText(getString(messageId))
-                .setContentTitle(getString(R.string.app_name))
-                .setOngoing(true)
-                .setSmallIcon(R.drawable.ic_logo_color_24dp)
-                .setCategory(Notification.CATEGORY_SERVICE)
-                .setWhen(System.currentTimeMillis());
-        startForeground(1, builder.build());
-    }
-
-    /**
-     * Stops the service as a foreground service.
-     */
-    @VisibleForTesting
-    protected void stopForegroundService() {
-        stopForeground(true);
-    }
-
     /**
      * Handles start command.
      *
@@ -446,7 +405,8 @@ public class TrackRecordingService extends Service {
      */
     private void handleStartCommand(Intent intent, int startId) {
         // Check if the service is called to resume track (from phone reboot)
-        if (intent != null && intent.getBooleanExtra(RESUME_TRACK_EXTRA_NAME, false) && !shouldResumeTrack()) {
+        boolean resumeTrackRequested = intent.getBooleanExtra(RESUME_TRACK_EXTRA_NAME, false);
+        if (resumeTrackRequested && !shouldResumeTrack()) {
             Log.i(TAG, "Stop resume track.");
             updateRecordingState(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, true);
             stopSelfResult(startId);
@@ -464,17 +424,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(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(getResources().getString(R.string.auto_resume_track_timeout_always))) {
             Log.d(TAG, "Resuming. Auto-resume track timeout set to always.");
             return true;
         }
@@ -508,13 +470,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());
@@ -545,7 +507,7 @@ public class TrackRecordingService extends Service {
         }
         markerTripStatisticsUpdater = new TripStatisticsUpdater(markerStartTime);
 
-        try (LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY)) {
+        try (LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false, LocationFactory.DEFAULT_LOCATION_FACTORY)) {
 
             while (locationIterator.hasNext()) {
                 Location location = locationIterator.next();
@@ -594,7 +556,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;
@@ -677,6 +640,8 @@ public class TrackRecordingService extends Service {
         }
 
         endRecording(false, recordingTrackId);
+
+        notificationManager.updateContent(getString(R.string.generic_paused));
     }
 
     /**
@@ -692,7 +657,7 @@ public class TrackRecordingService extends Service {
 
         // Update instance variables
         if (remoteSensorManager != null) {
-            RemoteSensorManagerFactory.releaseSystemSensorManager();
+            remoteSensorManager.stop();
             remoteSensorManager = null;
         }
         lastLocation = null;
@@ -763,6 +728,8 @@ public class TrackRecordingService extends Service {
                 return;
             }
 
+            notificationManager.updateLocation(this, location, recordingGpsAccuracy);
+
             if (!location.hasAccuracy() || location.getAccuracy() >= recordingGpsAccuracy) {
                 Log.d(TAG, "Ignore onLocationChangedAsync. Poor accuracy.");
                 return;
@@ -798,10 +765,7 @@ public class TrackRecordingService extends Service {
             }
 
             if (!LocationUtils.isValidLocation(lastValidTrackPoint)) {
-                /*
+                // Should not happen. The current segment should have a location. Just insert the current location.
-                 * Should not happen. The current segment should have a location. Just
-                 * insert the current location.
-                 */
                 insertLocation(track, location, null);
                 lastLocation = location;
                 return;
@@ -948,33 +912,33 @@ public class TrackRecordingService extends Service {
         }
     }
 
-    /**
-     * Shows the notification.
-     *
-     * @param isGpsStarted true if GPS is started
-     */
     private void showNotification(boolean isGpsStarted) {
-        if (isRecording()) {
+        if ((isRecording() && isPaused()) || (!isRecording() && !isGpsStarted)) {
-            if (isPaused()) {
+            stopForeground(true);
-                stopForegroundService();
+        }
-            } else {
+
-                Intent intent = IntentUtils.newIntent(this, TrackDetailActivity.class)
+        if (isRecording() && !isPaused()) {
-                        .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, recordingTrackId);
+            Intent intent = IntentUtils.newIntent(this, TrackDetailActivity.class)
-                PendingIntent pendingIntent = TaskStackBuilder.create(this)
+                    .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, recordingTrackId);
-                        .addParentStack(TrackDetailActivity.class).addNextIntent(intent)
+            PendingIntent pendingIntent = TaskStackBuilder.create(this)
-                        .getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
+                    .addParentStack(TrackDetailActivity.class)
-                startForegroundService(pendingIntent, R.string.track_record_notification);
+                    .addNextIntent(intent)
-            }
+                    .getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
-        } else {
+
-            // Not recording
+            notificationManager.updatePendingIntent(pendingIntent);
-            if (isGpsStarted) {
+            notificationManager.updateContent(getString(R.string.gps_starting));
-                Intent intent = IntentUtils.newIntent(this, TrackListActivity.class);
+            startForeground(NOTIFICATION_ID, notificationManager.getNotification());
-                PendingIntent pendingIntent = TaskStackBuilder.create(this)
+        }
-                        .addNextIntent(intent).getPendingIntent(0, 0);
+        if (!isRecording() && isGpsStarted) {
-                startForegroundService(pendingIntent, R.string.gps_starting);
+            Intent intent = IntentUtils.newIntent(this, TrackListActivity.class);
-            } else {
+            PendingIntent pendingIntent = TaskStackBuilder.create(this)
-                stopForegroundService();
+                    .addNextIntent(intent)
-            }
+                    .getPendingIntent(0, 0);
+
+            notificationManager.updatePendingIntent(pendingIntent);
+            notificationManager.updateContent(getString(R.string.gps_starting));
+
+            startForeground(NOTIFICATION_ID, notificationManager.getNotification());
         }
     }
 

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

@@ -16,7 +16,6 @@
 
 package de.dennisguse.opentracks.services;
 
-import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -29,14 +28,13 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 
-import java.util.List;
-
 import de.dennisguse.opentracks.BuildConfig;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackEditActivity;
 import de.dennisguse.opentracks.content.WaypointCreationRequest;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.ServiceUtils;
 
 /**
  * Wrapper for the track recording service.
@@ -154,7 +152,7 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
             return;
         }
 
-        if (!startIfNeeded && !isRecordingServiceRunning(context)) {
+        if (!startIfNeeded && !ServiceUtils.isTrackRecordingServiceRunning(context)) {
             Log.d(TAG, "Service is not started. Not binding it.");
             return;
         }
@@ -169,31 +167,6 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
         context.bindService(new Intent(context, TrackRecordingService.class), this, flags);
     }
 
-    /**
-     * Returns true if the recording service is running.
-     *
-     * @param context the current context
-     */
-    @Deprecated
-    public static boolean isRecordingServiceRunning(Context context) {
-        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        if (activityManager == null) {
-            return false;
-        }
-
-        //TODO This approach is deprecated as of API level 26 and should be replaced.
-        List<ActivityManager.RunningServiceInfo> services = activityManager.getRunningServices(Integer.MAX_VALUE);
-
-        for (ActivityManager.RunningServiceInfo serviceInfo : services) {
-            ComponentName componentName = serviceInfo.service;
-            String serviceName = componentName.getClassName();
-            if (TrackRecordingService.class.getName().equals(serviceName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * Resumes the track recording service connection.
      *
@@ -201,7 +174,7 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
      */
     public void startConnection(@NonNull Context context) {
         bindIfStarted();
-        if (!isRecordingServiceRunning(context)) {
+        if (!ServiceUtils.isTrackRecordingServiceRunning(context)) {
             resetRecordingState(context);
         }
     }
@@ -230,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);
         }
     }
 
@@ -275,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/TrackRecordingServiceNotificationManager.java

@@ -0,0 +1,94 @@
+package de.dennisguse.opentracks.services;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.location.Location;
+import android.os.Build;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.core.app.NotificationCompat;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+
+/**
+ * Manages the content of the notification shown by {@link TrackRecordingService}.
+ */
+class TrackRecordingServiceNotificationManager {
+
+    private final static int NOTIFICATION_ID = 123;
+
+    private final static String CHANNEL_ID = TrackRecordingServiceNotificationManager.class.getSimpleName();
+
+    private NotificationCompat.Builder notificationBuilder;
+
+    private NotificationManager notificationManager;
+
+    private boolean previousLocationWasAccurate = true;
+
+    TrackRecordingServiceNotificationManager(Context context) {
+        notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID, context.getString(R.string.app_name), NotificationManager.IMPORTANCE_HIGH);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                notificationChannel.setAllowBubbles(true);
+            }
+
+            notificationManager.createNotificationChannel(notificationChannel);
+        }
+
+        notificationBuilder = new NotificationCompat.Builder(context, CHANNEL_ID);
+        notificationBuilder
+                .setDefaults(NotificationCompat.DEFAULT_ALL)
+                .setPriority(NotificationCompat.PRIORITY_MAX)
+                .setOnlyAlertOnce(true)
+                .setOngoing(true)
+                .setCategory(NotificationCompat.CATEGORY_SERVICE)
+                .setContentTitle(context.getString(R.string.app_name))
+                .setSmallIcon(R.drawable.ic_logo_color_24dp);
+    }
+
+    @VisibleForTesting
+    TrackRecordingServiceNotificationManager(NotificationManager notificationManager, NotificationCompat.Builder notificationBuilder) {
+        this.notificationManager = notificationManager;
+        this.notificationBuilder = notificationBuilder;
+    }
+
+    void updateContent(String content) {
+        notificationBuilder.setContentText(content);
+        updateNotification();
+    }
+
+    void updateLocation(Context context, Location location, int recordingGpsAccuracy) {
+        String formattedAccuracy = context.getString(R.string.value_none);
+        if (location.hasAccuracy()) {
+            formattedAccuracy = StringUtils.formatDistance(context, location.getAccuracy(), PreferencesUtils.isMetricUnits(context));
+
+            boolean currentLocationWasAccurate = location.getAccuracy() < recordingGpsAccuracy;
+            boolean shouldAlert = !currentLocationWasAccurate && previousLocationWasAccurate;
+            notificationBuilder.setOnlyAlertOnce(!shouldAlert);
+            previousLocationWasAccurate = currentLocationWasAccurate;
+        }
+
+        notificationBuilder.setContentText(context.getString(R.string.track_recording_notification_accuracy, formattedAccuracy));
+        updateNotification();
+        notificationBuilder.setOnlyAlertOnce(true);
+    }
+
+    void updatePendingIntent(PendingIntent pendingIntent) {
+        notificationBuilder.setContentIntent(pendingIntent);
+        updateNotification();
+    }
+
+    Notification getNotification() {
+        return notificationBuilder.build();
+    }
+
+    private void updateNotification() {
+        notificationManager.notify(NOTIFICATION_ID, getNotification());
+    }
+}

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

@@ -21,11 +21,10 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCallback;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
+import android.bluetooth.BluetoothGattService;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
-import android.os.Bundle;
 import android.os.Handler;
-import android.os.Message;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -34,20 +33,19 @@ import java.util.UUID;
 
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.content.sensor.SensorState;
+import de.dennisguse.opentracks.util.BluetoothUtils;
 
 /**
  * Manages connection to Bluetooth LE heart rate monitor.
- * TODO: shutdown connection.
  */
 public class BluetoothConnectionManager {
 
     // Message types sent to handler
-    static final int MESSAGE_DEVICE_NAME = 1;
+    static final int MESSAGE_CONNECTING = 1;
-    static final int MESSAGE_READ = 2;
+    static final int MESSAGE_CONNECTED = 2;
+    static final int MESSAGE_READ = 3;
+    static final int MESSAGE_DISCONNECTED = 4;
 
-    static final String KEY_DEVICE_NAME = "device_name";
-
-    private static final UUID HEART_RATE_SERVICE_UUID = new UUID(0x180D00001000L, 0x800000805f9b34fbL);
     private static final UUID HEART_RATE_MEASUREMENT_CHAR_UUID = new UUID(0x2A3700001000L, 0x800000805f9b34fbL);
     private static final UUID CLIENT_CHARACTERISTIC_CONFIG_UUID = new UUID(0x290200001000L, 0x800000805f9b34fbL);
 
@@ -58,30 +56,52 @@ public class BluetoothConnectionManager {
 
     private SensorState sensorState;
 
+    private BluetoothGatt bluetoothGatt;
+    private BluetoothDevice bluetoothDevice;
+
     private BluetoothGattCallback connectCallback = new BluetoothGattCallback() {
         @Override
         public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
-            if (newState == BluetoothProfile.STATE_CONNECTED) {
+            switch (newState) {
-                gatt.discoverServices();
+                case BluetoothProfile.STATE_CONNECTING:
-                setState(SensorState.CONNECTED);
+                    Log.d(TAG, "Connecting to sensor: " + gatt.getDevice());
+                    setState(SensorState.CONNECTING);
 
-                //Inform about status change
+                    handler.obtainMessage(MESSAGE_CONNECTING, gatt.getDevice().getName()).sendToTarget();
-                Message message = handler.obtainMessage(MESSAGE_DEVICE_NAME);
+                case BluetoothProfile.STATE_CONNECTED:
-                Bundle bundle = new Bundle();
+                    Log.d(TAG, "Connected to sensor: " + gatt.getDevice());
-                bundle.putString(KEY_DEVICE_NAME, gatt.getDevice().getName());
+                    setState(SensorState.CONNECTED);
-                message.setData(bundle);
+
-                handler.sendMessage(message);
+                    gatt.discoverServices();
-                return;
+
+                    handler.obtainMessage(MESSAGE_CONNECTED, gatt.getDevice().getName()).sendToTarget();
+                    break;
+                case BluetoothProfile.STATE_DISCONNECTING:
+                    Log.d(TAG, "Disconnecting from sensor: " + gatt.getDevice());
+                    setState(SensorState.DISCONNECTING);
+
+                case BluetoothProfile.STATE_DISCONNECTED:
+                    Log.d(TAG, "Disconnected from sensor: " + gatt.getDevice());
+                    setState(SensorState.DISCONNECTED);
+
+                    handler.obtainMessage(MESSAGE_DISCONNECTED, gatt.getDevice().getName()).sendToTarget();
             }
-            Log.d(TAG, "Could not connect to bluetooth sensor: " + gatt.getDevice());
         }
 
         @Override
         public void onServicesDiscovered(@NonNull BluetoothGatt gatt, int status) {
-            BluetoothGattCharacteristic characteristic = gatt
+            BluetoothGattService service = gatt.getService(BluetoothUtils.HEART_RATE_SERVICE_UUID);
-                    .getService(HEART_RATE_SERVICE_UUID)
+            if (service == null) {
-                    .getCharacteristic(HEART_RATE_MEASUREMENT_CHAR_UUID);
+                Log.e(TAG, "Could not get heart rate service for " + gatt.getDevice().getAddress());
+                return;
+            }
 
+
+            BluetoothGattCharacteristic characteristic = service.getCharacteristic(HEART_RATE_MEASUREMENT_CHAR_UUID);
+            if (characteristic == null) {
+                Log.e(TAG, "Could not get BluetoothCharacteristic for " + gatt.getDevice().getAddress());
+                return;
+            }
             gatt.setCharacteristicNotification(characteristic, true);
 
             BluetoothGattDescriptor descriptor = characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG_UUID);
@@ -91,10 +111,11 @@ public class BluetoothConnectionManager {
 
         @Override
         public void onCharacteristicChanged(BluetoothGatt gatt, @NonNull BluetoothGattCharacteristic characteristic) {
-            int heartRate = BluetoothLEUtils.parseHeartRate(characteristic);
+            int heartRate = BluetoothUtils.parseHeartRate(characteristic);
+            String deviceName = gatt.getDevice().getName();
 
-            Log.d(TAG, "Received heart beat rate: " + heartRate);
+            Log.d(TAG, "Received heart beat rate " + deviceName + ": " + heartRate);
-            SensorDataSet sensorDataSet = new SensorDataSet(heartRate, gatt.getDevice().getName(), gatt.getDevice().getAddress());
+            SensorDataSet sensorDataSet = new SensorDataSet(heartRate, deviceName, gatt.getDevice().getAddress());
             handler.obtainMessage(MESSAGE_READ, sensorDataSet).sendToTarget();
         }
     };
@@ -104,45 +125,43 @@ public class BluetoothConnectionManager {
      *
      * @param handler a handler for sending messages back to the UI activity
      */
-    BluetoothConnectionManager(Context context, Handler handler) {
+    BluetoothConnectionManager(@NonNull Context context, @NonNull BluetoothDevice bluetoothDevice, @NonNull Handler handler) {
         this.context = context;
+        this.bluetoothDevice = bluetoothDevice;
         this.handler = handler;
         this.sensorState = SensorState.NONE;
     }
 
-    /**
+    public synchronized void connect() {
-     * Gets the sensor state.
+        if (bluetoothGatt != null) {
-     */
+            Log.w(TAG, "Already connected; ignoring.");
+        }
+
+        Log.d(TAG, "Connecting to: " + bluetoothDevice);
+
+        bluetoothGatt = bluetoothDevice.connectGatt(this.context, true, this.connectCallback);
+
+        setState(SensorState.CONNECTING);
+    }
+
+    public synchronized void disconnect() {
+        if (bluetoothGatt == null) {
+            Log.w(TAG, "Cannot disconnect if not connected.");
+            return;
+        }
+        bluetoothGatt.close();
+        bluetoothGatt = null;
+    }
+
+    public synchronized boolean isSameBluetoothDevice(String address) {
+        return this.bluetoothDevice.getAddress().equals(address);
+    }
+
     synchronized SensorState getSensorState() {
         return sensorState;
     }
 
-    /**
-     * Sets the sensor state.
-     *
-     * @param sensorState the sensor state
-     */
     private synchronized void setState(SensorState sensorState) {
         this.sensorState = sensorState;
     }
-
-    /**
-     * Resets the bluetooth connection manager.
-     */
-    public synchronized void reset() {
-        //TODO Disconnect
-        setState(SensorState.NONE);
-    }
-
-    /**
-     * Connects to a bluetooth device.
-     *
-     * @param bluetoothDevice the bluetooth device
-     */
-    public synchronized void connect(BluetoothDevice bluetoothDevice) {
-        Log.d(TAG, "connect to: " + bluetoothDevice);
-
-        bluetoothDevice.connectGatt(this.context, false, this.connectCallback);
-        setState(SensorState.CONNECTING);
-    }
 }

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

@@ -1,17 +0,0 @@
-package de.dennisguse.opentracks.services.sensors;
-
-import android.bluetooth.BluetoothGattCharacteristic;
-
-final class BluetoothLEUtils {
-
-    private BluetoothLEUtils() {
-    }
-
-    static int parseHeartRate(BluetoothGattCharacteristic characteristic) {
-        //DOCUMENTATION https://www.bluetooth.com/specifications/gatt/characteristics/
-        byte[] raw = characteristic.getValue();
-        int index = ((raw[0] & 0x1) == 1) ? 2 : 1;
-        int format = (index == 1) ? BluetoothGattCharacteristic.FORMAT_UINT8 : BluetoothGattCharacteristic.FORMAT_UINT16;
-        return characteristic.getIntValue(format, index);
-    }
-}

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

@@ -19,44 +19,50 @@ package de.dennisguse.opentracks.services.sensors;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
-
+import android.widget.Toast;
-import java.util.ArrayList;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
-import de.dennisguse.opentracks.content.sensor.SensorState;
+import de.dennisguse.opentracks.util.BluetoothUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
- * Bluetooth sensor manager.
+ * Bluetooth LE sensor manager.
- * TODO: Handle a BluetoothGatt.STATE_DISCONNECTED
+ * Should only be instantiated once!
  *
  * @author Sandor Dornbush
  */
-public class BluetoothRemoteSensorManager extends RemoteSensorManager {
+public class BluetoothRemoteSensorManager {
+
+    public static final long MAX_SENSOR_DATE_SET_AGE_MS = 5000;
 
     private static final String TAG = BluetoothConnectionManager.class.getSimpleName();
 
-    private static final BluetoothAdapter bluetoothAdapter = getDefaultBluetoothAdapter();
+    private static final BluetoothAdapter bluetoothAdapter = BluetoothUtils.getDefaultBluetoothAdapter(TAG);
 
     private final Context context;
 
-    private final BluetoothConnectionManager bluetoothConnectionManager;
+    private final SharedPreferences sharedPreferences;
-
-    private SensorDataSet sensorDataSet = null;
 
     // Handler that gets information back from the bluetoothConnectionManager
     private final Handler messageHandler = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message message) {
+            String toastMessage;
             switch (message.what) {
-                case BluetoothConnectionManager.MESSAGE_DEVICE_NAME:
+                case BluetoothConnectionManager.MESSAGE_CONNECTING:
-                    String deviceName = message.getData().getString(BluetoothConnectionManager.KEY_DEVICE_NAME);
+                    //Ignore for now.
+                    toastMessage = context.getString(R.string.settings_sensor_connecting, message.obj);
+                    Toast.makeText(context, toastMessage, Toast.LENGTH_LONG).show();
+                    break;
+                case BluetoothConnectionManager.MESSAGE_CONNECTED:
+                    toastMessage = context.getString(R.string.settings_sensor_connected, message.obj);
+                    Toast.makeText(context, toastMessage, Toast.LENGTH_LONG).show();
                     break;
                 case BluetoothConnectionManager.MESSAGE_READ:
                     if (!(message.obj instanceof SensorDataSet)) {
@@ -66,98 +72,109 @@ public class BluetoothRemoteSensorManager extends RemoteSensorManager {
                         sensorDataSet = (SensorDataSet) message.obj;
                     }
                     break;
+                case BluetoothConnectionManager.MESSAGE_DISCONNECTED:
+                    toastMessage = context.getString(R.string.settings_sensor_disconnected, message.obj);
+                    Toast.makeText(context, toastMessage, Toast.LENGTH_LONG).show();
+                    break;
                 default:
+                    Log.e(TAG, "Got an undefined case. Please check.");
                     break;
             }
         }
     };
+    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+        @Override
+        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
+            if (bluetoothConnectionManager != null && PreferencesUtils.isKey(context, R.string.settings_sensor_bluetooth_heart_rate_key, key)) {
+                String address = PreferencesUtils.getBluetoothHeartRateSensorAddress(context);
+                if (address.equals(PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT)) {
+                    stop();
+                    return;
+                }
+                if (bluetoothConnectionManager.isSameBluetoothDevice(address)) {
+                    return;
+                }
+
+                disconnect();
+                startCurrentSensor();
+            }
+        }
+    };
+
+    private SensorDataSet sensorDataSet = null;
+    private BluetoothConnectionManager bluetoothConnectionManager;
 
     /**
      * @param context the context
      */
-    BluetoothRemoteSensorManager(Context context) {
+    public BluetoothRemoteSensorManager(Context context) {
         this.context = context;
-        bluetoothConnectionManager = new BluetoothConnectionManager(context, messageHandler);
+        sharedPreferences = PreferencesUtils.getSharedPreferences(context);
     }
 
-    private static BluetoothAdapter getDefaultBluetoothAdapter() {
+    public void start() {
-        // If from the main application thread, return directly
+        sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-        if (Thread.currentThread().equals(Looper.getMainLooper().getThread())) {
+        startCurrentSensor();
-            return BluetoothAdapter.getDefaultAdapter();
-        }
-
-        // Get the default adapter from the main application thread
-        final ArrayList<BluetoothAdapter> adapters = new ArrayList<>(1);
-        final Object mutex = new Object();
-
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-                adapters.add(BluetoothAdapter.getDefaultAdapter());
-                synchronized (mutex) {
-                    mutex.notify();
-                }
-            }
-        });
-
-        while (adapters.isEmpty()) {
-            synchronized (mutex) {
-                try {
-                    mutex.wait(UnitConversions.ONE_SECOND);
-                } catch (InterruptedException e) {
-                    Log.e(TAG, "Interrupted while waiting for default bluetooth adapter", e);
-                }
-            }
-        }
-
-        if (adapters.get(0) == null) {
-            Log.w(TAG, "No bluetooth adapter found.");
-        }
-        return adapters.get(0);
     }
 
-    @Override
+    public void stop() {
+        disconnect();
+        sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
+    }
+
+
     public boolean isEnabled() {
         return bluetoothAdapter != null && bluetoothAdapter.isEnabled();
     }
 
-    @Override
+    public SensorDataSet getSensorDataSet() {
-    protected void setUpChannel() {
+        return sensorDataSet;
+    }
+
+    public boolean isSensorDataSetValid() {
+        SensorDataSet sensorDataSet = getSensorDataSet();
+        if (sensorDataSet == null) {
+            return false;
+        }
+        return sensorDataSet.isRecent(MAX_SENSOR_DATE_SET_AGE_MS);
+    }
+
+    private void startCurrentSensor() {
         if (!isEnabled()) {
             Log.w(TAG, "Bluetooth not enabled.");
             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_heart_rate_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
+        String address = PreferencesUtils.getBluetoothHeartRateSensorAddress(context);
         if (PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT.equals(address)) {
             Log.w(TAG, "No bluetooth address.");
             return;
         }
-        Log.w(TAG, "Connecting to bluetooth address: " + address);
+        Log.i(TAG, "Connecting to bluetooth address: " + address);
 
         BluetoothDevice device;
         try {
             device = bluetoothAdapter.getRemoteDevice(address);
         } catch (IllegalArgumentException e) {
-            Log.d(TAG, "Unable to get remote device for: " + address, e);
+            Log.w(TAG, "Unable to get remote device for: " + address, e);
+
+            String toastMessage = context.getString(R.string.sensor_not_known, address);
+            Toast.makeText(context, toastMessage, Toast.LENGTH_LONG).show();
+
             return;
         }
-        bluetoothConnectionManager.connect(device);
+
+        disconnect();
+
+        bluetoothConnectionManager = new BluetoothConnectionManager(context, device, messageHandler);
+        bluetoothConnectionManager.connect();
     }
 
-    @Override
+    private void disconnect() {
-    protected void tearDownChannel() {
+        if (bluetoothConnectionManager != null) {
-        bluetoothConnectionManager.reset();
+            bluetoothConnectionManager.disconnect();
-    }
+            bluetoothConnectionManager = null;
-
+        }
-    @Override
-    public SensorState getSensorState() {
-        return bluetoothConnectionManager.getSensorState();
-    }
-
-    @Override
-    public SensorDataSet getSensorDataSet() {
-        return sensorDataSet;
     }
 }

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

@@ -1,135 +0,0 @@
-/*
- * 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.
- */
-
-package de.dennisguse.opentracks.services.sensors;
-
-import android.util.Log;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
-import de.dennisguse.opentracks.content.sensor.SensorState;
-
-/**
- * Manage the connection to a remote sensor.
- *
- * @author Sandor Dornbush
- */
-public abstract class RemoteSensorManager {
-
-    public static final long MAX_SENSOR_DATE_SET_AGE = 5000;
-    public static final long MAX_SENSOR_STATE_AGE = 20000;
-
-    private static final String TAG = RemoteSensorManager.class.getSimpleName();
-    private static final int RETRY_PERIOD = 20000;
-
-    private SensorState sensorState = SensorState.NONE;
-    private long sensorStateTimestamp = System.currentTimeMillis();
-
-    private TimerTask timerTask;
-    private Timer timer;
-
-    /**
-     * Returns true if the sensor is enabled.
-     */
-    public abstract boolean isEnabled();
-
-    /**
-     * Sets up the sensor channel.
-     */
-    protected abstract void setUpChannel();
-
-    /**
-     * Tears down the sensor channel.
-     */
-    protected abstract void tearDownChannel();
-
-    /**
-     * Gets the sensor data set.
-     */
-    public abstract SensorDataSet getSensorDataSet();
-
-    /**
-     * Starts the sensor.
-     */
-    public void startSensor() {
-        setUpChannel();
-        timerTask = new TimerTask() {
-            @Override
-            public void run() {
-                switch (getSensorState()) {
-                    case CONNECTING:
-                        if (System.currentTimeMillis() - sensorStateTimestamp > MAX_SENSOR_STATE_AGE) {
-                            Log.i(TAG, "Retry setUpChannel");
-                            setUpChannel();
-                        }
-                        break;
-                    case DISCONNECTED:
-                        setUpChannel();
-                        break;
-                    default: // NONE, CONNECTED or SENDING
-                }
-            }
-        };
-        timer = new Timer(RemoteSensorManager.class.getSimpleName());
-        timer.schedule(timerTask, RETRY_PERIOD, RETRY_PERIOD);
-    }
-
-    /**
-     * Stops the sensor.
-     */
-    public void stopSensor() {
-        if (timerTask != null) {
-            timerTask.cancel();
-            timerTask = null;
-        }
-        if (timer != null) {
-            timer.cancel();
-            timer.purge();
-            timer = null;
-        }
-        tearDownChannel();
-    }
-
-    /**
-     * Gets the sensor state.
-     */
-    public SensorState getSensorState() {
-        return sensorState;
-    }
-
-    /**
-     * Sets the sensor state.
-     *
-     * @param sensorState the sensor state
-     */
-    public void setSensorState(SensorState sensorState) {
-        sensorStateTimestamp = System.currentTimeMillis();
-        this.sensorState = sensorState;
-    }
-
-    /**
-     * Returns true if the sensor data set is valid.
-     */
-    public boolean isSensorDataSetValid() {
-        SensorDataSet sensorDataSet = getSensorDataSet();
-        if (sensorDataSet == null) {
-            return false;
-        }
-        return sensorDataSet.isRecent(MAX_SENSOR_DATE_SET_AGE);
-    }
-}

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

@@ -1,90 +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 RemoteSensorManager}.
- *
- * @author Sandor Dornbush
- */
-public class RemoteSensorManagerFactory {
-
-    private static RemoteSensorManager remoteSensorManagerSystem = null;
-
-    //TODO Check if still needed? Is there a missing features?
-    private static RemoteSensorManager remoteSensorManagerTemporary = null;
-
-    private RemoteSensorManagerFactory() {
-    }
-
-    /**
-     * Gets the system sensor manager.
-     *
-     * @param context the context
-     */
-    public static RemoteSensorManager getSystemSensorManager(Context context) {
-        releaseSensorManagerTemporary();
-        releaseSystemSensorManager();
-        remoteSensorManagerSystem = getSensorManager(context);
-        remoteSensorManagerSystem.startSensor();
-        return remoteSensorManagerSystem;
-    }
-
-    /**
-     * Releases the system sensor manager.
-     */
-    public static void releaseSystemSensorManager() {
-        if (remoteSensorManagerSystem != null) {
-            remoteSensorManagerSystem.stopSensor();
-        }
-        remoteSensorManagerSystem = null;
-    }
-
-    /**
-     * Gets the temp sensor manager.
-     */
-    public static RemoteSensorManager getSensorManagerTemporary(Context context) {
-        releaseSensorManagerTemporary();
-        if (remoteSensorManagerSystem != null) {
-            return null;
-        }
-        remoteSensorManagerTemporary = getSensorManager(context);
-        remoteSensorManagerTemporary.startSensor();
-        return remoteSensorManagerTemporary;
-    }
-
-    /**
-     * Releases the temp sensor manager.
-     */
-    private static void releaseSensorManagerTemporary() {
-        if (remoteSensorManagerTemporary != null) {
-            remoteSensorManagerTemporary.stopSensor();
-        }
-        remoteSensorManagerTemporary = null;
-    }
-
-    /**
-     * Gets the sensor manager.
-     *
-     * @param context the context
-     */
-    private static RemoteSensorManager getSensorManager(Context context) {
-        return new BluetoothRemoteSensorManager(context);
-    }
-}

src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java

@@ -34,6 +34,7 @@ import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.TTSUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
@@ -193,7 +194,7 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
      * @param announcement the announcement
      */
     private void speakAnnouncement(String announcement) {
-        int result = audioManager.requestAudioFocus(null, TextToSpeech.Engine.DEFAULT_STREAM, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
+        int result = audioManager.requestAudioFocus(null, TTSUtils.getTTSStream(), AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
         if (result == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
             Log.w(TAG, "Failed to request audio focus.");
         }

src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTaskExecutor.java

@@ -17,9 +17,9 @@ package de.dennisguse.opentracks.services.tasks;
 
 import android.util.Log;
 
+import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.stats.TripStatistics;
-import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
@@ -35,13 +35,14 @@ public class PeriodicTaskExecutor {
     private final TrackRecordingService trackRecordingService;
     private final PeriodicTaskFactory periodicTaskFactory;
 
+    private final int TASK_FREQUENCY_OFF;
     /**
      * The task frequency.
      * A positive value is a time frequency (minutes).
      * A negative value is a distance frequency (km or mi).
      * A zero value is to turn off periodic task.
      */
-    private int taskFrequency = PreferencesUtils.FREQUENCY_OFF;
+    private int taskFrequency;
 
     private PeriodicTask periodicTask;
 
@@ -56,6 +57,9 @@ public class PeriodicTaskExecutor {
     public PeriodicTaskExecutor(TrackRecordingService trackRecordingService, PeriodicTaskFactory periodicTaskFactory) {
         this.trackRecordingService = trackRecordingService;
         this.periodicTaskFactory = periodicTaskFactory;
+
+        TASK_FREQUENCY_OFF = Integer.parseInt(trackRecordingService.getBaseContext().getResources().getString(R.string.frequency_off));
+        taskFrequency = TASK_FREQUENCY_OFF;
     }
 
     /**
@@ -71,7 +75,7 @@ public class PeriodicTaskExecutor {
             timerTaskExecutor.shutdown();
             timerTaskExecutor = null;
         }
-        if (taskFrequency == PreferencesUtils.FREQUENCY_OFF) {
+        if (taskFrequency == TASK_FREQUENCY_OFF) {
             Log.d(TAG, "Task frequency is off.");
             return;
         }

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;
 
@@ -42,14 +43,6 @@ import de.dennisguse.opentracks.util.TrackIconUtils;
  */
 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);
-            return defaultActivity != null && !defaultActivity.equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT) ? defaultActivity : getContext().getString(R.string.value_unknown);
-        }
-    };
-
     public ActivityTypePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setDialogLayoutResource(R.layout.preference_activity_type);
@@ -57,8 +50,14 @@ 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);
+        SummaryProvider<DialogPreference> summaryProvider = new SummaryProvider<DialogPreference>() {
+            @Override
+            public CharSequence provideSummary(DialogPreference preference) {
+                return PreferencesUtils.getDefaultActivity(ActivityTypePreference.this.getContext());
+            }
+        };
+        setSummaryProvider(summaryProvider);
     }
 
     @Override
@@ -87,7 +86,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 +131,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 +140,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/BluetoothLeAdapter.java

@@ -0,0 +1,112 @@
+package de.dennisguse.opentracks.settings;
+
+import android.bluetooth.BluetoothDevice;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class BluetoothLeAdapter extends BaseAdapter {
+
+    /**
+     * Contains a unique list (by address) of devices.
+     */
+    private final List<Device> devices = new ArrayList<>();
+
+    @Override
+    public int getCount() {
+        return devices.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return devices.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return devices.get(position).hashCode();
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View currentView = convertView;
+        if (convertView == null) {
+            LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+            //TODO Check if there is a better way to achieve identical look and feel to ListPreference.
+            //Use material design single choice; for old style use: android.R.layout.select_dialog_singlechoice
+            currentView = inflater.inflate(androidx.appcompat.R.layout.select_dialog_singlechoice_material, null);
+        }
+
+        Device device = devices.get(position);
+        TextView textView = currentView.findViewById(android.R.id.text1);
+        textView.setText(device.getName());
+
+        return currentView;
+    }
+
+    public void add(String name, String address) {
+        Device device = new Device(name, address);
+        if (!devices.contains(device)) {
+            devices.add(new Device(name, address));
+        } else {
+            for (Device currentDevice : devices) {
+                if (currentDevice.getAddress().equals(address)) {
+                    currentDevice.setName(name);
+                }
+            }
+        }
+        notifyDataSetChanged();
+    }
+
+    public void add(BluetoothDevice bluetoothDevice) {
+        add(bluetoothDevice.getName(), bluetoothDevice.getAddress());
+    }
+
+    public Device get(int index) {
+        return devices.get(index);
+    }
+
+    public class Device {
+        private String name;
+        private String address;
+
+        public Device(String name, String address) {
+            this.name = name;
+            this.address = address;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getAddress() {
+            return address;
+        }
+
+        /**
+         * Check if the address is identical.
+         */
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (!(o instanceof Device)) return false;
+            Device device = (Device) o;
+            return address.equals(device.address);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(name, address);
+        }
+    }
+}

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

@@ -0,0 +1,199 @@
+package de.dennisguse.opentracks.settings;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.le.BluetoothLeScanner;
+import android.bluetooth.le.ScanCallback;
+import android.bluetooth.le.ScanFilter;
+import android.bluetooth.le.ScanResult;
+import android.bluetooth.le.ScanSettings;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.os.ParcelUuid;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.DialogPreference;
+import androidx.preference.PreferenceDialogFragmentCompat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.util.BluetoothUtils;
+
+/**
+ * Preference to select a discoverable Bluetooth LE device.
+ * Based upon ListPreference.
+ */
+public class BluetoothLePreference extends DialogPreference {
+
+    private final static String TAG = BluetoothLePreference.class.getSimpleName();
+
+    public BluetoothLePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public BluetoothLePreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public BluetoothLePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BluetoothLePreference(Context context) {
+        super(context);
+    }
+
+    private String value;
+    private boolean valueSet = false;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        final boolean changed = !TextUtils.equals(this.value, value);
+        if (changed || !valueSet) {
+            this.value = value;
+            valueSet = true;
+            persistString(value);
+            if (changed) {
+                notifyChanged();
+            }
+        }
+    }
+
+    @Override
+    protected void onSetInitialValue(Object defaultValue) {
+        setValue(getPersistedString((String) defaultValue));
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return getValue();
+    }
+
+    public static class BluetoothLePreferenceDialog extends PreferenceDialogFragmentCompat {
+
+        private int selectedEntryIndex;
+        private BluetoothLeAdapter listAdapter = new BluetoothLeAdapter();
+
+        private BluetoothLeScanner scanner = null;
+        private ScanCallback scanCallback = new ScanCallback() {
+            @Override
+            public void onScanResult(int callbackType, ScanResult result) {
+                super.onScanResult(callbackType, result);
+                Log.d(TAG, "Found device " + result.getDevice().getName() + " " + result);
+
+                listAdapter.add(result.getDevice());
+            }
+
+            @Override
+            public void onBatchScanResults(List<ScanResult> results) {
+                for (ScanResult scanResult : results) {
+                    listAdapter.add(scanResult.getDevice());
+                }
+            }
+
+            @Override
+            public void onScanFailed(int errorCode) {
+                super.onScanFailed(errorCode);
+                Log.e(TAG, "Bluetooth scan failed with errorCode " + errorCode);
+                Toast.makeText(getContext(), R.string.sensor_could_not_scan, Toast.LENGTH_LONG).show();
+                dismiss();
+            }
+        };
+
+        static BluetoothLePreferenceDialog newInstance(String key) {
+            final BluetoothLePreferenceDialog fragment = new BluetoothLePreferenceDialog();
+            final Bundle b = new Bundle(1);
+            b.putString(ARG_KEY, key);
+            fragment.setArguments(b);
+            return fragment;
+        }
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            BluetoothAdapter bluetoothAdapter = BluetoothUtils.getDefaultBluetoothAdapter(TAG);
+            if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled()) {
+                Log.w(TAG, "Bluetooth adapter is present or not enabled.");
+                Toast.makeText(getContext(), R.string.bluetooth_disabled, Toast.LENGTH_SHORT).show();
+                dismiss();
+                return;
+            }
+
+            if (bluetoothAdapter.isDiscovering()) {
+                Log.i(TAG, "Cancelling ongoing bluetooth discovery.");
+                bluetoothAdapter.cancelDiscovery();
+            }
+
+            scanner = bluetoothAdapter.getBluetoothLeScanner();
+            if (scanner == null) {
+                Log.e(TAG, "BluetoothLeScanner is null.");
+                dismiss();
+                return;
+            }
+
+            String deviceNone = getContext().getString(R.string.sensor_type_value_none);
+            listAdapter.add(getContext().getString(R.string.value_none), deviceNone);
+            selectedEntryIndex = 0;
+
+            BluetoothLePreference preference = (BluetoothLePreference) getPreference();
+            String deviceSelected = preference.getValue();
+            if (deviceSelected != null && !deviceNone.equals(deviceSelected)) {
+                listAdapter.add(preference.getValue(), preference.getValue());
+                selectedEntryIndex = 1;
+            }
+
+            ScanFilter.Builder scanFilterBuilder = new ScanFilter.Builder().setServiceUuid(new ParcelUuid(BluetoothUtils.HEART_RATE_SERVICE_UUID));
+            List<ScanFilter> scanFilter = new ArrayList<>();
+            scanFilter.add(scanFilterBuilder.build());
+
+            ScanSettings.Builder scanSettingsBuilder = new ScanSettings.Builder();
+            scanSettingsBuilder.setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY);
+
+            scanner.startScan(scanFilter, scanSettingsBuilder.build(), scanCallback);
+        }
+
+        //Behave like ListPreferenceDialogFragmentCompat, but uses a custom listAdapter.
+        @Override
+        protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+            super.onPrepareDialogBuilder(builder);
+
+            builder.setSingleChoiceItems(listAdapter, selectedEntryIndex,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            selectedEntryIndex = which;
+
+                            BluetoothLePreferenceDialog.this.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+                            dialog.dismiss();
+                        }
+                    });
+            builder.setIcon(android.R.drawable.stat_sys_data_bluetooth);
+            builder.setPositiveButton(null, null);
+        }
+
+        @Override
+        public void onDialogClosed(boolean positiveResult) {
+            if (scanner != null) {
+                scanner.stopScan(scanCallback);
+            }
+
+            if (positiveResult && selectedEntryIndex >= 0) {
+                String value = listAdapter.get(selectedEntryIndex).getAddress();
+                BluetoothLePreference preference = (BluetoothLePreference) getPreference();
+                if (preference.callChangeListener(value)) {
+                    preference.setValue(value);
+                }
+            }
+        }
+    }
+}

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

@@ -1,213 +1,163 @@
 package de.dennisguse.opentracks.settings;
 
-import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 
-import androidx.preference.ListPreference;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.util.BluetoothDeviceUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 final class PreferenceHelper {
 
-    /**
+    static String[] getMinRecordingIntervalEntries(Context context) {
-     * Sets the min recording interval options.
+        String[] entryValues = context.getResources().getStringArray(R.array.min_recording_interval_values);
-     *
+        String[] entries = new String[entryValues.length];
-     * @param options the options
+        for (int i = 0; i < entryValues.length; i++) {
-     * @param values  the values
+            int value = Integer.parseInt(entryValues[i]);
-     */
+
-    static void setMinRecordingIntervalOptions(Context context, String[] options, String[] values) {
+            if (value == PreferencesUtils.getMinRecordingIntervalAdaptAccuracy(context)) {
-        for (int i = 0; i < values.length; i++) {
+                entries[i] = context.getString(R.string.value_adapt_accuracy);
-            int value = Integer.parseInt(values[i]);
+            } else if (value == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) {
-            switch (value) {
+                entries[i] = context.getString(R.string.value_adapt_battery_life);
-                case PreferencesUtils.MIN_RECORDING_INTERVAL_ADAPT_BATTERY_LIFE:
+            } else if (value == PreferencesUtils.getMinRecordingIntervalDefault(context)) {
-                    options[i] = context.getString(R.string.value_adapt_battery_life);
+                entries[i] = context.getString(R.string.value_smallest_recommended);
-                    break;
+            } else {
-                case PreferencesUtils.MIN_RECORDING_INTERVAL_ADAPT_ACCURACY:
+                entries[i] = value < 60 ? context.getString(R.string.value_integer_second, value) : context.getString(R.string.value_integer_minute, value / 60);
-                    options[i] = context.getString(R.string.value_adapt_accuracy);
-                    break;
-                case PreferencesUtils.MIN_RECORDING_INTERVAL_DEFAULT:
-                    options[i] = context.getString(R.string.value_smallest_recommended);
-                    break;
-                default:
-                    options[i] = value < 60 ? context.getString(R.string.value_integer_second, value) : context.getString(R.string.value_integer_minute, value / 60);
             }
         }
+
+        return entries;
     }
 
-    /**
+    static String[] getRecordingDistanceIntervalEntries(Context context, boolean metricUnits) {
-     * Sets the recording distance interval options.
+        String[] entryValues = context.getResources().getStringArray(R.array.recording_distance_interval_values);
-     *
+        String[] entries = new String[entryValues.length];
-     * @param options     the options
+
-     * @param values      the values
+        final int recordingDistanceIntervalDefault = PreferencesUtils.getRecordingDistanceIntervalDefault(context);
-     * @param metricUnits true for metric units
+
-     */
+        for (int i = 0; i < entryValues.length; i++) {
-    static void setRecordingDistanceIntervalOptions(Context context, String[] options, String[] values, boolean metricUnits) {
+            int value = Integer.parseInt(entryValues[i]);
-        for (int i = 0; i < values.length; i++) {
-            int value = Integer.parseInt(values[i]);
             String displayValue;
             if (metricUnits) {
                 displayValue = context.getString(R.string.value_integer_meter, value);
-                if (value == PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT) {
+                if (value == recordingDistanceIntervalDefault) {
-                    options[i] = context.getString(R.string.value_integer_meter_recommended, value);
+                    entries[i] = context.getString(R.string.value_integer_meter_recommended, value);
                 } else {
-                    options[i] = displayValue;
+                    entries[i] = displayValue;
                 }
             } else {
                 int feet = (int) (value * UnitConversions.M_TO_FT);
                 displayValue = context.getString(R.string.value_integer_feet, feet);
-                if (value == PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT) {
+                if (value == recordingDistanceIntervalDefault) {
-                    options[i] = context.getString(R.string.value_integer_feet_recommended, feet);
+                    entries[i] = context.getString(R.string.value_integer_feet_recommended, feet);
                 } else {
-                    options[i] = displayValue;
+                    entries[i] = displayValue;
                 }
             }
         }
+
+        return entries;
     }
 
-    /**
+    static String[] getMaxRecordingDistanceEntries(Context context, boolean metricUnits) {
-     * Sets the max recording distance options.
+        String[] entryValues = context.getResources().getStringArray(R.array.max_recording_distance_values);
-     *
+        String[] entries = new String[entryValues.length];
-     * @param options     the options
+
-     * @param values      the values
+        final int maxRecordingDistanceDefault = Integer.parseInt(context.getResources().getString(R.string.max_recording_distance_default));
-     * @param metricUnits true for metric units
+
-     */
+        for (int i = 0; i < entryValues.length; i++) {
-    static void setMaxRecordingDistanceOptions(Context context, String[] options, String[] values, boolean metricUnits) {
+            int value = Integer.parseInt(entryValues[i]);
-        for (int i = 0; i < values.length; i++) {
-            int value = Integer.parseInt(values[i]);
             String displayValue;
             if (metricUnits) {
                 displayValue = context.getString(R.string.value_integer_meter, value);
-                if (value == PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT) {
+                if (value == maxRecordingDistanceDefault) {
-                    options[i] = context.getString(R.string.value_integer_meter_recommended, value);
+                    entries[i] = context.getString(R.string.value_integer_meter_recommended, value);
                 } else {
-                    options[i] = displayValue;
+                    entries[i] = displayValue;
                 }
             } else {
                 int feet = (int) (value * UnitConversions.M_TO_FT);
                 if (feet < 2000) {
                     displayValue = context.getString(R.string.value_integer_feet, feet);
-                    if (value == PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT) {
+                    if (value == maxRecordingDistanceDefault) {
-                        options[i] = context.getString(R.string.value_integer_feet_recommended, feet);
+                        entries[i] = context.getString(R.string.value_integer_feet_recommended, feet);
                     } else {
-                        options[i] = displayValue;
+                        entries[i] = displayValue;
                     }
                 } else {
                     double mile = feet * UnitConversions.FT_TO_MI;
                     displayValue = context.getString(R.string.value_float_mile, mile);
-                    options[i] = displayValue;
+                    entries[i] = displayValue;
                 }
             }
         }
+
+        return entries;
     }
 
-    /**
+    static String[] getRecordingGpsAccuracyEntries(Context context, boolean metricUnits) {
-     * Sets the recording gps accuracy options.
+        String[] entryValues = context.getResources().getStringArray(R.array.recording_gps_accuracy_values);
-     *
+        String[] entries = new String[entryValues.length];
-     * @param options     the options
+
-     * @param values      the values
+        final int recordingGPSAccuracyDefault = Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_default));
-     * @param metricUnits true for metric units
+        final int recordingGPSAccuracyExcellent = Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_excellent));
-     */
+        final int recordingGPSAccuracyPoor = Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_poor));
-    static void setRecordingGpsAccuracyOptions(Context context, String[] options, String[] values, boolean metricUnits) {
+
-        for (int i = 0; i < values.length; i++) {
+        for (int i = 0; i < entryValues.length; i++) {
-            int value = Integer.parseInt(values[i]);
+            int value = Integer.parseInt(entryValues[i]);
             String displayValue;
             if (metricUnits) {
                 displayValue = context.getString(R.string.value_integer_meter, value);
-                switch (value) {
+                if (value == recordingGPSAccuracyDefault) {
-                    case PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT:
+                    entries[i] = context.getString(R.string.value_integer_meter_recommended, value);
-                        options[i] = context.getString(R.string.value_integer_meter_recommended, value);
+                } else if (value == recordingGPSAccuracyExcellent) {
-                        break;
+                    entries[i] = context.getString(R.string.value_integer_meter_excellent_gps, value);
-                    case PreferencesUtils.RECORDING_GPS_ACCURACY_EXCELLENT:
+                } else if (value == recordingGPSAccuracyPoor) {
-                        options[i] = context.getString(R.string.value_integer_meter_excellent_gps, value);
+                    entries[i] = context.getString(R.string.value_integer_meter_poor_gps, value);
-                        break;
+                } else {
-                    case PreferencesUtils.RECORDING_GPS_ACCURACY_POOR:
+                    entries[i] = displayValue;
-                        options[i] = context.getString(R.string.value_integer_meter_poor_gps, value);
-                        break;
-                    default:
-                        options[i] = displayValue;
                 }
             } else {
                 int feet = (int) (value * UnitConversions.M_TO_FT);
                 if (feet < 2000) {
                     displayValue = context.getString(R.string.value_integer_feet, feet);
-                    switch (value) {
+
-                        case PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT:
+                    if (value == recordingGPSAccuracyDefault) {
-                            options[i] = context.getString(R.string.value_integer_feet_recommended, feet);
+                        entries[i] = context.getString(R.string.value_integer_feet_recommended, feet);
-                            break;
+                    } else if (value == recordingGPSAccuracyExcellent) {
-                        case PreferencesUtils.RECORDING_GPS_ACCURACY_EXCELLENT:
+                        entries[i] = context.getString(R.string.value_integer_feet_excellent_gps, feet);
-                            options[i] = context.getString(R.string.value_integer_feet_excellent_gps, feet);
+                    } else {
-                            break;
+                        entries[i] = displayValue;
-                        default:
-                            options[i] = displayValue;
                     }
                 } else {
                     double mile = feet * UnitConversions.FT_TO_MI;
                     displayValue = context.getString(R.string.value_float_mile, mile);
-                    if (value == PreferencesUtils.RECORDING_GPS_ACCURACY_POOR) {
+                    if (value == recordingGPSAccuracyPoor) {
-                        options[i] = context.getString(R.string.value_float_mile_poor_gps, mile);
+                        entries[i] = context.getString(R.string.value_float_mile_poor_gps, mile);
                     } else {
-                        options[i] = displayValue;
+                        entries[i] = displayValue;
                     }
                 }
             }
         }
+
+        return entries;
     }
 
-    /**
+    static String[] getAutoResumeTrackTimeoutEntries(Context context) {
-     * Sets the auto resume track timeout options.
+        String[] entryValues = context.getResources().getStringArray(R.array.auto_resume_track_timeout_values);
-     *
+        String[] entries = new String[entryValues.length];
-     * @param options the options
+
-     * @param values  the values
+        for (int i = 0; i < entryValues.length; i++) {
-     */
+            int value = Integer.parseInt(entryValues[i]);
-    static void setAutoResumeTrackTimeoutOptions(Context context, String[] options, String[] values) {
+            if (value == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_never))) {
-        for (int i = 0; i < values.length; i++) {
+                entries[i] = context.getString(R.string.value_never);
-            int value = Integer.parseInt(values[i]);
+            } else if (value == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_always))) {
-            switch (value) {
+                entries[i] = context.getString(R.string.value_always);
-                case PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_NEVER:
+            } else {
-                    options[i] = context.getString(R.string.value_never);
+                entries[i] = context.getString(R.string.value_integer_minute, value);
-                    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);
             }
         }
-    }
 
-    /**
+        return entries;
-     * Configures the bluetooth sensor.
-     */
-    static void configureBluetoothSensorList(ListPreference preference) {
-        Context context = preference.getContext();
-
-        String value = PreferencesUtils.getString(context, R.string.bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
-        List<String> devicesNameList = new ArrayList<>();
-        List<String> devicesAddressList = new ArrayList<>();
-        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-        if (bluetoothAdapter != null) {
-            BluetoothDeviceUtils.populateDeviceLists(bluetoothAdapter, devicesNameList, devicesAddressList);
-        }
-
-        // 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);
-        }
-
-        devicesNameList.add(0, context.getString(R.string.value_none));
-        devicesAddressList.add(0, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
-
-        String[] values = devicesAddressList.toArray(new String[0]);
-        preference.setEntryValues(values);
-
-        String[] options = devicesNameList.toArray(new String[0]);
-        preference.setEntries(options);
     }
 }

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,16 @@ import androidx.preference.PreferenceFragmentCompat;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
+import de.dennisguse.opentracks.util.BluetoothUtils;
+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 static final String TAG = SettingsActivity.class.getSimpleName();
+
+    private PrefsFragment prefsFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -29,7 +34,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 +42,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 {
 
         /*
@@ -46,14 +57,15 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
         private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-                getActivity().runOnUiThread(new Runnable() {
+                if (PreferencesUtils.isKey(getActivity(), R.string.recording_track_id_key, key)) {
-                    @Override
+                    getActivity().runOnUiThread(new Runnable() {
-                    public void run() {
+                        @Override
-                        updateUI();
+                        public void run() {
-                    }
+                            updateReset();
-                });
+                        }
-
+                    });
-                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() {
@@ -61,6 +73,14 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
                         }
                     });
                 }
+                if (PreferencesUtils.isKey(getActivity(), R.string.stats_rate_key, key)) {
+                    getActivity().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            updateSpeed();
+                        }
+                    });
+                }
             }
         };
 
@@ -69,15 +89,25 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
 
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-            setPreferencesFromResource(R.xml.settings, rootKey);
+            try {
-            updateUnits();
+                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);
+            }
         }
 
         @Override
         public void onResume() {
             super.onResume();
             PreferencesUtils.getSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-            updateUI();
+            updateSpeed();
+            updateUnits();
+            updateReset();
+            updateBluetooth();
         }
 
         @Override
@@ -86,41 +116,6 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
             PreferencesUtils.getSharedPreferences(getActivity()).unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
         }
 
-        private void configFrequencyPreference(int key, boolean metricUnits) {
-            ListPreference preference = findPreference(getString(key));
-
-            String[] options = StringUtils.getFrequencyOptions(getActivity(), metricUnits);
-            preference.setEntries(options);
-        }
-
-        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) {
-                case R.string.min_recording_interval_key:
-                    PreferenceHelper.setMinRecordingIntervalOptions(getActivity(), options, values);
-                    break;
-                case R.string.recording_distance_interval_key:
-                    PreferenceHelper.setRecordingDistanceIntervalOptions(getActivity(), options, values, metricUnits);
-                    break;
-                case R.string.max_recording_distance_key:
-                    PreferenceHelper.setMaxRecordingDistanceOptions(getActivity(), options, values, metricUnits);
-                    break;
-                case R.string.recording_gps_accuracy_key:
-                    PreferenceHelper.setRecordingGpsAccuracyOptions(getActivity(), options, values, metricUnits);
-                    break;
-                case R.string.auto_resume_track_timeout_key:
-                    PreferenceHelper.setAutoResumeTrackTimeoutOptions(getActivity(), options, values);
-                    break;
-                default:
-                    return;
-            }
-
-            final ListPreference listPreference = findPreference(getString(key));
-            listPreference.setEntries(options);
-        }
-
         @Override
         public void onDisplayPreferenceDialog(Preference preference) {
             DialogFragment dialogFragment = null;
@@ -129,6 +124,8 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
             } else if (preference instanceof ActivityTypePreference) {
                 activityPreferenceDialog = ActivityTypePreference.ActivityPreferenceDialog.newInstance(preference.getKey());
                 dialogFragment = activityPreferenceDialog;
+            } else if (preference instanceof BluetoothLePreference) {
+                dialogFragment = BluetoothLePreference.BluetoothLePreferenceDialog.newInstance(preference.getKey());
             }
 
             if (dialogFragment != null) {
@@ -146,37 +143,53 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
             }
         }
 
-        private void updateUI() {
+        private void updateReset() {
             final boolean isRecording = PreferencesUtils.isRecording(getActivity());
             Preference resetPreference = findPreference(getString(R.string.settings_reset_key));
             resetPreference.setSummary(isRecording ? getString(R.string.settings_not_while_recording) : "");
             resetPreference.setEnabled(!isRecording);
+        }
 
+        private void updateSpeed() {
             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));
+        private void updateBluetooth() {
-            PreferenceHelper.configureBluetoothSensorList(bluetoothPreference);
+            // Disable Bluetooth preference if device does not have Bluetooth
+            BluetoothLePreference bluetoothPreference = findPreference(getString(R.string.settings_sensor_bluetooth_heart_rate_key));
+            bluetoothPreference.setVisible(BluetoothUtils.hasBluetooth(TAG));
         }
 
         private void updateUnits() {
             boolean metricUnits = PreferencesUtils.isMetricUnits(getActivity());
 
-            configFrequencyPreference(R.string.voice_frequency_key, metricUnits);
+            ListPreference voiceFrequency = findPreference(getString(R.string.voice_frequency_key));
-            configFrequencyPreference(R.string.split_frequency_key, metricUnits);
+            voiceFrequency.setEntries(StringUtils.getFrequencyOptions(getActivity(), metricUnits));
-            configListPreference(R.string.min_recording_interval_key, R.array.min_recording_interval_values, metricUnits);
-            configListPreference(R.string.recording_distance_interval_key, R.array.recording_distance_interval_values, metricUnits);
-            configListPreference(R.string.max_recording_distance_key, R.array.max_recording_distance_values, metricUnits);
-            configListPreference(R.string.recording_gps_accuracy_key, R.array.recording_gps_accuracy_values, metricUnits);
-            configListPreference(R.string.auto_resume_track_timeout_key, R.array.auto_resume_track_timeout_values, metricUnits);
-            configListPreference(R.string.auto_resume_track_timeout_key, R.array.auto_resume_track_timeout_values, metricUnits);
 
-            final ListPreference statsRatePreferences = findPreference(getString(R.string.stats_rate_key));
+            ListPreference splitFrequency = findPreference(getString(R.string.split_frequency_key));
-            String[] options = getResources().getStringArray(metricUnits ? R.array.stats_rate_metric_options : R.array.stats_rate_imperial_options);
+            splitFrequency.setEntries(StringUtils.getFrequencyOptions(getActivity(), metricUnits));
-            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).
+            ListPreference minRecordingInterval = findPreference(getString(R.string.min_recording_interval_key));
-            //Check if this is still needed after upgraded PreferenceFragment.
+            minRecordingInterval.setEntries(PreferenceHelper.getMinRecordingIntervalEntries(getActivity()));
-            statsRatePreferences.setSummary(statsRatePreferences.getEntry());
+
+            ListPreference recordingDistanceInterval = findPreference(getString(R.string.recording_distance_interval_key));
+            recordingDistanceInterval.setEntries(PreferenceHelper.getRecordingDistanceIntervalEntries(getActivity(), metricUnits));
+
+            ListPreference maxRecordingDistance = findPreference(getString(R.string.max_recording_distance_key));
+            maxRecordingDistance.setEntries(PreferenceHelper.getMaxRecordingDistanceEntries(getActivity(), metricUnits));
+
+            ListPreference recordingGpsAccuracy = findPreference(getString(R.string.recording_gps_accuracy_key));
+            recordingGpsAccuracy.setEntries(PreferenceHelper.getRecordingGpsAccuracyEntries(getActivity(), metricUnits));
+
+            ListPreference autoresumeTrack = findPreference(getString(R.string.auto_resume_track_timeout_key));
+            autoresumeTrack.setEntries(PreferenceHelper.getAutoResumeTrackTimeoutEntries(getActivity()));
+
+            ListPreference statsRatePreferences = findPreference(getString(R.string.stats_rate_key));
+            String[] entries = getResources().getStringArray(metricUnits ? R.array.stats_rate_metric_options : R.array.stats_rate_imperial_options);
+            statsRatePreferences.setEntries(entries);
+
+            HackUtils.invalidatePreference(statsRatePreferences);
         }
     }
 }

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

@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-package de.dennisguse.opentracks.util;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * Utilities for dealing with bluetooth devices.
- *
- * @author Rodrigo Damazio
- */
-public class BluetoothDeviceUtils {
-
-    private BluetoothDeviceUtils() {
-    }
-
-    /**
-     * Populates the device names and the device addresses with all the suitable
-     * bluetooth devices.
-     *
-     * @param bluetoothAdapter the bluetooth adapter
-     * @param deviceNames      list of device names
-     * @param deviceAddresses  list of device addresses
-     */
-    public static void populateDeviceLists(BluetoothAdapter bluetoothAdapter, List<String> deviceNames, List<String> deviceAddresses) {
-        // Ensure the bluetooth adapter is not in discovery mode.
-        bluetoothAdapter.cancelDiscovery();
-
-        Set<BluetoothDevice> pairedDevices = bluetoothAdapter.getBondedDevices();
-        for (BluetoothDevice device : pairedDevices) {
-            BluetoothClass bluetoothClass = device.getBluetoothClass();
-            if (bluetoothClass != null && (bluetoothClass.getDeviceClass() & BluetoothClass.Device.HEALTH_PULSE_RATE) != 0) {
-                deviceAddresses.add(device.getAddress());
-                deviceNames.add(device.getName());
-            }
-        }
-    }
-}

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

@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+package de.dennisguse.opentracks.util;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+/**
+ * Utilities for dealing with bluetooth devices.
+ *
+ * @author Rodrigo Damazio
+ */
+public class BluetoothUtils {
+
+    public static final UUID HEART_RATE_SERVICE_UUID = new UUID(0x180D00001000L, 0x800000805f9b34fbL);
+
+    private BluetoothUtils() {
+    }
+
+    public static BluetoothAdapter getDefaultBluetoothAdapter(final String TAG) {
+        // If from the main application thread, return directly
+        if (Thread.currentThread().equals(Looper.getMainLooper().getThread())) {
+            return BluetoothAdapter.getDefaultAdapter();
+        }
+
+        // Get the default adapter from the main application thread
+        final ArrayList<BluetoothAdapter> adapters = new ArrayList<>(1);
+        final Object mutex = new Object();
+
+        Handler handler = new Handler(Looper.getMainLooper());
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                adapters.add(BluetoothAdapter.getDefaultAdapter());
+                synchronized (mutex) {
+                    mutex.notify();
+                }
+            }
+        });
+
+        while (adapters.isEmpty()) {
+            synchronized (mutex) {
+                try {
+                    mutex.wait(UnitConversions.ONE_SECOND);
+                } catch (InterruptedException e) {
+                    Log.e(TAG, "Interrupted while waiting for default bluetooth adapter", e);
+                }
+            }
+        }
+
+        if (adapters.get(0) == null) {
+            Log.w(TAG, "No bluetooth adapter found.");
+        }
+        return adapters.get(0);
+    }
+
+    public static boolean hasBluetooth(final String TAG) {
+        return BluetoothUtils.getDefaultBluetoothAdapter(TAG) != null;
+    }
+
+    public static int parseHeartRate(BluetoothGattCharacteristic characteristic) {
+        //DOCUMENTATION https://www.bluetooth.com/specifications/gatt/characteristics/
+        byte[] raw = characteristic.getValue();
+        int index = ((raw[0] & 0x1) == 1) ? 2 : 1;
+        int format = (index == 1) ? BluetoothGattCharacteristic.FORMAT_UINT8 : BluetoothGattCharacteristic.FORMAT_UINT16;
+        return characteristic.getIntValue(format, index);
+    }
+
+}

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

@@ -204,12 +204,13 @@ public class FileUtils {
      *
      * @param name name
      */
+    // TODO Check if this function is still needed.
     public static String sanitizeFileName(String name) {
         StringBuilder builder = new StringBuilder(name.length());
         for (int i = 0; i < name.length(); i++) {
             int codePoint = name.codePointAt(i);
             char character = name.charAt(i);
-            if (Character.isLetterOrDigit(character) || codePoint > 127 || isSpecialFat32(character)) {
+            if (Character.isLetterOrDigit(character) || codePoint > 127 || isSpecialFat32(character) || character == '.') {
                 builder.appendCodePoint(codePoint);
             } else {
                 builder.append("_");

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

@@ -29,6 +29,7 @@ import androidx.core.content.FileProvider;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 
 import de.dennisguse.opentracks.R;
@@ -70,19 +71,31 @@ public class IntentUtils {
      * @param trackIds the track ids
      */
     public static Intent newShareFileIntent(Context context, long[] trackIds) {
+        if (trackIds.length == 0) {
+            throw new RuntimeException("Need to share at least one track.");
+        }
         String trackDescription = "";
         if (trackIds.length == 1) {
-            Track track = ContentProviderUtils.Factory.get(context).getTrack(trackIds[0]);
+            Track track = new ContentProviderUtils(context).getTrack(trackIds[0]);
             trackDescription = track == null ? "" : new DescriptionGeneratorImpl(context).generateTrackDescription(track, false);
         }
-        Pair<Uri, String> uriAndMime = ShareContentProvider.createURI(trackIds, TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES);
 
-        return new Intent(Intent.ACTION_SEND)
+        String action = trackIds.length == 1 ? Intent.ACTION_SEND : Intent.ACTION_SEND_MULTIPLE;
-                .putExtra(Intent.EXTRA_STREAM, uriAndMime.first)
+        String mime = "";
+
+        ArrayList<Uri> uris = new ArrayList<>();
+        for (long trackId : trackIds) {
+            Pair<Uri, String> uriAndMime = ShareContentProvider.createURI(new long[]{trackId}, TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES);
+            uris.add(uriAndMime.first);
+            mime = uriAndMime.second;
+        }
+        return new Intent(action)
+                .setType(mime)
+                .setAction(Intent.ACTION_SEND_MULTIPLE)
+                .putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris)
+                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                 .putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.share_track_subject))
-                .putExtra(Intent.EXTRA_TEXT, context.getString(R.string.share_track_share_file_body, trackDescription))
+                .putExtra(Intent.EXTRA_TEXT, context.getString(R.string.share_track_share_file_body, trackDescription));
-                .setType(uriAndMime.second)
-                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
     }
 
     public static void showCoordinateOnMap(Context context, Waypoint waypoint) {

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();
@@ -158,7 +157,7 @@ public class LocationUtils {
     }
 
     /**
-     * Checks if a given location is a valid (i.e. physically possible) locationon Earth.
+     * Checks if a given location is a valid (i.e. physically possible) location on Earth.
      * Note: The special separator locations (which have latitude = 100) will not qualify as valid.
      * Neither will locations with lat=0 and lng=0 as these are most likely "bad" measurements which often cause trouble.
      *

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;
@@ -31,67 +32,8 @@ import de.dennisguse.opentracks.R;
  */
 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;
-
     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
-    public static final int FREQUENCY_OFF = 0;
-
-    public static final int MAX_RECORDING_DISTANCE_DEFAULT = 200;
-
-    // Values for min_recording_interval_key
-    public static final int MIN_RECORDING_INTERVAL_ADAPT_ACCURACY = -1;
-    public static final int MIN_RECORDING_INTERVAL_ADAPT_BATTERY_LIFE = -2;
-    public static final int MIN_RECORDING_INTERVAL_DEFAULT = 0;
-
-    public static final int RECORDING_DISTANCE_INTERVAL_DEFAULT = 10;
-
-    // Values for recording_gps_accuracy
-    public static final int RECORDING_GPS_ACCURACY_DEFAULT = 50;
-    public static final int RECORDING_GPS_ACCURACY_EXCELLENT = 10;
-    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 +41,60 @@ 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 String getDefaultActivity(Context context) {
+        return PreferencesUtils.getString(context, R.string.default_activity_key, context.getString(R.string.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 +166,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 +217,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 +228,129 @@ 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));
     }
 
-    /**
+    public static int getAutoResumeTrackTimeout(Context context) {
-     * Returns true if chart x axis is by distance, false if by time.
+        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);
-     * @param context the context
+    }
-     */
+
-    public static boolean isChartByDistance(Context context) {
+
-        return CHART_X_AXIS_DEFAULT.equals(getString(context, R.string.chart_x_axis_key, CHART_X_AXIS_DEFAULT));
+    public static boolean isRecordingTrackPaused(Context context) {
+        return PreferencesUtils.getBoolean(context, R.string.recording_track_paused_key, isRecordingTrackPausedDefault(context));
+    }
+
+    public static boolean isRecordingTrackPausedDefault(Context context) {
+        return context.getResources().getBoolean(R.bool.recording_track_paused_default);
+    }
+
+    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 isBluetoothHeartRateSensorAddressDefault(Context context) {
+        return PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT.equals(getBluetoothHeartRateSensorAddress(context));
+    }
+
+    public static String getBluetoothHeartRateSensorAddress(Context context) {
+        return PreferencesUtils.getString(context, R.string.settings_sensor_bluetooth_heart_rate_key, PreferencesUtils.BLUETOOTH_SENSOR_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, getRecordingDistanceIntervalDefault(context));
+    }
+
+    public static int getRecordingDistanceIntervalDefault(Context context) {
+        return Integer.parseInt(context.getResources().getString(R.string.recording_distance_interval_default));
+    }
+
+    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 getMinRecordingIntervalAdaptAccuracy(Context context) {
+        return Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_adapt_accuracy));
+    }
+
+    public static int getMinRecordingIntervalAdaptBatteryLife(Context context) {
+        return Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_adapt_battery_life));
+    }
+
+    public static int getMinRecordingIntervalDefault(Context context) {
+        return Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default));
+    }
+
+
+
+
+
+    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 +359,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);
     }
 }