Release: v3.20.2

Speed set to 0 when connected but last value is outdated. Fixes #930.
Bug: overflow when reset sensors (cadence and speed). Fixes #833.
Moving time stops when is not moving (the last track point is not moving) and restarts when last track point is moving.

.github/workflows/build_nightly.yml

@@ -0,0 +1,34 @@
+#https://github.com/marketplace/actions/android-emulator-runner
+name: Build nightly
+on: [ push ]
+
+jobs:
+  nightly-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2.3.4
+
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+
+      - name: Assemble nighlty APK
+        shell: bash
+        run: |
+          echo ${NIGHTLY_STORE_FILE} | base64 -d > KEY_NIGHTLY.jks
+          ./gradlew assembleNightly -Dnightly_store_file=KEY_NIGHTLY.jks -Dnightly_store_password="${NIGHTLY_STORE_PASSWORD}" -Dnightly_key_alias="${NIGHTLY_KEY_ALIAS}" -Dnightly_key_password="${NIGHTLY_STORE_PASSWORD}"
+        env:
+          NIGHTLY_STORE_FILE: ${{ secrets.NIGHTLY_STORE_FILE }}
+          NIGHTLY_STORE_PASSWORD: ${{ secrets.NIGHTLY_STORE_PASSWORD }}
+          NIGHTLY_KEY_ALIAS: ${{ secrets.NIGHTLY_KEY_ALIAS }}
+
+      - name: Archive
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: OpenTracks-nightly.apk
+          path: ./build/outputs/apk/nightly/OpenTracks-nightly.apk
+          retention-days: 7
+

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
 
       - uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: '11'
 
-      - run: ./gradlew lint
+      - run: ./gradlew lint

.github/workflows/test.yml

@@ -15,11 +15,11 @@ jobs:
 
       - uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: '11'
 
       - name: run tests
-        uses: reactivecircus/android-emulator-runner@v2.19.1
+        uses: reactivecircus/android-emulator-runner@v2.20.0
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}

README.md

@@ -51,16 +51,16 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
 
 ## Screenshots
 <div>
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot1.png">
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot2.png">
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot3.png">
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot4.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot1.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot2.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot3.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot4.png">
 </div>
 <div>
-	<img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot5.png">
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot6.png">
-	<img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot7.png">
-	<img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot8.png">
+	<img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot5.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot6.png">
+	<img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot7.png">
+	<img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot8.png">
 </div>
 
 ## Features

README_RELEASE.md

@@ -28,9 +28,10 @@ Requirement: `gem install fastlane`
    (requires keystore)
 2. Upload signed apk to [Google Play Console](https://play.google.com/apps/publish)
 3. Update store meta data (e.g., description and screenshots)
-   `fastlane supply --version_code VERSION_CODE --skip_upload_apk`
-   (use the version code from the manifest)
-   (requires API key)
+   `fastlane metadata`
+   (requires API key configured in `Appfile`)
+
+Supported languages: https://support.google.com/googleplay/android-developer/table/4419860
 
 ## Translations (localization)
 

README_TESTED_SENSORS.md

@@ -11,6 +11,7 @@
 * Wahoo Tickr (Model: WFBTHR02)
 * Mi Band 3, Amazfit Band 5, Amazfit Bip. These devices are manufactured by Huami, and other Huami devices will very likely work. Theoretically, this sensor must be enabled, but testing reveals that it works even without enabling. For details on how to enable see [Gadgetbridge wiki](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Huami-Heartrate-measurement#bluetooth-heart-rate-sensor)
 * Amazfit Neo. But first you have to enable "Discoverable" and "Activity heart rate sharing" in the official Zepp app. (after pairing with OpenTracks you can disable them again)
+* Garmin HRM-Dual (Reference: 010-12883-00)
 
 ## CSCP: Cycling Cadence and Speed Service
 
@@ -54,4 +55,4 @@ Also the distance is not computed.
 
 We do not support type of movement (i.e., walking vs running).
 
-* Polar Stride
+* Polar Stride

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
     }
 }
 
@@ -50,8 +50,8 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 4358
-        versionName "v3.19.0"
+        versionCode 4448
+        versionName "v3.20.2"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -62,6 +62,16 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
+    signingConfigs {
+        nightly {
+            if (System.getProperty("nightly_store_file") != null) {
+                storeFile file(System.getProperty("nightly_store_file"))
+                storePassword System.getProperty("nightly_store_password")
+                keyAlias System.getProperty("nightly_key_alias")
+                keyPassword System.getProperty("nightly_key_password")
+            }
+        }
+    }
 
     buildTypes {
         debug {
@@ -69,6 +79,12 @@ android {
             versionNameSuffix "-debug"
         }
 
+        nightly {
+            signingConfig signingConfigs.nightly
+            applicationIdSuffix ".nightly"
+            versionNameSuffix "-nightly"
+        }
+
         release {
             minifyEnabled false
         }
@@ -98,7 +114,7 @@ dependencies {
     androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'org.mockito:mockito-android:3.10.0'
+    androidTestImplementation 'org.mockito:mockito-android:3.12.4'
 
     androidTestUtil 'androidx.test:orchestrator:1.4.0'
 }

doc/data-structure.txt

@@ -43,7 +43,6 @@ class TrackPoint {
     - sensor_power
 }
 
-
 class Marker {
     - id
     - trackId
@@ -58,6 +57,26 @@ class Marker {
     - photoUrl
 }
 
+class DataField {
+    - key
+    - title
+    - isVisible
+    - isPrimary
+    - isWide
+}
+
+class StatisticData {
+    - value
+    - unit
+    - description
+}
+StatisticData o-- DataField
+
+class Layout {
+    - profile
+}
+Layout "1" o-- "many" DataField
+
 note left of TrackPoint
 As of OpenTracks version 3.15.0, all times are using device time.
 Before that TrackPoint.time contained GPS time (determined by GPS hardware).
@@ -77,4 +96,4 @@ Trackpoints of Type.SEGMENT_START_MANUAL or Type.SEGMENT_END_MANUAL do not conta
 
 Tracks recorded prior to OpenTracks version 3.15.0, do neither begin with a Type.SEGMENT_START_MANUAL nor end with a Type.SEGMENT_END_MANUAL.
 end note
-@enduml
+@enduml

fastlane/.gitignore

@@ -0,0 +1,3 @@
+README.md
+Appfile
+report.xml

fastlane/Fastfile

@@ -16,23 +16,11 @@
 default_platform(:android)
 
 platform :android do
-  desc "Runs all the tests"
-  lane :test do
-    gradle(task: "test")
-  end
-
-  desc "Submit a new Beta Build to Crashlytics Beta"
-  lane :beta do
-    gradle(task: "clean assembleRelease")
-    crashlytics
-  
-    # sh "your_script.sh"
-    # You can also use other beta testing services here
-  end
-
-  desc "Deploy a new version to the Google Play"
-  lane :deploy do
-    gradle(task: "clean assembleRelease")
-    upload_to_play_store
+  desc "Upload metadata"
+  lane :metadata do
+    upload_to_play_store(
+        skip_upload_apk: true,
+        skip_upload_changelogs: true
+    )
   end
 end

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

@@ -0,0 +1,8 @@
+v3.19.1: OpenTracks
+
+Changes:
+- Updated translations.
+
+Bugfix:
+- Export All Tracks bug fixed.
+- Resume Track bug fixed.

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

@@ -0,0 +1,9 @@
+v3.20.0: OpenTracks
+
+Changes:
+- While recording: statistics UI is now configurable
+
+Bugfix:
+- Changing track name/ category while recording was ignored (introduced in v3.19.0)
+
+

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

@@ -0,0 +1,7 @@
+v3.20.1: OpenTracks
+
+Changes:
+- Announcements can now be used by both distance and time
+- Announcements beep if no Text-to-speech software is installed
+- Removed adaptive GPS location frequency
+

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

@@ -0,0 +1,11 @@
+v3.20.2: OpenTracks
+
+Changes:
+- Elevation gain and loss are integers instead of floats
+- Ask for permission before using Bluetooth by a Toast message
+
+Bugfix:
+- Set FLAG_IMMUTABLE for PendingIntents to avoid crash on Android 12
+- Cadence sensor returns 0 instead of None when user is not pedaling
+- Speed sensor returns 0 instead of the last speed when it's stopped
+- With sensors, moving time stops when is not moving

fastlane/metadata/android/eo/full_description.txt

@@ -4,8 +4,8 @@ Eblaĵoj:
 • registri vian sportan kaj alian aktivecon eksterdome
 • fotoj kaj markoj: marki interesajn lokojn dum registri aktivecon
 • registri ŝanĝon de altitudo uzante barometron
-• montri altitudon en EGM2008 ()super averaĝa marnivelo); elporti ilin kiel WGS84
+• montri altitudon en EGM2008 (super averaĝa marnivelo); elporti ilin kiel WGS84
 • voĉaj anoncoj
-• subteno por sentiloj BLE por registri vian pulson; rapidon, veturigitan distancon, pedal-rapidon, povumon (biciklado)
+• subteno por sentiloj BLE por registri vian pulson, rapidon, veturigitan distancon, pedal-rapidon, povumon (biciklado)
 • elporti datumojn al dosieroj KMZ (kun fotoj), KML aŭ GPX
 • funkcias malkonekte: interreta permeso ne estas uzata

fastlane/metadata/android/nb-NO/full_description.txt

@@ -1,9 +1,11 @@
+OpenTracks er en sportsporingsapp som respekterer ditt personvern.
+
 Funksjoner:
-* Sportssoring: Spor dine sports- og utendørsaktiviteter
+* Sportsporing: Registrer dine sports- og utendørsaktiviteter
 * Bilder og markører: Marker interessante steder under sporing
-* Høydeendringer: via barometer
+* Total stigning og nedstigning: via barometersensor
 * Høyde vist i EGM2008 (over havnivå); eksportert som WGS84
-* Stemmekunngjøringer
-* Støtter Blåtann LE-sensorer: pulse, hastighet og distanse (sykling), takt (sykling), og effektmeter (sykling)
-* Eksport av data: Enten som KMZ (inkl. bilder), KML, eller GPX
-* Ingen tilgang til Internett: Ingenting lastes opp noensteds hen
+* Talemeldinger
+* Støtter Blåtann LE-sensorer: puls, hastighet og distanse (sykling), kadens (sykling) og wattmåler (sykling)
+* Eksport av data: Enten som KMZ (inkl. bilder), KML eller GPX
+* Ingen internettilgang: Internett brukes ikke

src/androidTest/java/de/dennisguse/opentracks/EspressoCategoryUnitTest.java

@@ -1,191 +0,0 @@
-package de.dennisguse.opentracks;
-
-
-import static androidx.test.espresso.Espresso.onData;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.scrollTo;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
-import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anything;
-import static org.hamcrest.Matchers.is;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-
-import androidx.test.espresso.DataInteraction;
-import androidx.test.espresso.UiController;
-import androidx.test.espresso.ViewAction;
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.ext.junit.rules.ActivityScenarioRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.GrantPermissionRule;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
-
-/**
- * Espresso test that checks the unit for activity category selected.
- * Also it checks that unit is properly when user change from a pace activity to an speed one.
- */
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class EspressoCategoryUnitTest {
-
-    @Rule
-    public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
-
-    @Rule
-    public TestRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
-    private final Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
-    @Rule
-    public TestRule mLocaleRule = new PreferenceMetricUnitRule(context, true);
-
-    @Test
-    public void changeBetweenCategoryUpdateProperlyUnitTest() {
-        // Start record.
-        ViewInteraction appCompatImageButton = onView(
-                allOf(withId(R.id.controller_record), withContentDescription("Record"),
-                        childAtPosition(
-                                allOf(withId(R.id.controller_container),
-                                        childAtPosition(
-                                                withId(R.id.controller_fragment),
-                                                0)),
-                                0),
-                        isDisplayed()));
-        appCompatImageButton.perform(click());
-
-        {
-            // Change to running activity (pace activity).
-            ViewInteraction appCompatImageView = onView(
-                    allOf(withId(R.id.stats_activity_type_icon),
-                            childAtPosition(
-                                    childAtPosition(
-                                            withClassName(is("android.widget.ScrollView")),
-                                            0),
-                                    7)));
-            appCompatImageView.perform(scrollTo(), click());
-
-            DataInteraction imageView = onData(anything())
-                    .inAdapterView(allOf(withId(R.id.choose_activity_type_grid_view),
-                            childAtPosition(
-                                    withClassName(is("android.widget.LinearLayout")),
-                                    0)))
-                    .atPosition(1);
-            imageView.perform(click());
-        }
-
-        // Pace (min/km) in all fields.
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_speed_unit)));
-            textView.perform(waitFor(2000));
-            textView.check(matches(withText("min/km")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_average_speed_unit)));
-            textView.check(matches(withText("min/km")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_max_speed_unit)));
-            textView.check(matches(withText("min/km")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_moving_speed_unit)));
-            textView.check(matches(withText("min/km")));
-        }
-
-        {
-            // Change to biking activity (speed activity).
-            ViewInteraction appCompatImageView = onView(
-                    allOf(withId(R.id.stats_activity_type_icon),
-                            childAtPosition(
-                                    childAtPosition(
-                                            withClassName(is("android.widget.ScrollView")),
-                                            0),
-                                    7)));
-            appCompatImageView.perform(scrollTo(), click());
-
-            DataInteraction imageView = onData(anything())
-                    .inAdapterView(allOf(withId(R.id.choose_activity_type_grid_view),
-                            childAtPosition(
-                                    withClassName(is("android.widget.LinearLayout")),
-                                    0)))
-                    .atPosition(9);
-            imageView.perform(click());
-        }
-
-        // Speed (km/h) in all fields.
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_speed_unit)));
-            textView.perform(waitFor(2000));
-            textView.check(matches(withText("km/h")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_average_speed_unit)));
-            textView.check(matches(withText("km/h")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_max_speed_unit)));
-            textView.check(matches(withText("km/h")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_moving_speed_unit)));
-            textView.check(matches(withText("km/h")));
-        }
-    }
-
-    private static Matcher<View> childAtPosition(
-            final Matcher<View> parentMatcher, final int position) {
-
-        return new TypeSafeMatcher<>() {
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("Child at position " + position + " in parent ");
-                parentMatcher.describeTo(description);
-            }
-
-            @Override
-            public boolean matchesSafely(View view) {
-                ViewParent parent = view.getParent();
-                return parent instanceof ViewGroup && parentMatcher.matches(parent)
-                        && view.equals(((ViewGroup) parent).getChildAt(position));
-            }
-        };
-    }
-
-    private static ViewAction waitFor(final long duration_ms) {
-        return new ViewAction() {
-
-            @Override
-            public String getDescription() {
-                return "Wait for milliseconds.";
-            }
-
-            @Override
-            public Matcher<View> getConstraints() {
-                return isDisplayed();
-            }
-
-            @Override
-            public void perform(UiController uiController, final View view) {
-                uiController.loopMainThreadForAtLeast(duration_ms);
-            }
-        };
-    }
-}

src/androidTest/java/de/dennisguse/opentracks/EspressoCustomLayoutTest.java

@@ -0,0 +1,138 @@
+package de.dennisguse.opentracks;
+
+
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.espresso.NoMatchingViewException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.ViewAssertion;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.action.MotionEvents;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.rule.GrantPermissionRule;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.*;
+import static androidx.test.espresso.matcher.ViewMatchers.*;
+
+import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.hamcrest.CoreMatchers.is;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class EspressoCustomLayoutTest {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    @Rule
+    public ActivityTestRule<TrackListActivity> mActivityTestRule = new ActivityTestRule<>(TrackListActivity.class);
+
+    @Rule
+    public GrantPermissionRule mGrantPermissionRule =
+            GrantPermissionRule.grant(
+                    "android.permission.ACCESS_FINE_LOCATION");
+
+    @Test
+    public void customLayoutTest() {
+        // TrackListActivity: start recording
+        ViewInteraction trackControllerRecordButton = onView(withId(R.id.controller_record));
+        trackControllerRecordButton.perform(click());
+
+        // Get custom layout preferences and check all data fields are showed.
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
+        Layout layout = PreferencesUtils.getCustomLayout(sharedPreferences, context);
+
+        onView(withId(R.id.stats_recycler_view)).check(new RecyclerViewItemCountAssertion((int) layout.getFields().stream().filter(DataField::isVisible).count()));
+
+        // stop recording
+        ViewInteraction trackControllerStopButton = onView(withId(R.id.controller_stop));
+        trackControllerStopButton.perform(veryLongTouch(1600));
+    }
+
+    private static class RecyclerViewItemCountAssertion implements ViewAssertion {
+        private final int expectedCount;
+
+        public RecyclerViewItemCountAssertion(int expectedCount) {
+            this.expectedCount = expectedCount;
+        }
+
+        @Override
+        public void check(View view, NoMatchingViewException noViewFoundException) {
+            if (noViewFoundException != null) {
+                throw noViewFoundException;
+            }
+
+            RecyclerView recyclerView = (RecyclerView) view;
+            RecyclerView.Adapter<?> adapter = recyclerView.getAdapter();
+            assertThat(adapter.getItemCount(), is(expectedCount));
+        }
+    }
+
+    private static Matcher<View> childAtPosition(
+            final Matcher<View> parentMatcher, final int position) {
+
+        return new TypeSafeMatcher<View>() {
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("Child at position " + position + " in parent ");
+                parentMatcher.describeTo(description);
+            }
+
+            @Override
+            public boolean matchesSafely(View view) {
+                ViewParent parent = view.getParent();
+                return parent instanceof ViewGroup && parentMatcher.matches(parent)
+                        && view.equals(((ViewGroup) parent).getChildAt(position));
+            }
+        };
+    }
+
+    private static ViewAction veryLongTouch(final int duration_ms) {
+        return new ViewAction() {
+            @Override
+            public String getDescription() {
+                return "Perform long touch.";
+            }
+
+            @Override
+            public Matcher<View> getConstraints() {
+                return isDisplayed();
+            }
+
+            @Override
+            public void perform(UiController uiController, final View view) {
+                // Get view absolute position
+                int[] location = new int[2];
+                view.getLocationOnScreen(location);
+
+                // Offset coordinates by view position
+                float[] coordinates = new float[]{location[0] + 1, location[1] + 1};
+
+                // Send down event, pause, and send up
+                MotionEvent down = MotionEvents.sendDown(uiController, coordinates, new float[]{1f, 1f}).down;
+                uiController.loopMainThreadForAtLeast(duration_ms);
+                MotionEvents.sendUp(uiController, down, coordinates);
+            }
+        };
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java

@@ -143,7 +143,7 @@ public class EspressoDeleteTrackTest {
     private static Matcher<View> childAtPosition(
             final Matcher<View> parentMatcher, final int position) {
 
-        return new TypeSafeMatcher<View>() {
+        return new TypeSafeMatcher<>() {
             @Override
             public void describeTo(Description description) {
                 description.appendText("Child at position " + position + " in parent ");
@@ -160,13 +160,15 @@ public class EspressoDeleteTrackTest {
     }
 
     public static Matcher<View> withListSize (final int size) {
-        return new TypeSafeMatcher<View> () {
-            @Override public boolean matchesSafely (final View view) {
-                return ((ListView) view).getCount () == size;
+        return new TypeSafeMatcher<>() {
+            @Override
+            public boolean matchesSafely(final View view) {
+                return ((ListView) view).getCount() == size;
             }
 
-            @Override public void describeTo (final Description description) {
-                description.appendText ("ListView should have " + size + " items");
+            @Override
+            public void describeTo(final Description description) {
+                description.appendText("ListView should have " + size + " items");
             }
         };
     }

src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java

@@ -0,0 +1,261 @@
+package de.dennisguse.opentracks;
+
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.action.ViewActions.scrollTo;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.is;
+
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
+import androidx.test.espresso.PerformException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.action.MotionEvents;
+import androidx.test.espresso.util.HumanReadables;
+import androidx.test.espresso.util.TreeIterables;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.rule.GrantPermissionRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.hamcrest.core.IsInstanceOf;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.TimeoutException;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class EspressoEditTrackRecordingTest {
+
+    @Rule
+    public ActivityTestRule<TrackListActivity> mActivityTestRule = new ActivityTestRule<>(TrackListActivity.class);
+
+    @Rule
+    public GrantPermissionRule mGrantPermissionRule =
+            GrantPermissionRule.grant(
+                    "android.permission.ACCESS_FINE_LOCATION",
+                    "android.permission.ACCESS_COARSE_LOCATION");
+
+    @LargeTest
+    @Test
+    public void espressoEditTrackRecordingTest() {
+        {
+            // TrackListActivity: start recording
+            ViewInteraction trackControllerRecordButton = onView(withId(R.id.controller_record));
+            trackControllerRecordButton.perform(click());
+        }
+        {
+            // TrackRecordingActivity
+            ViewInteraction trackControllerRecordButton = onView(withId(R.id.controller_record));
+            ViewInteraction trackControllerStopButton = onView(withId(R.id.controller_stop));
+
+            // wait; stay recording
+            trackControllerRecordButton.perform(waitFor(15000));
+
+            // open menu
+            ViewInteraction overflowMenuButton = onView(
+                    allOf(withContentDescription("More options"),
+                            childAtPosition(
+                                    childAtPosition(
+                                            withId(R.id.toolbar),
+                                            2),
+                                    2),
+                            isDisplayed()));
+            overflowMenuButton.perform(click());
+
+            // click on edit
+            ViewInteraction appCompatTextView = onView(
+                    allOf(withId(R.id.title), withText("Edit"),
+                            childAtPosition(
+                                    childAtPosition(
+                                            withId(R.id.content),
+                                            0),
+                                    0),
+                            isDisplayed()));
+            appCompatTextView.perform(click());
+
+            // change name for "New Name"
+            ViewInteraction textInputEditText = onView(
+                    allOf(withId(R.id.track_edit_name),
+                            childAtPosition(
+                                    childAtPosition(
+                                            withClassName(is("com.google.android.material.textfield.TextInputLayout")),
+                                            0),
+                                    1)));
+            textInputEditText.perform(scrollTo(), replaceText("New Name"));
+
+            ViewInteraction textInputEditText2 = onView(
+                    allOf(withId(R.id.track_edit_name), withText("New Name"),
+                            childAtPosition(
+                                    childAtPosition(
+                                            withClassName(is("com.google.android.material.textfield.TextInputLayout")),
+                                            0),
+                                    1),
+                            isDisplayed()));
+            textInputEditText2.perform(closeSoftKeyboard());
+
+            // save edition
+            ViewInteraction appCompatButton = onView(
+                    allOf(withId(R.id.track_edit_save),
+                            childAtPosition(
+                                    childAtPosition(
+                                            withClassName(is("android.widget.LinearLayout")),
+                                            3),
+                                    1),
+                            isDisplayed()));
+            appCompatButton.perform(click());
+
+            //pause
+            trackControllerRecordButton.perform(veryLongTouch(1600));
+
+            // wait; stay paused
+            trackControllerRecordButton.perform(waitFor(1000));
+
+            // resume
+            trackControllerRecordButton.perform(click());
+
+            // wait; stay recording
+            trackControllerRecordButton.perform(waitFor(1000));
+
+            // stop;
+            trackControllerStopButton.perform(veryLongTouch(1600));
+
+            // check track's name is "New Name"
+            ViewInteraction textView = onView(
+                    allOf(withId(R.id.stats_name_value),
+                            withParent(withParent(IsInstanceOf.instanceOf(android.widget.ScrollView.class))),
+                            isDisplayed()));
+            textView.check(matches(withText("New Name")));
+        }
+    }
+
+    private static Matcher<View> childAtPosition(
+            final Matcher<View> parentMatcher, final int position) {
+
+        return new TypeSafeMatcher<>() {
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("Child at position " + position + " in parent ");
+                parentMatcher.describeTo(description);
+            }
+
+            @Override
+            public boolean matchesSafely(View view) {
+                ViewParent parent = view.getParent();
+                return parent instanceof ViewGroup && parentMatcher.matches(parent)
+                        && view.equals(((ViewGroup) parent).getChildAt(position));
+            }
+        };
+    }
+
+    public static ViewAction waitId(final int viewId, final long millis) {
+        return new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return isRoot();
+            }
+
+            @Override
+            public String getDescription() {
+                return "wait for a specific view with id <" + viewId + "> during " + millis + " millis.";
+            }
+
+            @Override
+            public void perform(final UiController uiController, final View view) {
+                uiController.loopMainThreadUntilIdle();
+                final long startTime = System.currentTimeMillis();
+                final long endTime = startTime + millis;
+                final Matcher<View> viewMatcher = withId(viewId);
+
+                do {
+                    for (View child : TreeIterables.breadthFirstViewTraversal(view)) {
+                        // found view with required ID
+                        if (viewMatcher.matches(child)) {
+                            return;
+                        }
+                    }
+
+                    uiController.loopMainThreadForAtLeast(50);
+                }
+                while (System.currentTimeMillis() < endTime);
+
+                // timeout happens
+                throw new PerformException.Builder()
+                        .withActionDescription(this.getDescription())
+                        .withViewDescription(HumanReadables.describe(view))
+                        .withCause(new TimeoutException())
+                        .build();
+            }
+        };
+    }
+
+    private static ViewAction waitFor(final long duration_ms) {
+        return new ViewAction() {
+
+            @Override
+            public String getDescription() {
+                return "Wait for milliseconds.";
+            }
+
+            @Override
+            public Matcher<View> getConstraints() {
+                return isDisplayed();
+            }
+
+            @Override
+            public void perform(UiController uiController, final View view) {
+                uiController.loopMainThreadForAtLeast(duration_ms);
+            }
+        };
+    }
+
+    private static ViewAction veryLongTouch(final int duration_ms) {
+        return new ViewAction() {
+            @Override
+            public String getDescription() {
+                return "Perform long touch.";
+            }
+
+            @Override
+            public Matcher<View> getConstraints() {
+                return isDisplayed();
+            }
+
+            @Override
+            public void perform(UiController uiController, final View view) {
+                // Get view absolute position
+                int[] location = new int[2];
+                view.getLocationOnScreen(location);
+
+                // Offset coordinates by view position
+                float[] coordinates = new float[]{location[0] + 1, location[1] + 1};
+
+                // Send down event, pause, and send up
+                MotionEvent down = MotionEvents.sendDown(uiController, coordinates, new float[]{1f, 1f}).down;
+                uiController.loopMainThreadForAtLeast(duration_ms);
+                MotionEvents.sendUp(uiController, down, coordinates);
+            }
+        };
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java

@@ -2,6 +2,7 @@ package de.dennisguse.opentracks.content.sensor;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -11,6 +12,7 @@ import de.dennisguse.opentracks.util.UintUtils;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
 
 @RunWith(AndroidJUnit4.class)
 public class SensorDataCyclingTest {
@@ -81,7 +83,9 @@ public class SensorDataCyclingTest {
         assertEquals(60, current.getValue(), 0.01);
     }
 
+    @Ignore("Disabled from #953")
     @Test
+    @Deprecated
     public void compute_cadence_rollOverCount() {
         // given
         SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
@@ -94,6 +98,19 @@ public class SensorDataCyclingTest {
         assertEquals(60, current.getValue(), 0.01);
     }
 
+    @Test
+    public void compute_cadence_overflow() {
+        // given
+        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
+        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 0, 2048);
+
+        // when
+        current.compute(previous);
+
+        // then
+        assertNull(current.getValue());
+    }
+
     @Test
     public void compute_speed() {
         // given
@@ -108,7 +125,9 @@ public class SensorDataCyclingTest {
         assertEquals(1.20, current.getValue().getSpeed().toMPS(), 0.01);
     }
 
+    @Ignore("Disabled from #953")
     @Test
+    @Deprecated
     public void compute_speed_rollOverCount() {
         // given
         SensorDataCycling.DistanceSpeed previous = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
@@ -122,6 +141,19 @@ public class SensorDataCyclingTest {
         assertEquals(2, current.getValue().getSpeed().toMPS(), 0.01);
     }
 
+    @Test
+    public void compute_speed_overflow() {
+        // given
+        SensorDataCycling.DistanceSpeed previous = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
+        SensorDataCycling.DistanceSpeed current = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", 0, 2048);
+
+        // when
+        current.compute(previous, Distance.ofMM(2000));
+
+        // then
+        assertNull(current.getValue());
+    }
+
     @Test
     public void equals_speed_with_no_data() {
         // given

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

@@ -112,41 +112,41 @@ public class ExportImportTest {
 
         TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
                 .getService();
-        service.getHandlerServer().setClock(Clock.systemUTC());
+        service.getTrackPointCreator().setClock(Clock.systemUTC());
     }
 
     public void setUp(boolean hasSensorDistance) throws TimeoutException {
         TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
                 .getService();
 
-        TrackPointCreator handlerServer = service.getHandlerServer();
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
         trackId = service.startNewTrack();
 
         Distance sensorDistance = hasSensorDistance ? Distance.of(5) : null;
 
-        sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:03Z"), 3, 14, 10, 15, 10, 1, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:03Z"), 3, 14, 10, 15, 10, 1, 66, 3, 50, sensorDistance);
         service.insertMarker("Marker 1", "Marker 1 category", "Marker 1 desc", null);
-        sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:04Z"), 3, 14.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
-        sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:05Z"), 3, 14.002, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:04Z"), 3, 14.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:05Z"), 3, 14.002, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
         service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:06Z"), ZoneId.of("CET")));
-        handlerServer.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:06Z"), ZoneId.of("CET")));
+        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
         service.pauseCurrentTrack();
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:20Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:20Z"), ZoneId.of("CET")));
         service.resumeCurrentTrack();
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:21Z"), ZoneId.of("CET")));
-        sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:21Z"), 3, 14.003, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:21Z"), ZoneId.of("CET")));
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:21Z"), 3, 14.003, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
 
-        sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:22Z"), 3, 16, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
-        sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:23Z"), 3, 16.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:22Z"), 3, 16, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:23Z"), 3, 16.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:24Z"), ZoneId.of("CET")));
-        handlerServer.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:24Z"), ZoneId.of("CET")));
+        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
         service.endCurrentTrack();
 
         Track track = contentProviderUtils.getTrack(trackId);
@@ -380,7 +380,7 @@ public class ExportImportTest {
         }
     }
 
-    private void sendLocation(TrackPointCreator handlerServer, Instant time, double latitude, double longitude, float accuracy, float speed, float altitude, float altitudeGain, float heartRate, float cyclingCadence, float power, Distance distance) {
+    private void sendLocation(TrackPointCreator trackPointCreator, Instant time, double latitude, double longitude, float accuracy, float speed, float altitude, float altitudeGain, float heartRate, float cyclingCadence, float power, Distance distance) {
         Location location = new Location("mock");
         location.setLatitude(latitude);
         location.setLongitude(longitude);
@@ -388,7 +388,7 @@ public class ExportImportTest {
         location.setSpeed(speed);
         location.setAltitude(altitude);
 
-        handlerServer.setAltitudeSumManager(new AltitudeSumManager() {
+        trackPointCreator.setAltitudeSumManager(new AltitudeSumManager() {
             @Override
             public void fill(@NonNull TrackPoint trackPoint) {
                 trackPoint.setAltitudeGain(altitudeGain);
@@ -396,7 +396,7 @@ public class ExportImportTest {
             }
         });
 
-        handlerServer.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
+        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
             @Override
             public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
                 SensorDataSet sensorDataSet = new SensorDataSet();
@@ -422,7 +422,7 @@ public class ExportImportTest {
             }
         });
 
-        handlerServer.setClock(Clock.fixed(time, ZoneId.of("CET")));
-        handlerServer.getLocationHandler().onLocationChanged(location);
+        trackPointCreator.setClock(Clock.fixed(time, ZoneId.of("CET")));
+        trackPointCreator.getLocationHandler().onLocationChanged(location);
     }
 }

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

@@ -1,83 +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.services;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.time.Duration;
-
-import de.dennisguse.opentracks.services.handlers.AdaptiveLocationListenerPolicy;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests the {@link AdaptiveLocationListenerPolicy}.
- *
- * @author youtaol
- */
-@RunWith(JUnit4.class)
-public class AdaptiveLocationListenerPolicyTest {
-
-    private static final Duration MIN = Duration.ofMillis(1000);
-    private static final Duration MAX = Duration.ofMillis(3000);
-    private static final int MIN_DISTANCE = 10;
-    private static final Duration NEW_IDLE_TIME_BIG = Duration.ofMillis(10000);
-    private static final Duration NEW_IDLE_TIME_NORMAL = Duration.ofMillis(5000);
-    private static final Duration NEW_IDLE_TIME_SMALL = Duration.ofMillis(2000);
-    private static final Duration NEW_IDLE_TIME_LESS_THAN_MIN = Duration.ofMillis(500);
-    private AdaptiveLocationListenerPolicy adaptiveLocationListenerPolicy;
-
-    @Before
-    public void setUp() {
-        adaptiveLocationListenerPolicy = new AdaptiveLocationListenerPolicy(MIN, MAX, MIN_DISTANCE);
-    }
-
-    /**
-     * Tests the {@link AdaptiveLocationListenerPolicy#getDesiredPollingInterval()} in four situations.
-     * <ul>
-     * <li>The newIdleTime is bigger than max interval.</li>
-     * <li>The newIdleTime is between min and max interval.</li>
-     * <li>The newIdleTime is smaller than max interval.</li>
-     * <li>The newIdleTime is smaller than the smallest interval unit.</li>
-     * </ul>
-     */
-    @Test
-    public void testGetDesiredPollingInterval() {
-        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_BIG);
-        assertEquals(MAX, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
-
-        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_NORMAL);
-        // First get the half of NEW_IDLE_TIME_NORMAL, and then round it to the nearest second.
-        assertEquals(NEW_IDLE_TIME_NORMAL.dividedBy(2).getSeconds(), adaptiveLocationListenerPolicy.getDesiredPollingInterval().getSeconds());
-
-        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_SMALL);
-        assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
-
-        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_LESS_THAN_MIN);
-        assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
-    }
-
-    /**
-     * Tests the method {@link AdaptiveLocationListenerPolicy#getMinDistance_m()}.
-     */
-    @Test
-    public void testGetMinDistance() {
-        assertEquals(MIN_DISTANCE, adaptiveLocationListenerPolicy.getMinDistance_m());
-    }
-}

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

@@ -138,7 +138,7 @@ public class TrackRecordingServiceTest {
         if (service.isRecording() || service.isPaused()) {
             service.endCurrentTrack();
         }
-        service.getHandlerServer().setClock(Clock.systemUTC());
+        service.getTrackPointCreator().setClock(Clock.systemUTC());
 
         // Ensure that the database is empty after every test
         contentProviderUtils.deleteAllTracks(context);
@@ -212,15 +212,15 @@ public class TrackRecordingServiceTest {
         TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                 .getService();
 
-        TrackPointCreator handlerServer = service.getHandlerServer();
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
         Track.Id trackId = service.startNewTrack();
-        handlerServer.stopGPS();
-        handlerServer.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
 
         // when
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
         service.endCurrentTrack();
 
         // then
@@ -242,22 +242,22 @@ public class TrackRecordingServiceTest {
         TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                 .getService();
 
-        TrackPointCreator handlerServer = service.getHandlerServer();
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
         Track.Id trackId = service.startNewTrack();
-        handlerServer.stopGPS();
-        handlerServer.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
 
         // when
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
         service.pauseCurrentTrack();
 
         // then
         assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
 
         //when
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
         service.resumeTrack(trackId);
 
         // then
@@ -281,23 +281,23 @@ public class TrackRecordingServiceTest {
         TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                 .getService();
 
-        TrackPointCreator handlerServer = service.getHandlerServer();
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
         Track.Id trackId = service.startNewTrack();
-        handlerServer.stopGPS();
-        handlerServer.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
         service.endCurrentTrack();
 
         // when
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
         service.resumeTrack(trackId);
-        handlerServer.stopGPS();
-        handlerServer.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
 
-        handlerServer.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z")), Distance.of(50));
+        trackPointCreator.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z")), Distance.of(50));
 
         // then
         assertTrue(service.isRecording());
@@ -323,18 +323,18 @@ public class TrackRecordingServiceTest {
         TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                 .getService();
 
-        TrackPointCreator handlerServer = service.getHandlerServer();
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
         Track.Id trackId = service.startNewTrack();
-        handlerServer.stopGPS();
-        handlerServer.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
         service.pauseCurrentTrack();
 
         // when
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
         service.endCurrentTrack();
 
         // then
@@ -405,14 +405,14 @@ public class TrackRecordingServiceTest {
         TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                 .getService();
 
-        TrackPointCreator handlerServer = service.getHandlerServer();
-        handlerServer.stopGPS();
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.stopGPS();
 
-        handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
         Track.Id trackId = service.startNewTrack();
 
         assertTrue(service.isRecording());
-        handlerServer.onNewTrackPoint(
+        trackPointCreator.onNewTrackPoint(
                 new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z"))
                         .setLatitude(10)
                         .setLongitude(10)
@@ -467,6 +467,6 @@ public class TrackRecordingServiceTest {
                 .setSpeed(Speed.of(speed))
                 .setBearing(3.0f);
 
-        trackRecordingService.getHandlerServer().onNewTrackPoint(trackPoint, Distance.of(50));
+        trackRecordingService.getTrackPointCreator().onNewTrackPoint(trackPoint, Distance.of(50));
     }
 }

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

@@ -96,7 +96,7 @@ public class TrackRecordingServiceTestLocation {
 
         service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
                 .getService();
-        service.getHandlerServer().stopGPS();
+        service.getTrackPointCreator().stopGPS();
     }
 
     @After
@@ -107,10 +107,10 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_movingAccurate() throws Exception {
+    public void testOnLocationChangedAsync_movingAccurate() {
         // given
         Track.Id trackId = service.startNewTrack();
-        service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
 
         // when
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
@@ -180,10 +180,10 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_slowMovingAccurate() throws Exception {
+    public void testOnLocationChangedAsync_slowMovingAccurate() {
         // given
         Track.Id trackId = service.startNewTrack();
-        service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
 
         // when
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
@@ -225,10 +225,10 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_idle() throws Exception {
+    public void testOnLocationChangedAsync_idle() {
         // given
         Track.Id trackId = service.startNewTrack();
-        service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
 
         // when
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
@@ -277,11 +277,11 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_idle_withMovement() throws Exception {
+    public void testOnLocationChangedAsync_idle_withMovement() {
         // given
         Track.Id trackId = service.startNewTrack();
-        service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
-        service.getHandlerServer().stopGPS();
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().stopGPS();
 
         // when
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
@@ -337,11 +337,11 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_idle_withSensorData() throws Exception {
+    public void testOnLocationChangedAsync_idle_withSensorData() {
         // given
         Track.Id trackId = service.startNewTrack();
-        service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
-        service.getHandlerServer().setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
 
             @Override
             public boolean isEnabled() {
@@ -432,10 +432,10 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_segment() throws Exception {
+    public void testOnLocationChangedAsync_segment() {
         // given
         Track.Id trackId = service.startNewTrack();
-        service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
 
         // when
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);

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

@@ -107,34 +107,6 @@ public class TrackRecordingServiceTestLooper {
         fullRecordingSession();
     }
 
-    @MediumTest
-    @Test
-    public void testWithProperties_voiceFrequencyDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.voice_frequency_key), Integer.parseInt(context.getResources().getString(R.string.voice_frequency_default)));
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_voiceFrequencyByDistance() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.voice_frequency_key), -1);
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_voiceFrequencyByTime() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.voice_frequency_key), 1);
-        editor.commit();
-        fullRecordingSession();
-    }
-
-
     @MediumTest
     @Test
     public void testWithProperties_maxRecordingDistanceDefault() throws TimeoutException {
@@ -235,8 +207,8 @@ public class TrackRecordingServiceTestLooper {
 
         // Insert a few points, markers and statistics.
         for (int i = 0; i < 30; i++) {
-            //TODO Should send locations to LocationHandler instead of TrackPoints to HandlerServer?
-            TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, service.getHandlerServer().createNow())
+            //TODO Should send locations to LocationHandler instead of TrackPoints to TrackPointCreator?
+            TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, service.getTrackPointCreator().createNow())
                     .setLongitude(35.0f + i / 10.0f)
                     .setLatitude(45.0f - i / 5.0f)
                     .setHorizontalAccuracy(Distance.of(5))
@@ -244,7 +216,7 @@ public class TrackRecordingServiceTestLooper {
                     .setBearing(3.0f);
 
             Distance prefAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy(sharedPreferences, context);
-            service.getHandlerServer().onNewTrackPoint(trackPoint, prefAccuracy);
+            service.getTrackPointCreator().onNewTrackPoint(trackPoint, prefAccuracy);
 
             if (i % 7 == 0) {
                 service.insertMarker(null, null, null, null);

src/androidTest/java/de/dennisguse/opentracks/services/handlers/LocationHandlerTest.java

@@ -33,7 +33,7 @@ public class LocationHandlerTest {
     private final SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
 
     @Mock
-    private TrackPointCreator handlerServer;
+    private TrackPointCreator trackPointCreator;
 
     @InjectMocks
     private LocationHandler locationHandler;
@@ -49,7 +49,7 @@ public class LocationHandlerTest {
         // Let's use default values.
         sharedPreferences.edit().clear().commit();
 
-        Mockito.when(handlerServer.createNow())
+        Mockito.when(trackPointCreator.createNow())
                 .thenReturn(Instant.now());
 
         //TODO REMOVE
@@ -67,7 +67,7 @@ public class LocationHandlerTest {
         locationHandler.onLocationChanged(createLocation(45f, 35f, 3, 5, System.currentTimeMillis()));
 
         // then
-        verify(handlerServer, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
+        verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
     }
 
     /**
@@ -83,7 +83,7 @@ public class LocationHandlerTest {
         locationHandler.onLocationChanged(createLocation(latitude, 35f, 3, 5, System.currentTimeMillis()));
 
         // then
-        verify(handlerServer, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
+        verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
     }
 
     /**
@@ -99,7 +99,7 @@ public class LocationHandlerTest {
 
         // then
         // no newTrackPoint called
-        verify(handlerServer, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
+        verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
     }
 
     @Test
@@ -112,7 +112,7 @@ public class LocationHandlerTest {
         locationHandler.onLocationChanged(createLocation(99.0, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis()));
 
         // then
-        verify(handlerServer, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
+        verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
     }
 
     /**

src/androidTest/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManagerTest.java

@@ -15,6 +15,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -25,7 +26,7 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(AndroidJUnit4.class)
-public class PeriodicTaskExecutorTest {
+public class VoiceAnnouncementManagerTest {
 
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
@@ -53,17 +54,38 @@ public class PeriodicTaskExecutorTest {
         TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
                 .getService();
 
-        PeriodicTaskExecutor periodicTaskExecutor = new PeriodicTaskExecutor(service, new AnnouncementPeriodicTask.Factory());
-        periodicTaskExecutor.setMetricUnits(true);
-        periodicTaskExecutor.setTaskFrequency(-5);
+        VoiceAnnouncementManager voiceAnnouncementManager = new VoiceAnnouncementManager(service);
+        voiceAnnouncementManager.setFrequency(Distance.ofKilometer(5));
 
         // when
         TrackStatistics statistics = new TrackStatistics();
-        statistics.setTotalDistance(Distance.of(13000));
-        assertEquals(Distance.of(15000), periodicTaskExecutor.calculateNextTaskDistance(statistics));
+        statistics.setTotalDistance(Distance.ofKilometer(13));
+        voiceAnnouncementManager.restore(statistics);
+        assertEquals(Distance.of(15000), voiceAnnouncementManager.getNextTotalDistance());
 
         statistics.setTotalDistance(Distance.of(15100));
-        assertEquals(Distance.of(20000), periodicTaskExecutor.calculateNextTaskDistance(statistics));
+        voiceAnnouncementManager.restore(statistics);
+        assertEquals(Distance.of(20000), voiceAnnouncementManager.getNextTotalDistance());
+    }
+
+    @Test
+    public void calculateNextTotalTime() throws TimeoutException {
+        // given
+        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
+                .getService();
+
+        VoiceAnnouncementManager voiceAnnouncementManager = new VoiceAnnouncementManager(service);
+        voiceAnnouncementManager.setFrequency(Duration.ofSeconds(5));
+
+        // when
+        TrackStatistics statistics = new TrackStatistics();
+        statistics.setTotalTime(Duration.ofSeconds(91));
+        voiceAnnouncementManager.restore(statistics);
+        assertEquals(Duration.ofSeconds(95), voiceAnnouncementManager.getNextTotalTime());
+
+        statistics.setTotalTime(Duration.ofSeconds(95));
+        voiceAnnouncementManager.restore(statistics);
+        assertEquals(Duration.ofSeconds(100), voiceAnnouncementManager.getNextTotalTime());
     }
 
 }

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

@@ -10,9 +10,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class PreferencesUtilsTest {
@@ -64,4 +69,131 @@ public class PreferencesUtilsTest {
         // then
         assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat);
     }
-}
+
+    @Test
+    public void testGetCustomLayout_default() {
+        // given
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.clear();
+        editor.commit();
+
+        // when
+        Layout layout = PreferencesUtils.getCustomLayout(sharedPreferences, context);
+
+        // then
+        assertTrue(layout.getFields().size() > 0);
+        assertEquals(layout.getProfile(), context.getString(R.string.default_activity_default));
+        assertTrue(layout.getFields().stream().anyMatch(DataField::isVisible));
+    }
+
+    @Test
+    public void testGetCustomLayout_1() {
+        // given
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putString(
+                context.getString(R.string.stats_custom_layout_fields_key),
+                "run;"
+                        + context.getString(R.string.stats_custom_layout_moving_time_key) + ",1,1;"
+                        + context.getString(R.string.stats_custom_layout_distance_key) + ",1,0;"
+                        + context.getString(R.string.stats_custom_layout_average_moving_speed_key) + ",0,1;"
+                        + context.getString(R.string.stats_custom_layout_speed_key) + ",0,0;");
+        editor.apply();
+
+        // when
+        Layout layout = PreferencesUtils.getCustomLayout(sharedPreferences, context);
+
+        // then
+        assertEquals(layout.getFields().size(), 4);
+        assertEquals(layout.getProfile(), "run");
+
+        assertEquals(layout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
+        assertTrue(layout.getFields().get(0).isVisible());
+        assertTrue(layout.getFields().get(0).isPrimary());
+
+        assertEquals(layout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
+        assertTrue(layout.getFields().get(1).isVisible());
+        assertFalse(layout.getFields().get(1).isPrimary());
+
+        assertEquals(layout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_average_moving_speed_key));
+        assertFalse(layout.getFields().get(2).isVisible());
+        assertTrue(layout.getFields().get(2).isPrimary());
+
+        assertEquals(layout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
+        assertFalse(layout.getFields().get(3).isVisible());
+        assertFalse(layout.getFields().get(3).isPrimary());
+    }
+
+    @Test
+    public void testGetCustomLayout_coordinatesIsWide() {
+        // given
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putString(
+                context.getString(R.string.stats_custom_layout_fields_key),
+                "walking;"
+                        + context.getString(R.string.stats_custom_layout_moving_time_key) + ",1,1;"
+                        + context.getString(R.string.stats_custom_layout_distance_key) + ",1,0;"
+                        + context.getString(R.string.stats_custom_layout_coordinates_key) + ",0,1;"
+                        + context.getString(R.string.stats_custom_layout_speed_key) + ",0,0;");
+        editor.apply();
+
+        // when
+        Layout layout = PreferencesUtils.getCustomLayout(sharedPreferences, context);
+
+        // then
+        assertEquals(layout.getFields().size(), 4);
+        assertEquals(layout.getProfile(), "walking");
+
+        assertEquals(layout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
+        assertTrue(layout.getFields().get(0).isVisible());
+        assertTrue(layout.getFields().get(0).isPrimary());
+
+        assertEquals(layout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
+        assertTrue(layout.getFields().get(1).isVisible());
+        assertFalse(layout.getFields().get(1).isPrimary());
+
+        assertEquals(layout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_coordinates_key));
+        assertFalse(layout.getFields().get(2).isVisible());
+        assertTrue(layout.getFields().get(2).isPrimary());
+        assertTrue(layout.getFields().get(2).isWide());
+
+        assertEquals(layout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
+        assertFalse(layout.getFields().get(3).isVisible());
+        assertFalse(layout.getFields().get(3).isPrimary());
+    }
+
+    @Test
+    public void testSetCustomLayout() {
+        // given
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
+        Layout layoutSrc = new Layout("road cycling");
+        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_moving_time_key), context.getString(R.string.stats_moving_time), true, true, false));
+        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_distance_key), context.getString(R.string.stats_distance), true, false, false));
+        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_average_moving_speed_key), context.getString(R.string.stats_average_moving_speed), false, true, false));
+        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_speed_key), context.getString(R.string.stats_speed), false, false, false));
+
+        // when
+        PreferencesUtils.setCustomLayout(sharedPreferences, context, layoutSrc);
+
+        // then
+        String csv = sharedPreferences.getString(context.getString(R.string.stats_custom_layout_fields_key), null);
+        assertNotNull(csv);
+        assertEquals(csv,
+                "road cycling;"
+                + context.getString(R.string.stats_custom_layout_moving_time_key) + ",1,1;"
+                + context.getString(R.string.stats_custom_layout_distance_key) + ",1,0;"
+                + context.getString(R.string.stats_custom_layout_average_moving_speed_key) + ",0,1;"
+                + context.getString(R.string.stats_custom_layout_speed_key) + ",0,0;");
+
+        Layout layoutDst = PreferencesUtils.getCustomLayout(sharedPreferences, context);
+        assertEquals(layoutSrc.getProfile(), layoutDst.getProfile());
+        assertEquals(layoutSrc.getFields().size(), layoutDst.getFields().size());
+        for (int i = 0; i < layoutSrc.getFields().size(); i++) {
+            assertEquals(layoutSrc.getFields().get(i).getKey(), layoutDst.getFields().get(i).getKey());
+            assertEquals(layoutSrc.getFields().get(i).isVisible(), layoutDst.getFields().get(i).isVisible());
+            assertEquals(layoutSrc.getFields().get(i).isPrimary(), layoutDst.getFields().get(i).isPrimary());
+        }
+    }
+}

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

@@ -0,0 +1,68 @@
+package de.dennisguse.opentracks.util;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import junit.framework.TestCase;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.content.data.Layout;
+
+@RunWith(AndroidJUnit4.class)
+public class StatisticsUtilsTest extends TestCase {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void testEmptyValue() {
+        assertEquals(context.getString(R.string.stats_empty_value_float), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_distance_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_time), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_total_time_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_float), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_speed_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_time), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_moving_time_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_float), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_average_speed_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_float), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_max_speed_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_float), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_average_moving_speed_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_integer), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_altitude_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_integer), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_gain_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_integer), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_loss_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_time), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_pace_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_time), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_average_moving_pace_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_time), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_average_pace_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_time), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_fastest_pace_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_coordinates), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_coordinates_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_integer), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_heart_rate_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_integer), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_cadence_key)));
+        assertEquals(context.getString(R.string.stats_empty_value_integer), StatisticsUtils.emptyValue(context, context.getString(R.string.stats_custom_layout_power_key)));
+    }
+
+    @Test
+    public void testFilterVisible() {
+        // given
+        Layout layout = new Layout("profile");
+        layout.addField(new DataField("key1", "title1", true, true, false));
+        layout.addField(new DataField("key2", "title2", false, true, false));
+        layout.addField(new DataField("key3", "title3", true, true, false));
+        layout.addField(new DataField("key4", "title4", false, true, false));
+        layout.addField(new DataField("key5", "title5", true, true, false));
+
+        // when
+        Layout resultTrue = StatisticsUtils.filterVisible(layout, true);
+        Layout resultFalse = StatisticsUtils.filterVisible(layout, false);
+
+        // then
+        assertEquals(resultTrue.getFields().size(), 3);
+        assertTrue(resultTrue.getFields().stream().anyMatch(f -> f.getKey().equals("key1")));
+        assertTrue(resultTrue.getFields().stream().anyMatch(f -> f.getKey().equals("key3")));
+        assertTrue(resultTrue.getFields().stream().anyMatch(f -> f.getKey().equals("key5")));
+
+        assertEquals(resultFalse.getFields().size(), 2);
+        assertTrue(resultFalse.getFields().stream().anyMatch(f -> f.getKey().equals("key2")));
+        assertTrue(resultFalse.getFields().stream().anyMatch(f -> f.getKey().equals("key4")));
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilderTest.java

@@ -0,0 +1,195 @@
+package de.dennisguse.opentracks.viewmodels;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import junit.framework.TestCase;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.time.Duration;
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.stats.SensorStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class StatisticDataBuilderTest extends TestCase {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    @Mock
+    private Track trackMock;
+
+    @Mock
+    private TrackStatistics trackStatisticsMock;
+
+    @Mock
+    private TrackRecordingService.RecordingData recordingDataMock;
+
+    @Mock
+    private SensorStatistics sensorStatisticsMock;
+
+    @Test
+    public void testFromRecordingData() {
+        when(trackMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
+        when(trackStatisticsMock.getTotalTime()).thenReturn(Duration.ofMillis(0));
+        when(trackStatisticsMock.getMovingTime()).thenReturn(Duration.ofMillis(0));
+        when(trackStatisticsMock.getTotalDistance()).thenReturn(Distance.of(0));
+        when(recordingDataMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
+
+        // given
+        Layout layout = new Layout(context.getString(R.string.default_activity_default));
+        layout.addField(context.getString(R.string.stats_custom_layout_total_time_key), context.getString(R.string.stats_total_time), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_moving_time_key), context.getString(R.string.stats_moving_time), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_distance_key), context.getString(R.string.stats_distance), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_speed_key), context.getString(R.string.stats_speed), false, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_max_speed_key), context.getString(R.string.stats_max_speed), false, true, false);
+
+        // when
+        List<StatisticData> statisticDataList = StatisticDataBuilder.fromRecordingData(context, recordingDataMock, layout, true);
+
+        // then
+        assertEquals(statisticDataList.size(), 3);
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_total_time))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_moving_time))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_distance))));
+    }
+
+    @Test
+    public void testFromRecordingData_allFields() {
+        when(trackMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
+        when(trackStatisticsMock.getTotalTime()).thenReturn(Duration.ofMillis(0));
+        when(trackStatisticsMock.getMovingTime()).thenReturn(Duration.ofMillis(0));
+        when(trackStatisticsMock.getTotalDistance()).thenReturn(Distance.of(0));
+        when(recordingDataMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
+
+        // given
+        Layout layout = new Layout(context.getString(R.string.default_activity_default));
+        layout.addField(context.getString(R.string.stats_custom_layout_total_time_key), context.getString(R.string.stats_total_time), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_moving_time_key), context.getString(R.string.stats_moving_time), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_distance_key), context.getString(R.string.stats_distance), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_speed_key), context.getString(R.string.stats_speed), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_average_moving_speed_key), context.getString(R.string.stats_average_moving_speed), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_average_speed_key), context.getString(R.string.stats_average_speed), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_max_speed_key), context.getString(R.string.stats_max_speed), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_pace_key), context.getString(R.string.stats_pace), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_average_moving_pace_key), context.getString(R.string.stats_average_moving_pace), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_average_pace_key), context.getString(R.string.stats_average_pace), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_fastest_pace_key), context.getString(R.string.stats_fastest_pace), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_altitude_key), context.getString(R.string.stats_altitude), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_gain_key), context.getString(R.string.stats_gain), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_loss_key), context.getString(R.string.stats_loss), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_coordinates_key), context.getString(R.string.stats_coordinates), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_heart_rate_key), context.getString(R.string.stats_sensors_heart_rate), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_cadence_key), context.getString(R.string.stats_sensors_cadence), true, true, false);
+        layout.addField(context.getString(R.string.stats_custom_layout_power_key), context.getString(R.string.stats_sensors_power), true, true, false);
+
+        // when
+        List<StatisticData> statisticDataList = StatisticDataBuilder.fromRecordingData(context, recordingDataMock, layout, true);
+
+        // then
+        assertEquals(statisticDataList.size(), 18);
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_total_time))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_moving_time))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_distance))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_speed))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_moving_speed))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_speed))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_max_speed))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_pace))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_moving_pace))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_pace))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_fastest_pace))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_altitude))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_gain))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_loss))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_coordinates))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_heart_rate))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_cadence))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_power))));
+    }
+
+    @Test
+    public void testFromSensorStatistics_onlyHeartRate() {
+        when(sensorStatisticsMock.hasHeartRate()).thenReturn(true);
+        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(200f);
+        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(150f);
+        when(sensorStatisticsMock.hasCadence()).thenReturn(false);
+        when(sensorStatisticsMock.hasPower()).thenReturn(false);
+
+        // when
+        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
+
+        // then
+        assertEquals(statisticDataList.size(), 2);
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_max))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_avg))));
+    }
+
+    @Test
+    public void testFromSensorStatistics_onlyCadence() {
+        when(sensorStatisticsMock.hasHeartRate()).thenReturn(false);
+        when(sensorStatisticsMock.hasCadence()).thenReturn(true);
+        when(sensorStatisticsMock.getAvgCadence()).thenReturn(90f);
+        when(sensorStatisticsMock.getMaxCadence()).thenReturn(110f);
+        when(sensorStatisticsMock.hasPower()).thenReturn(false);
+
+        // when
+        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
+
+        // then
+        assertEquals(statisticDataList.size(), 2);
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_max))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_avg))));
+    }
+
+    @Test
+    public void testFromSensorStatistics_onlyPower() {
+        when(sensorStatisticsMock.hasHeartRate()).thenReturn(false);
+        when(sensorStatisticsMock.hasCadence()).thenReturn(false);
+        when(sensorStatisticsMock.hasPower()).thenReturn(true);
+        when(sensorStatisticsMock.getAvgPower()).thenReturn(300f);
+
+        // when
+        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_power_avg))));
+
+        // then
+        assertEquals(statisticDataList.size(), 1);
+    }
+
+    @Test
+    public void testFromSensorStatistics() {
+        when(sensorStatisticsMock.hasHeartRate()).thenReturn(true);
+        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(200f);
+        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(150f);
+        when(sensorStatisticsMock.hasCadence()).thenReturn(true);
+        when(sensorStatisticsMock.getAvgCadence()).thenReturn(90f);
+        when(sensorStatisticsMock.getMaxCadence()).thenReturn(110f);
+        when(sensorStatisticsMock.hasPower()).thenReturn(true);
+        when(sensorStatisticsMock.getAvgPower()).thenReturn(300f);
+
+        // when
+        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
+
+        // then
+        assertEquals(statisticDataList.size(), 5);
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_max))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_avg))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_max))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_avg))));
+        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_power_avg))));
+    }
+}

src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="de.dennisguse.opentracks"
     android:installLocation="auto">
 
@@ -52,7 +53,10 @@ limitations under the License.
     <uses-permission
         android:name="android.permission.BLUETOOTH_ADMIN"
         android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation"
+        tools:targetApi="s" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <application
@@ -316,6 +320,7 @@ limitations under the License.
         <activity android:name=".io.file.exporter.ExportActivity" />
 
         <activity android:name=".settings.SettingsActivity" />
+        <activity android:name=".settings.SettingsCustomLayoutActivity" />
 
         <activity
             android:name=".ShowOnMapProxyActivity$KML"

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

@@ -22,8 +22,7 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-
-import de.dennisguse.opentracks.util.TTSUtils;
+import de.dennisguse.opentracks.services.tasks.VoiceAnnouncement;
 
 /**
  * @author Jimmy Shih
@@ -35,7 +34,7 @@ public abstract class AbstractActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         // Set volume control stream for text to speech
-        setVolumeControlStream(TTSUtils.getTTSStream());
+        setVolumeControlStream(VoiceAnnouncement.AUDIO_STREAM);
 
         setContentView(getRootView());
 

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

@@ -77,7 +77,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
 
     private static final String TAG = TrackListActivity.class.getSimpleName();
 
-    // The following are set in onCreate
+    // The following are setFrequency in onCreate
     private SharedPreferences sharedPreferences;
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
     private ResourceCursorAdapter resourceCursorAdapter;

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

@@ -66,7 +66,7 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
 
     private static final String CURRENT_TAB_TAG_KEY = "current_tab_tag_key";
 
-    // The following are set in onCreate.
+    // The following are setFrequency in onCreate.
     private ContentProviderUtils contentProviderUtils;
     private SharedPreferences sharedPreferences;
     private TrackDataHub trackDataHub;

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

@@ -51,7 +51,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
 
     private static final String CURRENT_TAB_TAG_KEY = "current_tab_tag_key";
 
-    // The following are set in onCreate
+    // The following are setFrequency in onCreate
     private ContentProviderUtils contentProviderUtils;
     private SharedPreferences sharedPreferences;
     private TrackRecordingServiceConnection trackRecordingServiceConnection;

src/main/java/de/dennisguse/opentracks/adapters/CustomLayoutFieldType.java

@@ -0,0 +1,16 @@
+package de.dennisguse.opentracks.adapters;
+
+enum CustomLayoutFieldType {
+    SHORT(0),
+    WIDE(1);
+
+    private final int value;
+
+    CustomLayoutFieldType(int value) {
+        this.value = value;
+    }
+
+    public int value() {
+        return this.value;
+    }
+}

src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java

@@ -59,8 +59,8 @@ public class IntervalStatisticsAdapter extends RecyclerView.Adapter<RecyclerView
 
         viewHolder.rate.setText(StringUtils.formatSpeed(context, interval.getSpeed(), metricUnits, isReportSpeed));
 
-        viewHolder.gain.setText(StringUtils.formatAltitude(context, interval.getGain_m(), metricUnits));
-        viewHolder.loss.setText(StringUtils.formatAltitude(context, interval.getLoss_m(), metricUnits));
+        viewHolder.gain.setText(StringUtils.formatAltitudeChange(context, interval.getGain_m(), metricUnits));
+        viewHolder.loss.setText(StringUtils.formatAltitudeChange(context, interval.getLoss_m(), metricUnits));
 
     }
 

src/main/java/de/dennisguse/opentracks/adapters/SensorsAdapter.java

@@ -1,91 +0,0 @@
-package de.dennisguse.opentracks.adapters;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.viewmodels.SensorDataModel;
-
-public class SensorsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    private List<SensorDataModel> sensorDataList;
-    private final Context context;
-
-    public SensorsAdapter(Context context) {
-        this.context = context;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sensor_item, parent, false);
-        return new SensorsAdapter.ViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        SensorsAdapter.ViewHolder viewHolder = (SensorsAdapter.ViewHolder) holder;
-        SensorDataModel sensorDataModel = sensorDataList.get(position);
-        viewHolder.setData(sensorDataModel);
-    }
-
-    @Override
-    public int getItemCount() {
-        if (sensorDataList == null) {
-            return 0;
-        } else {
-            return sensorDataList.size();
-        }
-    }
-
-    public List<SensorDataModel> swapData(List<SensorDataModel> data) {
-        if (sensorDataList == data) {
-            return null;
-        }
-
-        sensorDataList = data;
-
-        if (data != null) {
-            this.notifyDataSetChanged();
-        }
-
-        return data;
-    }
-
-    private class ViewHolder extends RecyclerView.ViewHolder {
-        private final TextView label;
-        private final TextView sensorValue;
-        private final TextView value;
-        private final TextView unit;
-
-        public ViewHolder(@NonNull View itemView) {
-            super(itemView);
-            label = itemView.findViewById(R.id.stats_sensor_label);
-            sensorValue = itemView.findViewById(R.id.stats_sensor_sensor_value);
-            value = itemView.findViewById(R.id.stats_sensor_value);
-            unit = itemView.findViewById(R.id.stats_sensor_unit);
-        }
-
-        public void setData(SensorDataModel sensorDataModel) {
-            String sensorName = sensorDataModel.getSensorName();
-            String sensorValue = sensorDataModel.hasValue() ? sensorDataModel.getSensorValue() : context.getString(R.string.value_unknown);
-
-            this.label.setText(context.getString(sensorDataModel.getLabelId()));
-            if (sensorName == null) {
-                this.sensorValue.setVisibility(View.GONE);
-            } else {
-                this.sensorValue.setText(sensorName);
-            }
-            this.value.setText(sensorValue);
-            this.unit.setText(context.getString(sensorDataModel.getUnitId()));
-        }
-    }
-}

src/main/java/de/dennisguse/opentracks/adapters/SettingsCustomLayoutAdapter.java

@@ -0,0 +1,118 @@
+package de.dennisguse.opentracks.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.Optional;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.util.StatisticsUtils;
+
+public class SettingsCustomLayoutAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private Layout layout;
+    private final Context context;
+    private final SettingsCustomLayoutItemClickListener itemClickListener;
+
+    public SettingsCustomLayoutAdapter(Context context, SettingsCustomLayoutItemClickListener itemClickListener, Layout layout) {
+        this.context = context;
+        this.itemClickListener = itemClickListener;
+        this.layout = layout;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(context).inflate(R.layout.custom_stats_item, parent, false);
+        return new SettingsCustomLayoutAdapter.ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        SettingsCustomLayoutAdapter.ViewHolder viewHolder = (SettingsCustomLayoutAdapter.ViewHolder) holder;
+        DataField field = layout.getFields().get(position);
+        viewHolder.itemView.setTag(field.getKey());
+        viewHolder.title.setText(field.getTitle());
+        viewHolder.value.setText(StatisticsUtils.emptyValue(context, field.getKey()));
+
+        viewHolder.title.setTextAppearance(context, field.isVisible() ? (field.isPrimary() ? R.style.StatsPrimaryLabel : R.style.StatsSecondaryLabel) : R.style.StatsLabelHidden);
+        viewHolder.value.setTextAppearance(context, field.isVisible() ? (field.isPrimary() ? R.style.StatsPrimaryValue : R.style.StatsSecondaryValue) : R.style.StatsValueHidden);
+        viewHolder.statusIcon.setVisibility(field.isVisible() ? View.GONE : View.VISIBLE);
+        viewHolder.statusIcon.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_baseline_visibility_off_24));
+        viewHolder.moveIcon.setVisibility(field.isVisible() ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public int getItemCount() {
+        if (layout == null) {
+            return 0;
+        } else {
+            return layout.getFields().size();
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return layout.getFields().get(position).isWide() ? CustomLayoutFieldType.WIDE.value() : CustomLayoutFieldType.SHORT.value();
+    }
+
+    public boolean isItemWide(int position) {
+        return getItemViewType(position) == CustomLayoutFieldType.WIDE.value();
+    }
+
+    public DataField getItem(int position) {
+        return layout.getFields().get(position);
+    }
+
+    public void swapValues(Layout data) {
+        this.layout = data;
+        if (this.layout != null) {
+            this.notifyDataSetChanged();
+        }
+    }
+
+    public Layout move(int fromPosition, int toPosition) {
+        layout.moveField(fromPosition, toPosition);
+        notifyItemMoved(fromPosition, toPosition);
+        return layout;
+    }
+
+    private class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        final TextView title;
+        final TextView value;
+        final TextView unit;
+        final ImageView statusIcon;
+        final ImageView moveIcon;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            title = itemView.findViewById(R.id.stats_description_main);
+            value = itemView.findViewById(R.id.stats_value);
+            unit = itemView.findViewById(R.id.stats_unit);
+            statusIcon = itemView.findViewById(R.id.stats_icon_show_status);
+            moveIcon = itemView.findViewById(R.id.stats_iv_drag_indicator);
+            itemView.setOnClickListener(this);
+        }
+
+        @Override
+        public void onClick(View view) {
+            String statTitle = (String) view.getTag();
+            Optional<DataField> optionalField = layout.getFields().stream().filter(f -> f.getKey().equals(statTitle)).findFirst();
+            optionalField.ifPresent(itemClickListener::onSettingsCustomLayoutItemClicked);
+        }
+    }
+
+    public interface SettingsCustomLayoutItemClickListener {
+        void onSettingsCustomLayoutItemClicked(@NonNull DataField field);
+    }
+}

src/main/java/de/dennisguse/opentracks/adapters/StatisticsAdapter.java

@@ -0,0 +1,140 @@
+package de.dennisguse.opentracks.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.viewmodels.StatisticData;
+
+public class StatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private List<StatisticData> statisticDataList;
+    private final Context context;
+
+    public StatisticsAdapter(Context context) {
+        this.context = context;
+        this.statisticDataList = new ArrayList<>();
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.stats_item, parent, false);
+        return new StatisticsAdapter.ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        StatisticsAdapter.ViewHolder viewHolder = (StatisticsAdapter.ViewHolder) holder;
+        StatisticData statisticData = statisticDataList.get(position);
+        viewHolder.setData(statisticData);
+    }
+
+    @Override
+    public int getItemCount() {
+        if (statisticDataList == null) {
+            return 0;
+        } else {
+            return statisticDataList.size();
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return statisticDataList.get(position).getField().isWide() ? CustomLayoutFieldType.WIDE.value() : CustomLayoutFieldType.SHORT.value();
+    }
+
+    public boolean isItemWide(int position) {
+        return getItemViewType(position) == CustomLayoutFieldType.WIDE.value();
+    }
+
+    public List<StatisticData> swapData(List<StatisticData> data) {
+        if (statisticDataList == data) {
+            return null;
+        }
+
+        statisticDataList = data;
+
+        if (data != null) {
+            this.notifyDataSetChanged();
+        }
+
+        return data;
+    }
+
+    public static class WithRecordedLayout extends StatisticsAdapter {
+        public WithRecordedLayout(Context context) {
+            super(context);
+        }
+
+        @NonNull
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.stats_recorded_item, parent, false);
+            return new StatisticsAdapter.ViewRecordedHolder(view);
+        }
+    }
+
+    private class ViewHolder extends RecyclerView.ViewHolder {
+        final TextView value;
+        final TextView unit;
+        final TextView descMain;
+        final TextView descSecondary;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            value = itemView.findViewById(R.id.stats_value);
+            unit = itemView.findViewById(R.id.stats_unit);
+            descMain = itemView.findViewById(R.id.stats_description_main);
+            descSecondary = itemView.findViewById(R.id.stats_description_secondary);
+        }
+
+        public void setData(StatisticData statisticData) {
+            if (statisticData == null) {
+                return;
+            }
+            this.value.setText(statisticData.hasValue() ? statisticData.getValue() : context.getString(R.string.value_unknown));
+            this.value.setTextAppearance(context, statisticData.getField().isPrimary() ? R.style.StatsPrimaryValue : R.style.StatsSecondaryValue);
+            this.unit.setText(statisticData.getUnit());
+            this.descMain.setText(statisticData.getField().getTitle());
+            this.descMain.setTextAppearance(context, statisticData.getField().isPrimary() ? R.style.StatsPrimaryLabel : R.style.StatsSecondaryLabel);
+            if (statisticData.hasDescription()) {
+                this.descSecondary.setVisibility(View.VISIBLE);
+                this.descSecondary.setText(statisticData.getDescription());
+            } else {
+                this.descSecondary.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    private class ViewRecordedHolder extends ViewHolder {
+
+        public ViewRecordedHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+
+        public void setData(StatisticData statisticData) {
+            if (statisticData == null) {
+                return;
+            }
+            this.value.setText(statisticData.hasValue() ? statisticData.getValue() : context.getString(R.string.value_unknown));
+            this.unit.setText(statisticData.getUnit());
+            this.descMain.setText(statisticData.getField().getTitle());
+            if (statisticData.hasDescription()) {
+                this.descSecondary.setVisibility(View.VISIBLE);
+                this.descSecondary.setText(statisticData.getDescription());
+            } else {
+                this.descSecondary.setVisibility(View.GONE);
+            }
+        }
+    }
+}

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

@@ -77,6 +77,7 @@ public class ChartPoint {
         return power;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "ChartPoint{" + "timeOrDistance=" + timeOrDistance + '}';

src/main/java/de/dennisguse/opentracks/content/data/DataField.java

@@ -0,0 +1,101 @@
+package de.dennisguse.opentracks.content.data;
+
+import android.content.Context;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.util.CsvConstants;
+
+public class DataField {
+    public static final String YES_VALUE = "1";
+    public static final String NOT_VALUE = "0";
+
+    private final String key;
+    private final String title;
+    private boolean isVisible;
+    private boolean isPrimary;
+    private final boolean isWide;
+
+    public DataField(String key, String title, boolean isVisible, boolean isPrimary, boolean isWide) {
+        this.key = key;
+        this.title = title;
+        this.isVisible = isVisible;
+        this.isPrimary = isPrimary;
+        this.isWide = isWide;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public boolean isVisible() {
+        return isVisible;
+    }
+
+    public void toggleVisibility() {
+        isVisible = !isVisible;
+    }
+
+    public boolean isPrimary() {
+        return isPrimary;
+    }
+
+    public void togglePrimary() {
+        isPrimary = !isPrimary;
+    }
+
+    public boolean isWide() {
+        return isWide;
+    }
+
+    public String toCsv() {
+        String visible = this.isVisible ? YES_VALUE : NOT_VALUE;
+        String primary = this.isPrimary ? YES_VALUE : NOT_VALUE;
+        return key + CsvConstants.ITEM_SEPARATOR + visible + CsvConstants.ITEM_SEPARATOR + primary;
+    }
+
+    public static String getTitleByKey(Context context, String key) {
+        if (key.equals(context.getString(R.string.stats_custom_layout_total_time_key))) {
+            return context.getString(R.string.stats_total_time);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_moving_time_key))) {
+            return context.getString(R.string.stats_moving_time);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_distance_key))) {
+            return context.getString(R.string.stats_distance);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_speed_key))) {
+            return context.getString(R.string.stats_speed);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_pace_key))) {
+            return context.getString(R.string.stats_pace);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_average_moving_speed_key))) {
+            return context.getString(R.string.stats_average_moving_speed);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_average_speed_key))) {
+            return context.getString(R.string.stats_average_speed);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_max_speed_key))) {
+            return context.getString(R.string.stats_max_speed);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_average_moving_pace_key))) {
+            return context.getString(R.string.stats_average_moving_pace);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_average_pace_key))) {
+            return context.getString(R.string.stats_average_pace);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_fastest_pace_key))) {
+            return context.getString(R.string.stats_fastest_pace);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_altitude_key))) {
+            return context.getString(R.string.stats_altitude);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_gain_key))) {
+            return context.getString(R.string.stats_gain);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_loss_key))) {
+            return context.getString(R.string.stats_loss);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_coordinates_key))) {
+            return context.getString(R.string.stats_coordinates);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_heart_rate_key))) {
+            return context.getString(R.string.stats_sensors_heart_rate);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_cadence_key))) {
+            return context.getString(R.string.stats_sensors_cadence);
+        } else if (key.equals(context.getString(R.string.stats_custom_layout_power_key))) {
+            return context.getString(R.string.stats_sensors_power);
+        } else {
+            throw new RuntimeException("It doesn't exists a field with key: " + key);
+        }
+    }
+}

src/main/java/de/dennisguse/opentracks/content/data/Distance.java

@@ -123,6 +123,7 @@ public class Distance {
         return Objects.hash(distance_m);
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "Distance{" +

src/main/java/de/dennisguse/opentracks/content/data/Layout.java

@@ -0,0 +1,42 @@
+package de.dennisguse.opentracks.content.data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Layout {
+    private final String profile;
+    private final List<DataField> dataFields = new ArrayList<>();
+
+    public Layout(String profile) {
+        this.profile = profile;
+    }
+
+    public void addField(String key, String title, boolean visible, boolean primary, boolean isWide) {
+        dataFields.add(new DataField(key, title, visible, primary, isWide));
+    }
+
+    public void addField(DataField dataField) {
+        dataFields.add(dataField);
+    }
+
+    public void addFields(List<DataField> dataFields) {
+        this.dataFields.addAll(dataFields);
+    }
+
+    public void removeField(DataField dataField) {
+        dataFields.remove(dataField);
+    }
+
+    public List<DataField> getFields() {
+        return new ArrayList<>(dataFields);
+    }
+
+    public void moveField(int from, int to) {
+        DataField dataFieldToMove = dataFields.remove(from);
+        dataFields.add(to, dataFieldToMove);
+    }
+
+    public String getProfile() {
+        return profile;
+    }
+}

src/main/java/de/dennisguse/opentracks/content/data/Speed.java

@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.content.data;
 
+import androidx.annotation.NonNull;
+
 import java.time.Duration;
 import java.util.Objects;
 
@@ -132,6 +134,7 @@ public class Speed {
         return Objects.hash(speed_mps);
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "Speed{" +

src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java

@@ -310,11 +310,11 @@ public class TrackPoint {
     }
 
     @Nullable
-    public Distance distanceToPrevious(@NonNull TrackPoint previous) {
+    public Distance distanceToPrevious(TrackPoint previous) {
         if (hasSensorDistance()) {
             return getSensorDistance();
         }
-        if (!(hasLocation() && previous.hasLocation())) {
+        if (previous == null || !(hasLocation() && previous.hasLocation())) {
             return null;
         }
 

src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java

@@ -290,6 +290,31 @@ public class ContentProviderUtils {
         return values;
     }
 
+    public void updateTrackStatistics(@NonNull Track.Id trackId, @NonNull TrackStatistics trackStatistics) {
+        contentResolver.update(TracksColumns.CONTENT_URI, createContentValues(trackStatistics), TracksColumns._ID + "=?", new String[]{Long.toString(trackId.getId())});
+    }
+
+    private ContentValues createContentValues(TrackStatistics trackStatistics) {
+        ContentValues values = new ContentValues();
+        if (trackStatistics.getStartTime() != null) {
+            values.put(TracksColumns.STARTTIME, trackStatistics.getStartTime().toEpochMilli());
+        }
+        if (trackStatistics.getStopTime() != null) {
+            values.put(TracksColumns.STOPTIME, trackStatistics.getStopTime().toEpochMilli());
+        }
+        values.put(TracksColumns.TOTALDISTANCE, trackStatistics.getTotalDistance().toM());
+        values.put(TracksColumns.TOTALTIME, trackStatistics.getTotalTime().toMillis());
+        values.put(TracksColumns.MOVINGTIME, trackStatistics.getMovingTime().toMillis());
+        values.put(TracksColumns.AVGSPEED, trackStatistics.getAverageSpeed().toMPS());
+        values.put(TracksColumns.AVGMOVINGSPEED, trackStatistics.getAverageMovingSpeed().toMPS());
+        values.put(TracksColumns.MAXSPEED, trackStatistics.getMaxSpeed().toMPS());
+        values.put(TracksColumns.MIN_ALTITUDE, trackStatistics.getMinAltitude());
+        values.put(TracksColumns.MAX_ALTITUDE, trackStatistics.getMaxAltitude());
+        values.put(TracksColumns.ALTITUDE_GAIN, trackStatistics.getTotalAltitudeGain());
+        values.put(TracksColumns.ALTITUDE_LOSS, trackStatistics.getTotalAltitudeLoss());
+        return values;
+    }
+
     public Marker createMarker(Cursor cursor) {
         int idIndex = cursor.getColumnIndexOrThrow(MarkerColumns._ID);
         int nameIndex = cursor.getColumnIndexOrThrow(MarkerColumns.NAME);

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

@@ -50,8 +50,14 @@ public abstract class SensorData<T> {
         return value != null;
     }
 
+    @NonNull
+    protected abstract T getNoneValue();
+
     public T getValue() {
-        return value;
+        if (isRecent()) {
+            return value;
+        }
+        return getNoneValue();
     }
 
     /**
@@ -63,7 +69,7 @@ public abstract class SensorData<T> {
     /**
      * Is the data recent considering the current time.
      */
-    public boolean isRecent() {
+    private boolean isRecent() {
         return Instant.now()
                 .isBefore(time.plus(BluetoothRemoteSensorManager.MAX_SENSOR_DATE_SET_AGE_MS));
     }

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

@@ -59,17 +59,30 @@ public final class SensorDataCycling {
             return crankRevolutionsTime;
         }
 
+        @NonNull
+        @Override
+        protected Float getNoneValue() {
+            return 0f;
+        }
+
         public void compute(Cadence previous) {
             if (hasData() && previous != null && previous.hasData()) {
                 float timeDiff_ms = UintUtils.diff(crankRevolutionsTime, previous.crankRevolutionsTime, UintUtils.UINT16_MAX) / 1024f * UnitConversions.S_TO_MS;
                 if (timeDiff_ms <= 0) {
                     Log.e(TAG, "Timestamps difference is invalid: cannot compute cadence.");
                     value = null;
-                } else {
-                    long crankDiff = UintUtils.diff(crankRevolutionsCount, previous.crankRevolutionsCount, UintUtils.UINT32_MAX);
-                    float cadence_ms = crankDiff / timeDiff_ms;
-                    value = (float) (cadence_ms / UnitConversions.MS_TO_S / UnitConversions.S_TO_MIN);
+                    return;
                 }
+
+                // TODO We have to treat with overflow according to the documentation: read https://github.com/OpenTracksApp/OpenTracks/pull/953#discussion_r711625268
+                if (crankRevolutionsCount < previous.crankRevolutionsCount) {
+                    Log.e(TAG, "Crank revolutions count difference is invalid: cannot compute cadence.");
+                    return;
+                }
+
+                long crankDiff = UintUtils.diff(crankRevolutionsCount, previous.crankRevolutionsCount, UintUtils.UINT32_MAX);
+                float cadence_ms = crankDiff / timeDiff_ms;
+                value = (float) (cadence_ms / UnitConversions.MS_TO_S / UnitConversions.S_TO_MIN);
             }
         }
 
@@ -121,6 +134,16 @@ public final class SensorDataCycling {
             return wheelRevolutionsTime;
         }
 
+        @NonNull
+        @Override
+        protected Data getNoneValue() {
+            if (value != null) {
+                return new Data(value.distance, value.distanceOverall, Speed.zero());
+            } else {
+                return new Data(Distance.of(0), Distance.of(0), Speed.zero());
+            }
+        }
+
         public void compute(DistanceSpeed previous, Distance wheelCircumference) {
             if (hasData() && previous != null && previous.hasData()) {
                 float timeDiff_ms = UintUtils.diff(wheelRevolutionsTime, previous.wheelRevolutionsTime, UintUtils.UINT16_MAX) / 1024f * UnitConversions.S_TO_MS;
@@ -131,6 +154,10 @@ public final class SensorDataCycling {
                     return;
                 }
 
+                if (wheelRevolutionsCount < previous.wheelRevolutionsCount) {
+                    Log.e(TAG, "Wheel revolutions count difference is invalid: cannot compute speed.");
+                    return;
+                }
                 long wheelDiff = UintUtils.diff(wheelRevolutionsCount, previous.wheelRevolutionsCount, UintUtils.UINT32_MAX);
 
                 Distance distance = wheelCircumference.multipliedBy(wheelDiff);
@@ -191,6 +218,7 @@ public final class SensorDataCycling {
                 return speed;
             }
 
+            @NonNull
             @Override
             public String toString() {
                 return "Data{" +
@@ -216,6 +244,12 @@ public final class SensorDataCycling {
         public DistanceSpeed getDistanceSpeed() {
             return this.value != null ? this.value.second : null;
         }
+
+        @NonNull
+        @Override
+        protected Pair<Cadence, DistanceSpeed> getNoneValue() {
+            return new Pair<>(null, null);
+        }
     }
 }
 

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

@@ -18,4 +18,10 @@ public class SensorDataCyclingPower extends SensorData<Float> {
     public String toString() {
         return super.toString() + " power=" + value;
     }
+
+    @NonNull
+    @Override
+    protected Float getNoneValue() {
+        return 0f;
+    }
 }

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

@@ -18,4 +18,10 @@ public class SensorDataHeartRate extends SensorData<Float> {
     public String toString() {
         return super.toString() + " heart=" + value;
     }
+
+    @NonNull
+    @Override
+    protected Float getNoneValue() {
+        return 0f;
+    }
 }

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

@@ -1,5 +1,6 @@
 package de.dennisguse.opentracks.content.sensor;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
@@ -52,6 +53,16 @@ public final class SensorDataRunning extends SensorData<SensorDataRunning.Data>
         return totalDistance;
     }
 
+    @NonNull
+    @Override
+    protected Data getNoneValue() {
+        if (value != null) {
+            return new Data(Speed.zero(), 0f, ((Data) value).distance);
+        } else {
+            return new Data(Speed.zero(), 0f, Distance.of(0));
+        }
+    }
+
     public void compute(SensorDataRunning previous) {
         Distance overallDistance = null;
         if (hasTotalDistance() && previous != null && previous.hasTotalDistance()) {
@@ -92,10 +103,12 @@ public final class SensorDataRunning extends SensorData<SensorDataRunning.Data>
             return cadence;
         }
 
+        @Nullable
         public Distance getDistance() {
             return distance;
         }
 
+        @NonNull
         @Override
         public String toString() {
             return "Data{" +

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

@@ -108,7 +108,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     };
 
     /**
-     * A runnable that will set the orange pointer as appropriate and redraw.
+     * A runnable that will setFrequency the orange pointer as appropriate and redraw.
      */
     private final Runnable updateChart = new Runnable() {
         @Override

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

@@ -254,9 +254,9 @@ public class MarkerDetailFragment extends Fragment {
 
     private void setLocation(boolean addShadow) {
         String value = "[" + getString(R.string.stats_latitude) + " "
-                + StringUtils.formatCoordinate(marker.getLatitude()) + ", "
+                + StringUtils.formatCoordinate(getContext(), marker.getLatitude()) + ", "
                 + getString(R.string.stats_longitude) + " "
-                + StringUtils.formatCoordinate(marker.getLongitude()) + "]";
+                + StringUtils.formatCoordinate(getContext(), marker.getLongitude()) + "]";
 
         ListItemUtils.setTextView(getActivity(), viewBinding.markerDetailMarkerLocation, value, addShadow);
     }

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

@@ -31,12 +31,11 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackRecordedActivity;
-import de.dennisguse.opentracks.adapters.SensorsAdapter;
+import de.dennisguse.opentracks.adapters.StatisticsAdapter;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.databinding.StatisticsRecordedBinding;
@@ -45,7 +44,8 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
-import de.dennisguse.opentracks.viewmodels.SensorDataModel;
+import de.dennisguse.opentracks.viewmodels.StatisticData;
+import de.dennisguse.opentracks.viewmodels.StatisticDataBuilder;
 
 /**
  * A fragment to display track statistics to the user for a recorded {@link Track}.
@@ -69,7 +69,7 @@ public class StatisticsRecordedFragment extends Fragment {
     }
 
     private SensorStatistics sensorStatistics;
-    private SensorsAdapter sensorsAdapter;
+    private StatisticsAdapter.WithRecordedLayout sensorsAdapter;
 
     private Track.Id trackId;
     @Nullable // Lazily loaded.
@@ -114,7 +114,7 @@ public class StatisticsRecordedFragment extends Fragment {
 
         sharedPreferences = PreferencesUtils.getSharedPreferences(getContext());
 
-        sensorsAdapter = new SensorsAdapter(getContext());
+        sensorsAdapter = new StatisticsAdapter.WithRecordedLayout(getContext());
     }
 
     @Override
@@ -238,22 +238,21 @@ public class StatisticsRecordedFragment extends Fragment {
 
         // Set altitude gain and loss
         {
-            // Make altitude visible?
-            boolean show = PreferencesUtils.isShowStatsAltitude(sharedPreferences, getContext());
-            viewBinding.statsAltitudeGroup.setVisibility(show ? View.VISIBLE : View.GONE);
-
             Float altitudeGain_m = trackStatistics.getTotalAltitudeGain();
             Float altitudeLoss_m = trackStatistics.getTotalAltitudeLoss();
 
             Pair<String, String> parts;
 
-            parts = StringUtils.getAltitudeParts(getContext(), altitudeGain_m, preferenceMetricUnits);
+            parts = StringUtils.getAltitudeChangeParts(getContext(), altitudeGain_m, preferenceMetricUnits);
             viewBinding.statsAltitudeGainValue.setText(parts.first);
             viewBinding.statsAltitudeGainUnit.setText(parts.second);
 
-            parts = StringUtils.getAltitudeParts(getContext(), altitudeLoss_m, preferenceMetricUnits);
+            parts = StringUtils.getAltitudeChangeParts(getContext(), altitudeLoss_m, preferenceMetricUnits);
             viewBinding.statsAltitudeLossValue.setText(parts.first);
             viewBinding.statsAltitudeLossUnit.setText(parts.second);
+
+            boolean show = altitudeGain_m != null && altitudeLoss_m != null;
+            viewBinding.statsAltitudeGroup.setVisibility(show ? View.VISIBLE : View.GONE);
         }
     }
 
@@ -262,18 +261,7 @@ public class StatisticsRecordedFragment extends Fragment {
             return;
         }
 
-        List<SensorDataModel> sensorDataList = new ArrayList<>();
-        if (sensorStatistics.hasHeartRate()) {
-            sensorDataList.add(new SensorDataModel(R.string.sensor_state_heart_rate_max, R.string.sensor_unit_beats_per_minute, sensorStatistics.getMaxHeartRate()));
-            sensorDataList.add(new SensorDataModel(R.string.sensor_state_heart_rate_avg, R.string.sensor_unit_beats_per_minute, sensorStatistics.getAvgHeartRate()));
-        }
-        if (sensorStatistics.hasCadence()) {
-            sensorDataList.add(new SensorDataModel(R.string.sensor_state_cadence_max, R.string.sensor_unit_rounds_per_minute, sensorStatistics.getMaxCadence()));
-            sensorDataList.add(new SensorDataModel(R.string.sensor_state_cadence_avg, R.string.sensor_unit_rounds_per_minute, sensorStatistics.getAvgCadence()));
-        }
-        if (sensorStatistics.hasPower()) {
-            sensorDataList.add(new SensorDataModel(R.string.sensor_state_power_avg, R.string.sensor_unit_power, sensorStatistics.getAvgPower()));
-        }
+        List<StatisticData> sensorDataList = StatisticDataBuilder.fromSensorStatistics(getContext(), sensorStatistics);
         if (sensorDataList.size() > 0) {
             sensorsAdapter.swapData(sensorDataList);
         }

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

@@ -3,7 +3,6 @@ package de.dennisguse.opentracks.fragments;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
-import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,28 +10,25 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import java.time.Duration;
-import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.TrackRecordingActivity;
-import de.dennisguse.opentracks.adapters.SensorsAdapter;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.adapters.StatisticsAdapter;
+import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.databinding.StatisticsRecordingBinding;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
-import de.dennisguse.opentracks.viewmodels.SensorDataModel;
+import de.dennisguse.opentracks.viewmodels.StatisticData;
+import de.dennisguse.opentracks.viewmodels.StatisticsDataModel;
 
 /**
  * A fragment to display track statistics to the user for a currently recording {@link Track}.
@@ -51,15 +47,16 @@ public class StatisticsRecordingFragment extends Fragment {
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
     private TrackRecordingService.RecordingData recordingData = TrackRecordingService.NOT_RECORDING;
     private TrackPoint latestTrackPoint;
+    private Layout layout;
 
     private StatisticsRecordingBinding viewBinding;
-    private SensorsAdapter sensorsAdapter;
+    private StatisticsAdapter statisticsAdapter;
+    private GridLayoutManager gridLayoutManager;
+    private StatisticsDataModel viewModel;
+    private LiveData<List<StatisticData>> statisticsLiveData;
 
     private SharedPreferences sharedPreferences;
     private boolean preferenceMetricUnits;
-    private boolean preferenceReportSpeed;
-    private boolean preferenceShowAltitude;
-    private boolean preferenceShowCoordinate;
 
     private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> {
         boolean updateUInecessary = false;
@@ -69,19 +66,13 @@ public class StatisticsRecordingFragment extends Fragment {
             preferenceMetricUnits = PreferencesUtils.isMetricUnits(sharedPreferences, getContext());
         }
 
-        if (PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key) && recordingData != null) {
+        if (PreferencesUtils.isKey(getContext(), R.string.stats_custom_layout_fields_key, key)) {
             updateUInecessary = true;
-            preferenceReportSpeed = PreferencesUtils.isReportSpeed(sharedPreferences, getContext(), recordingData.getTrackCategory());
+            layout = PreferencesUtils.getCustomLayout(sharedPreferences, getContext());
         }
 
-        if (PreferencesUtils.isKey(getContext(), R.string.stats_show_grade_altitude_key, key)) {
-            updateUInecessary = true;
-            preferenceShowAltitude = PreferencesUtils.isShowStatsAltitude(sharedPreferences, getContext());
-        }
-
-        if (PreferencesUtils.isKey(getContext(), R.string.stats_show_coordinate_key, key)) {
-            updateUInecessary = true;
-            preferenceShowCoordinate = PreferencesUtils.isStatsShowCoordinate(sharedPreferences, getContext());
+        if (PreferencesUtils.isKey(getContext(), R.string.stats_custom_layout_columns_key, key)) {
+            gridLayoutManager.setSpanCount(PreferencesUtils.getLayoutColumns(sharedPreferences, getContext()));
         }
 
         if (key != null && updateUInecessary && isResumed()) {
@@ -109,17 +100,28 @@ public class StatisticsRecordingFragment extends Fragment {
         sharedPreferences = PreferencesUtils.getSharedPreferences(getContext());
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
 
-        sensorsAdapter = new SensorsAdapter(getContext());
+        statisticsAdapter = new StatisticsAdapter(getContext());
     }
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewBinding = StatisticsRecordingBinding.inflate(inflater, container, false);
-        viewBinding.statsActivityTypeIcon.setOnClickListener(v -> ((TrackRecordingActivity) getActivity()).chooseActivityType(recordingData.getTrackCategory()));
 
-        RecyclerView sensorsRecyclerView = viewBinding.statsSensorsRecyclerView;
-        sensorsRecyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2));
-        sensorsRecyclerView.setAdapter(sensorsAdapter);
+        RecyclerView recyclerView = viewBinding.statsRecyclerView;
+        recyclerView.addItemDecoration(new DividerItemDecoration(getContext(), RecyclerView.VERTICAL));
+        final int numColumns = PreferencesUtils.getLayoutColumns(sharedPreferences, getContext());
+        gridLayoutManager = new GridLayoutManager(getContext(), numColumns);
+        gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                if (statisticsAdapter.isItemWide(position)) {
+                    return numColumns;
+                }
+                return 1;
+            }
+        });
+        recyclerView.setLayoutManager(gridLayoutManager);
+        recyclerView.setAdapter(statisticsAdapter);
 
         return viewBinding.getRoot();
     }
@@ -131,13 +133,16 @@ public class StatisticsRecordingFragment extends Fragment {
         sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
         sharedPreferenceChangeListener.onSharedPreferenceChanged(sharedPreferences, null);
 
+        viewModel = new ViewModelProvider(getActivity()).get(StatisticsDataModel.class);
+        statisticsLiveData = viewModel.getStatsData();
+        statisticsLiveData.observe(getActivity(), statsDataList -> statisticsAdapter.swapData(statsDataList));
+
         trackRecordingServiceConnection.startConnection(getContext());
     }
 
     @Override
     public void onPause() {
         super.onPause();
-
         sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
     }
 
@@ -158,160 +163,16 @@ public class StatisticsRecordingFragment extends Fragment {
         super.onDestroy();
         trackRecordingServiceConnection = null;
         sharedPreferences = null;
+        viewModel = null;
+        statisticsLiveData.removeObservers(getActivity());
     }
 
     private void updateUI() {
         if (isResumed()) {
-            updateStats();
-            setLocationValues();
-            updateSensorDataUI();
+            viewModel.update(recordingData, layout, preferenceMetricUnits);
         }
     }
 
-    /**
-     * Tries to fetch most recent {@link SensorDataSet} from {@link de.dennisguse.opentracks.services.TrackRecordingService}.
-     * Also sets altitude gain and loss.
-     */
-    private void updateSensorDataUI() {
-        SensorDataSet sensorDataSet = recordingData.getSensorDataSet();
-        if (sensorDataSet != null) {
-            List<SensorDataModel> sensorDataList = new ArrayList<>();
-            if (sensorDataSet.getHeartRate() != null) {
-                sensorDataList.add(new SensorDataModel(sensorDataSet.getHeartRate()));
-            }
-            if (sensorDataSet.getCyclingCadence() != null) {
-                sensorDataList.add(new SensorDataModel(sensorDataSet.getCyclingCadence()));
-            }
-            if (sensorDataSet.getCyclingPower() != null) {
-                sensorDataList.add(new SensorDataModel(sensorDataSet.getCyclingPower()));
-            }
-            sensorsAdapter.swapData(sensorDataList);
-        }
-
-        {
-            Pair<String, String> parts = StringUtils.getAltitudeParts(getContext(), recordingData.getTrackStatistics().getTotalAltitudeGain(), preferenceMetricUnits);
-            viewBinding.statsAltitudeGainValue.setText(parts.first);
-            viewBinding.statsAltitudeGainUnit.setText(parts.second);
-        }
-        {
-            Pair<String, String> parts = StringUtils.getAltitudeParts(getContext(), recordingData.getTrackStatistics().getTotalAltitudeLoss(), preferenceMetricUnits);
-            viewBinding.statsAltitudeLossValue.setText(parts.first);
-            viewBinding.statsAltitudeLossUnit.setText(parts.second);
-        }
-    }
-
-    private void updateStats() {
-        // Set activity type
-        String trackIconValue = TrackIconUtils.getIconValue(getContext(), recordingData.getTrackCategory());
-        viewBinding.statsActivityTypeIcon.setImageResource(TrackIconUtils.getIconDrawable(trackIconValue));
-
-        // Set time
-        viewBinding.statsMovingTimeValue.setText(StringUtils.formatElapsedTime(recordingData.getTrackStatistics().getMovingTime()));
-        updateTotalTime();
-
-        // Set average speed/pace
-        {
-            Speed speed = recordingData.getTrackStatistics().getAverageSpeed();
-            viewBinding.statsAverageSpeedLabel.setText(preferenceReportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace);
-
-            Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, preferenceMetricUnits, preferenceReportSpeed);
-            viewBinding.statsAverageSpeedValue.setText(parts.first);
-            viewBinding.statsAverageSpeedUnit.setText(parts.second);
-        }
-
-        // Set max speed/pace
-        {
-            Speed speed = recordingData.getTrackStatistics().getMaxSpeed();
-
-            viewBinding.statsMaxSpeedLabel.setText(preferenceReportSpeed ? R.string.stats_max_speed : R.string.stats_fastest_pace);
-
-            Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, preferenceMetricUnits, preferenceReportSpeed);
-            viewBinding.statsMaxSpeedValue.setText(parts.first);
-            viewBinding.statsMaxSpeedUnit.setText(parts.second);
-        }
-
-        // Set moving speed/pace
-        {
-            Speed speed = recordingData.getTrackStatistics().getAverageMovingSpeed();
-
-            viewBinding.statsMovingSpeedLabel.setText(preferenceReportSpeed ? R.string.stats_average_moving_speed : R.string.stats_average_moving_pace);
-
-            Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, preferenceMetricUnits, preferenceReportSpeed);
-            viewBinding.statsMovingSpeedValue.setText(parts.first);
-            viewBinding.statsMovingSpeedUnit.setText(parts.second);
-        }
-
-        // Set altitude gain and loss
-        viewBinding.statsAltitudeGroup.setVisibility(preferenceShowAltitude ? View.VISIBLE : View.GONE);
-    }
-
-    private void updateTotalTime() {
-        Duration totalTime = recordingData.getTrackStatistics().getTotalTime();
-        viewBinding.statsTotalTimeValue.setText(StringUtils.formatElapsedTime(totalTime));
-    }
-
-    private void setLocationValues() {
-        // Set speed/pace
-        Speed speed = latestTrackPoint != null && latestTrackPoint.hasSpeed() ? latestTrackPoint.getSpeed() : null;
-
-        SensorDataSet sensorDataSet = recordingData.getSensorDataSet();
-        if (sensorDataSet != null && sensorDataSet.getCyclingDistanceSpeed() != null) {
-            SensorDataCycling.DistanceSpeed data = sensorDataSet.getCyclingDistanceSpeed();
-            if (data.hasValue() && data.isRecent()) {
-                speed = data.getValue().getSpeed();
-            }
-        }
-
-        setSpeed(speed);
-
-        // Set distance
-        {
-            Pair<String, String> parts = StringUtils.getDistanceParts(getContext(), recordingData.getTrackStatistics().getTotalDistance(), preferenceMetricUnits);
-
-            viewBinding.statsDistanceValue.setText(parts.first);
-            viewBinding.statsDistanceUnit.setText(parts.second);
-        }
-        // Set altitude
-        viewBinding.statsAltitudeGroup.setVisibility(preferenceShowAltitude ? View.VISIBLE : View.GONE);
-
-        if (preferenceShowAltitude) {
-            // Current altitude
-            Float altitude = null;
-            int labelId = R.string.value_unknown;
-            if (latestTrackPoint != null && latestTrackPoint.hasAltitude()) {
-                altitude = (float) latestTrackPoint.getAltitude().toM();
-                labelId = latestTrackPoint.getAltitude().getLabelId();
-            }
-
-            Pair<String, String> parts = StringUtils.getAltitudeParts(getContext(), altitude, preferenceMetricUnits);
-            viewBinding.statsAltitudeCurrentValue.setText(parts.first);
-            viewBinding.statsAltitudeCurrentUnit.setText(parts.second);
-
-            viewBinding.statsAltitudeCurrentLabelEgm.setText(labelId);
-        }
-
-        // Set coordinate
-        viewBinding.statsCoordinateGroup.setVisibility(preferenceShowCoordinate ? View.VISIBLE : View.GONE);
-        if (preferenceShowCoordinate) {
-            String latitudeText = getContext().getString(R.string.value_unknown);
-            String longitudeText = getContext().getString(R.string.value_unknown);
-            if (latestTrackPoint != null && latestTrackPoint.hasLocation()) {
-                latitudeText = StringUtils.formatCoordinate(latestTrackPoint.getLatitude());
-                longitudeText = StringUtils.formatCoordinate(latestTrackPoint.getLongitude());
-            }
-            viewBinding.statsLatitudeValue.setText(latitudeText);
-            viewBinding.statsLongitudeValue.setText(longitudeText);
-        }
-    }
-
-    private void setSpeed(Speed speed) {
-        viewBinding.statsSpeedLabel.setText(preferenceReportSpeed ? R.string.stats_speed : R.string.stats_pace);
-
-        Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, preferenceMetricUnits, preferenceReportSpeed);
-        viewBinding.statsSpeedValue.setText(parts.first);
-        viewBinding.statsSpeedUnit.setText(parts.second);
-    }
-
     private void onRecordingDataChanged(TrackRecordingService.RecordingData recordingData) {
         String oldCategory = this.recordingData.getTrackCategory();
         String newCategory = recordingData.getTrackCategory();

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

@@ -37,6 +37,7 @@ import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.databinding.ExportActivityBinding;
+import de.dennisguse.opentracks.databinding.ToolbarBinding;
 import de.dennisguse.opentracks.io.file.ErrorListDialog;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.util.ExportUtils;
@@ -134,6 +135,7 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         viewBinding = ExportActivityBinding.inflate(getLayoutInflater());
+        ToolbarBinding mergedBinding = ToolbarBinding.bind(viewBinding.getRoot());
         setContentView(viewBinding.getRoot());
 
         directoryUri = getIntent().getParcelableExtra(EXTRA_DIRECTORY_URI_KEY);
@@ -144,7 +146,7 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes
         DocumentFile documentFile = DocumentFile.fromTreeUri(this, directoryUri);
         String directoryDisplayName = FileUtils.getPath(documentFile);
 
-        viewBinding.toolbar.toolbar.setTitle(getString(R.string.export_progress_message, directoryDisplayName));
+        mergedBinding.toolbar.setTitle(getString(R.string.export_progress_message, directoryDisplayName));
 
         resultReceiver = new ExportServiceResultReceiver(new Handler(), this);
 

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

@@ -26,10 +26,12 @@ import androidx.annotation.VisibleForTesting;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.text.NumberFormat;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 
 import de.dennisguse.opentracks.R;
@@ -67,6 +69,13 @@ public class KMLTrackExporter implements TrackExporter {
     private static final String MARKER_ICON = "http://maps.google.com/mapfiles/kml/pushpin/blue-pushpin.png";
     private static final String TRACK_ICON = "http://earth.google.com/images/kml-icons/track-directional/track-0.png";
 
+    private static final NumberFormat SENSOR_DATA_FORMAT = NumberFormat.getInstance(Locale.US);
+
+    static {
+        SENSOR_DATA_FORMAT.setMaximumFractionDigits(1);
+        SENSOR_DATA_FORMAT.setGroupingUsed(false);
+    }
+
     private final Context context;
     private final boolean exportPhotos;
     private final ContentProviderUtils contentProviderUtils;
@@ -394,7 +403,7 @@ public class KMLTrackExporter implements TrackExporter {
             if (value == null) {
                 printWriter.println("<gx:value />");
             } else {
-                printWriter.println("<gx:value>" + list.get(i) + "</gx:value>");
+                printWriter.println("<gx:value>" + SENSOR_DATA_FORMAT.format(value) + "</gx:value>");
             }
         }
         printWriter.println("</gx:SimpleArrayData>");

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

@@ -66,7 +66,7 @@ public class SharePictureTrackExporter implements TrackExporter {
 
         viewBinding.sharePictureTotalTime.setText(StringUtils.formatElapsedTimeWithHour(track.getTrackStatistics().getTotalTime()));
         viewBinding.sharePictureTotalDistance.setText(StringUtils.formatDistance(context, track.getTrackStatistics().getTotalDistance(), metricUnits));
-        viewBinding.sharePictureGain.setText(StringUtils.formatAltitude(context, trackStatistics.getTotalAltitudeGain(), metricUnits));
+        viewBinding.sharePictureGain.setText(StringUtils.formatAltitudeChange(context, trackStatistics.getTotalAltitudeGain(), metricUnits));
 
         // prepare rendering
         View view = viewBinding.getRoot();

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

@@ -34,7 +34,7 @@ class TrackRecordingManager {
     private Distance recordingDistanceInterval;
     private Distance maxRecordingDistance;
 
-    private Track track;
+    private Track.Id trackId;
     private TrackStatisticsUpdater trackStatisticsUpdater;
 
     private TrackPoint lastTrackPoint;
@@ -47,70 +47,77 @@ class TrackRecordingManager {
     }
 
     Track.Id start(TrackPoint segmentStartTrackPoint) {
-        // Insert a track
-        track = new Track();
-        track.setId(contentProviderUtils.insertTrack(track));
+        // Create new track
+        Track track = new Track();
+        trackId = contentProviderUtils.insertTrack(track);
+        track.setId(trackId);
 
         trackStatisticsUpdater = new TrackStatisticsUpdater();
 
-        insertTrackPoint(track, segmentStartTrackPoint);
+        insertTrackPoint(trackId, segmentStartTrackPoint);
 
         //TODO Pass TrackPoint
-        track.setName(TrackNameUtils.getTrackName(context, track.getId(), segmentStartTrackPoint.getTime()));
+        track.setName(TrackNameUtils.getTrackName(context, trackId, segmentStartTrackPoint.getTime()));
 
         String category = PreferencesUtils.getDefaultActivity(PreferencesUtils.getSharedPreferences(context), context); //TODO Re-use sharedpreferences
         track.setCategory(category);
         track.setIcon(TrackIconUtils.getIconValue(context, category));
         track.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
-        contentProviderUtils.updateTrack(track); //TODO Could we do this in the insert?
+        contentProviderUtils.updateTrack(track);
 
-        return track.getId();
+        return trackId;
     }
 
     //TODO Handle non-existing trackId? Start a new track or exception?
-    void resume(@NonNull Track.Id trackId, @NonNull TrackPoint segmentStartTrackPoint) {
-        track = contentProviderUtils.getTrack(trackId);
+    void resume(@NonNull Track.Id resumeTrackId, @NonNull TrackPoint segmentStartTrackPoint) {
+        trackId = resumeTrackId;
+        Track track = contentProviderUtils.getTrack(trackId);
         if (track == null) {
             Log.e(TAG, "Ignore resumeTrack. Track " + trackId.getId() + " does not exists.");
             return;
         }
 
         trackStatisticsUpdater = new TrackStatisticsUpdater(track.getTrackStatistics());
-        insertTrackPoint(track, segmentStartTrackPoint);
+        insertTrackPoint(trackId, segmentStartTrackPoint);
     }
 
-    void pause(TrackPointCreator handlerServer) {
+    void pause(TrackPointCreator trackPointCreator) {
         if (lastTrackPoint != null) {
-            insertTrackPointIfNewer(track, lastTrackPoint);
+            insertTrackPointIfNewer(trackId, lastTrackPoint);
         }
-        insertTrackPoint(track, handlerServer.createSegmentEnd());
+        insertTrackPoint(trackId, trackPointCreator.createSegmentEnd());
     }
 
-    void end(TrackPointCreator handlerServer) {
+    void end(TrackPointCreator trackPointCreator) {
         if (lastTrackPoint != null) {
-            insertTrackPointIfNewer(track, lastTrackPoint);
+            insertTrackPointIfNewer(trackId, lastTrackPoint);
         }
 
-        TrackPoint segmentEnd = handlerServer.createSegmentEnd();
-        insertTrackPoint(track, segmentEnd);
+        TrackPoint segmentEnd = trackPointCreator.createSegmentEnd();
+        insertTrackPoint(trackId, segmentEnd);
 
-        track = null;
+        trackId = null;
         trackStatisticsUpdater = null;
         lastTrackPoint = null;
         lastValidTrackPoint = null;
         isIdle = false;
     }
 
-    Pair<Track, Pair<TrackPoint, SensorDataSet>> get(TrackPointCreator handlerServer) {
-        if (handlerServer == null) {
+    Pair<Track, Pair<TrackPoint, SensorDataSet>> get(TrackPointCreator trackPointCreator) {
+        if (trackPointCreator == null) {
             return null;
         }
         TrackStatisticsUpdater tmpTrackStatisticsUpdater = getTrackStatisticsUpdater();
-        Pair<TrackPoint, SensorDataSet> current = handlerServer.createCurrentTrackPoint(lastTrackPoint);
+        Pair<TrackPoint, SensorDataSet> current = trackPointCreator.createCurrentTrackPoint(lastTrackPoint);
 
         tmpTrackStatisticsUpdater.addTrackPoint(current.first, recordingDistanceInterval);
 
         Track track = getTrack(); //Get copy
+        if (track == null) {
+            Log.w(TAG, "Requesting data if not recording is taking place, should not be done.");
+            return null;
+        }
+
         track.setTrackStatistics(tmpTrackStatisticsUpdater.getTrackStatistics());
 
         return new Pair<>(track, current);
@@ -118,14 +125,14 @@ class TrackRecordingManager {
 
     public Marker.Id insertMarker(String name, String category, String description, String photoUrl) {
         if (name == null) {
-            Integer nextMarkerNumber = contentProviderUtils.getNextMarkerNumber(track.getId());
+            Integer nextMarkerNumber = contentProviderUtils.getNextMarkerNumber(trackId);
             if (nextMarkerNumber == null) {
                 nextMarkerNumber = 1;
             }
             name = context.getString(R.string.marker_name_format, nextMarkerNumber + 1);
         }
 
-        TrackPoint trackPoint = getLastValidTrackPointInCurrentSegment(track.getId());
+        TrackPoint trackPoint = getLastValidTrackPointInCurrentSegment(trackId);
         if (trackPoint == null) {
             Log.i(TAG, "Could not create a marker as trackPoint is unknown.");
             return null;
@@ -138,51 +145,54 @@ class TrackRecordingManager {
 
 
         // Insert marker
-        Marker marker = new Marker(name, description, category, icon, track.getId(), getTrackStatistics(), trackPoint, photoUrl);
+        Marker marker = new Marker(name, description, category, icon, trackId, getTrackStatistics(), trackPoint, photoUrl);
         Uri uri = contentProviderUtils.insertMarker(marker);
         return new Marker.Id(ContentUris.parseId(uri));
     }
 
     void onNewTrackPoint(TrackPoint trackPoint, Distance thresholdHorizontalAccuracy) {
         //TODO Figure out how to avoid loading the lastValidTrackPoint from the database
-        TrackPoint lastValidTrackPoint = getLastValidTrackPointInCurrentSegment(track.getId());
+        TrackPoint lastValidTrackPoint = getLastValidTrackPointInCurrentSegment(trackId);
 
         //Storing trackPoint
 
         // Always insert the first segment location
         if (!currentSegmentHasTrackPoint()) {
-            insertTrackPoint(track, trackPoint);
+            insertTrackPoint(trackId, trackPoint);
             lastTrackPoint = trackPoint;
             return;
         }
 
         Distance distanceToLastTrackLocation = trackPoint.distanceToPrevious(lastValidTrackPoint);
-        if (distanceToLastTrackLocation.greaterThan(maxRecordingDistance)) {
-            insertTrackPointIfNewer(track, lastTrackPoint);
+        if (distanceToLastTrackLocation != null) {
+            if (distanceToLastTrackLocation.greaterThan(maxRecordingDistance)) {
+                insertTrackPointIfNewer(trackId, lastTrackPoint);
 
-            trackPoint.setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
-            insertTrackPoint(track, trackPoint);
+                trackPoint.setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
+                insertTrackPoint(trackId, trackPoint);
 
-            isIdle = false;
-            lastTrackPoint = trackPoint;
-            return;
-        }
+                isIdle = false;
 
-        if (trackPoint.hasSensorData() || distanceToLastTrackLocation.greaterOrEqualThan(recordingDistanceInterval)) {
-            insertTrackPointIfNewer(track, lastTrackPoint);
+                lastTrackPoint = trackPoint;
+                return;
+            }
 
-            insertTrackPoint(track, trackPoint);
+            if (trackPoint.hasSensorData() || distanceToLastTrackLocation.greaterOrEqualThan(recordingDistanceInterval)) {
+                insertTrackPointIfNewer(trackId, lastTrackPoint);
 
-            isIdle = false;
+                insertTrackPoint(trackId, trackPoint);
 
-            lastTrackPoint = trackPoint;
-            return;
+                isIdle = false;
+
+                lastTrackPoint = trackPoint;
+                return;
+            }
         }
 
         if (!isIdle && !trackPoint.isMoving()) {
-            insertTrackPointIfNewer(track, lastTrackPoint);
+            insertTrackPointIfNewer(trackId, lastTrackPoint);
 
-            insertTrackPoint(track, trackPoint);
+            insertTrackPoint(trackId, trackPoint);
 
             isIdle = true;
 
@@ -191,9 +201,9 @@ class TrackRecordingManager {
         }
 
         if (isIdle && trackPoint.isMoving()) {
-            insertTrackPointIfNewer(track, lastTrackPoint);
+            insertTrackPointIfNewer(trackId, lastTrackPoint);
 
-            insertTrackPoint(track, trackPoint);
+            insertTrackPoint(trackId, trackPoint);
 
             isIdle = false;
 
@@ -206,7 +216,7 @@ class TrackRecordingManager {
     }
 
     Track getTrack() {
-        return contentProviderUtils.getTrack(track.getId()); //Copy in memory; not via DB
+        return contentProviderUtils.getTrack(trackId);
     }
 
     //Functionality that uses this method should happen here.
@@ -240,34 +250,24 @@ class TrackRecordingManager {
 
     /**
      * Inserts a trackPoint if this trackPoint is different than lastValidTrackPoint.
-     *
-     * @param track      the track
-     * @param trackPoint the trackPoint
      */
-    private void insertTrackPointIfNewer(@NonNull Track track, @NonNull TrackPoint trackPoint) {
-        TrackPoint lastValidTrackPoint = getLastValidTrackPointInCurrentSegment(track.getId());
+    private void insertTrackPointIfNewer(@NonNull Track.Id trackId, @NonNull TrackPoint trackPoint) {
+        TrackPoint lastValidTrackPoint = getLastValidTrackPointInCurrentSegment(trackId);
         if (lastValidTrackPoint != null && trackPoint.getTime().equals(lastValidTrackPoint.getTime())) {
             // Do not insert if inserted already
-            Log.w(TAG, "Ignore insertTrackPoint. trackPoint time same as last valid track point time.");
+            Log.w(TAG, "Ignore insertTrackPoint. trackPoint time same as last valid trackId point time.");
             return;
         }
 
-        insertTrackPoint(track, trackPoint);
+        insertTrackPoint(trackId, trackPoint);
     }
 
-    /**
-     * Inserts a trackPoint.
-     *
-     * @param track      the track
-     * @param trackPoint the trackPoint
-     */
-    private void insertTrackPoint(@NonNull Track track, @NonNull TrackPoint trackPoint) {
+    private void insertTrackPoint(@NonNull Track.Id trackId, @NonNull TrackPoint trackPoint) {
         try {
-            contentProviderUtils.insertTrackPoint(trackPoint, track.getId());
+            contentProviderUtils.insertTrackPoint(trackPoint, trackId);
             trackStatisticsUpdater.addTrackPoint(trackPoint, recordingDistanceInterval);
-            track.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
 
-            contentProviderUtils.updateTrack(track);
+            contentProviderUtils.updateTrackStatistics(trackId, trackStatisticsUpdater.getTrackStatistics());
         } catch (SQLiteException e) {
             /*
              * Insert failed, most likely because of SqlLite error code 5 (SQLite_BUSY).

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

@@ -49,9 +49,7 @@ import de.dennisguse.opentracks.io.file.exporter.ExportServiceResultReceiver;
 import de.dennisguse.opentracks.services.handlers.EGM2008CorrectionManager;
 import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
-import de.dennisguse.opentracks.services.tasks.AnnouncementPeriodicTask;
-import de.dennisguse.opentracks.services.tasks.PeriodicTask;
-import de.dennisguse.opentracks.services.tasks.PeriodicTaskExecutor;
+import de.dennisguse.opentracks.services.tasks.VoiceAnnouncementManager;
 import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.ExportUtils;
@@ -71,12 +69,12 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
 
     private static final Duration RECORDING_DATA_UPDATE_INTERVAL = Duration.ofSeconds(1);
 
-    public static final RecordingStatus STATUS_DEFAULT = new RecordingStatus(null, false);
+    public static final RecordingStatus STATUS_DEFAULT = RecordingStatus.notRecording();
     public static final RecordingData NOT_RECORDING = new RecordingData(null, null, null);
     public static final GpsStatusValue STATUS_GPS_DEFAULT = GpsStatusValue.GPS_NONE;
 
-    // The following variables are set in onCreate:
-    private PeriodicTaskExecutor voiceExecutor;
+    // The following variables are setFrequency in onCreate:
+    private VoiceAnnouncementManager voiceAnnouncementManager;
     private TrackRecordingServiceNotificationManager notificationManager;
 
     private TrackRecordingManager trackRecordingManager;
@@ -106,25 +104,26 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
             Context context = TrackRecordingService.this;
             if (PreferencesUtils.isKey(context, R.string.stats_units_key, key)) {
                 boolean metricUnits = PreferencesUtils.isMetricUnits(sharedPreferences, context);
-                voiceExecutor.setMetricUnits(metricUnits);
                 notificationManager.setMetricUnits(metricUnits);
             }
-            if (PreferencesUtils.isKey(context, R.string.voice_frequency_key, key)) {
-                voiceExecutor.setTaskFrequency(PreferencesUtils.getVoiceFrequency(sharedPreferences, context));
+            if (PreferencesUtils.isKey(context, R.string.voice_announcement_frequency_key, key)) {
+                voiceAnnouncementManager.setFrequency(PreferencesUtils.getVoiceAnnouncementFrequency(sharedPreferences, context));
+            }
+            if (PreferencesUtils.isKey(context, new int[]{R.string.voice_announcement_distance_key, R.string.stats_units_key}, key)) {
+                voiceAnnouncementManager.setFrequency(PreferencesUtils.getVoiceAnnouncementDistance(sharedPreferences, context));
             }
 
-
-            handlerServer.onSharedPreferenceChanged(sharedPreferences, key);
+            trackPointCreator.onSharedPreferenceChanged(sharedPreferences, key);
             trackRecordingManager.onSharedPreferenceChanged(sharedPreferences, key);
         }
     };
 
-    // The following variables are set when recording:
+    // The following variables are setFrequency when recording:
     private WakeLock wakeLock;
 
     private final Binder binder = new Binder();
 
-    private TrackPointCreator handlerServer; //TODO Move to TrackRecordingManager?
+    private TrackPointCreator trackPointCreator; //TODO Move to TrackRecordingManager?
 
     private RecordingStatus recordingStatus;
     private MutableLiveData<RecordingStatus> recordingStatusObservable;
@@ -143,9 +142,9 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         recordingDataObservable = new MutableLiveData<>(NOT_RECORDING);
 
         trackRecordingManager = new TrackRecordingManager(this);
-        handlerServer = new TrackPointCreator(this);
+        trackPointCreator = new TrackPointCreator(this);
 
-        voiceExecutor = new PeriodicTaskExecutor(this, new AnnouncementPeriodicTask.Factory());
+        voiceAnnouncementManager = new VoiceAnnouncementManager(this);
 
         notificationManager = new TrackRecordingServiceNotificationManager(this);
 
@@ -168,8 +167,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     public void onDestroy() {
         handler = null;
 
-        handlerServer.stop();
-        handlerServer = null;
+        trackPointCreator.stop();
+        trackPointCreator = null;
 
         // Reverse order from onCreate
         showNotification(false); //TODO Why?
@@ -178,9 +177,9 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         sharedPreferences = null;
 
         try {
-            voiceExecutor.shutdown();
+            voiceAnnouncementManager.shutdown();
         } finally {
-            voiceExecutor = null;
+            voiceAnnouncementManager = null;
         }
 
         // This should be the next to last operation
@@ -209,10 +208,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         return trackRecordingManager.insertMarker(name, category, description, photoUrl);
     }
 
-    public void run(@NonNull PeriodicTask periodicTask) {
-        periodicTask.run(recordingStatus.getTrackId(), trackRecordingManager.getTrackStatistics());
-    }
-
     /**
      * Starts a new track.
      *
@@ -225,8 +220,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         }
 
         // Set recording status
-        Track.Id trackId = trackRecordingManager.start(handlerServer.createSegmentStartManual());
-        updateRecordingStatus(new RecordingStatus(trackId, false));
+        Track.Id trackId = trackRecordingManager.start(trackPointCreator.createSegmentStartManual());
+        updateRecordingStatus(RecordingStatus.record(trackId));
 
         startRecording();
         return trackId;
@@ -239,11 +234,11 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
      * @param trackId the id of the track to be resumed.
      */
     public void resumeTrack(Track.Id trackId) {
-        handlerServer.resetSensorData();
-        trackRecordingManager.resume(trackId, handlerServer.createSegmentStartManual());
+        trackPointCreator.resetSensorData();
+        trackRecordingManager.resume(trackId, trackPointCreator.createSegmentStartManual());
 
         // Set recording status
-        updateRecordingStatus(new RecordingStatus(trackId, false));
+        updateRecordingStatus(RecordingStatus.record(trackId));
 
         startRecording();
     }
@@ -267,8 +262,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
 
         startGps();
 
-        // Restore periodic tasks
-        voiceExecutor.restore();
+        voiceAnnouncementManager.restore(trackRecordingManager.getTrackStatistics());
     }
 
     public void tryStartGps() {
@@ -279,7 +273,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
 
     private void startGps() {
         wakeLock = SystemUtils.acquireWakeLock(this, wakeLock);
-        handlerServer.start(this);
+        trackPointCreator.start(this);
         showNotification(true);
     }
 
@@ -298,7 +292,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         updateRecordingStatus(STATUS_DEFAULT);
 
         if (!wasPause) {
-            trackRecordingManager.end(handlerServer);
+            trackRecordingManager.end(trackPointCreator);
         }
 
         ExportUtils.postWorkoutExport(this, trackId, new ExportServiceResultReceiver(new Handler(), this));
@@ -314,9 +308,9 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         }
 
         // Set recording status
-        updateRecordingStatus(new RecordingStatus(recordingStatus.getTrackId(), true));
+        updateRecordingStatus(recordingStatus.pause());
 
-        trackRecordingManager.pause(handlerServer);
+        trackRecordingManager.pause(trackPointCreator);
 
         endRecording(false);
 
@@ -337,10 +331,10 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         }
 
         // Shutdown periodic tasks
-        voiceExecutor.shutdown();
+        voiceAnnouncementManager.shutdown();
 
         // Update instance variables
-        handlerServer.stop();
+        trackPointCreator.stop();
 
         stopGps(trackStopped);
     }
@@ -357,7 +351,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     void stopGps(boolean shutdown) {
         if (!isRecording()) return;
 
-        handlerServer.stop();
+        trackPointCreator.stop();
         showNotification(false);
         wakeLock = SystemUtils.releaseWakeLock(wakeLock);
         if (shutdown) {
@@ -374,7 +368,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
 
         trackRecordingManager.onNewTrackPoint(trackPoint, thresholdHorizontalAccuracy);
         notificationManager.updateTrackPoint(this, trackRecordingManager.getTrackStatistics(), trackPoint, thresholdHorizontalAccuracy);
-        voiceExecutor.update(recordingStatus.getTrackId(), trackRecordingManager.getTrackStatistics());
     }
 
     @Override
@@ -391,10 +384,15 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         if (isRecording()) {
             Intent intent = IntentUtils.newIntent(this, TrackRecordingActivity.class)
                     .putExtra(TrackRecordingActivity.EXTRA_TRACK_ID, recordingStatus.getTrackId());
+
+            int pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                pendingIntentFlags |= PendingIntent.FLAG_IMMUTABLE;
+            }
             PendingIntent pendingIntent = TaskStackBuilder.create(this)
                     .addParentStack(TrackRecordingActivity.class)
                     .addNextIntent(intent)
-                    .getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
+                    .getPendingIntent(0, pendingIntentFlags);
 
             notificationManager.updatePendingIntent(pendingIntent);
             notificationManager.updateContent(getString(R.string.gps_starting));
@@ -402,9 +400,14 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         }
         if (!isRecording() && isGpsStarted) {
             Intent intent = IntentUtils.newIntent(this, TrackListActivity.class);
+
+            int pendingIntentFlags = 0;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                pendingIntentFlags = PendingIntent.FLAG_IMMUTABLE;
+            }
             PendingIntent pendingIntent = TaskStackBuilder.create(this)
                     .addNextIntent(intent)
-                    .getPendingIntent(0, 0);
+                    .getPendingIntent(0, pendingIntentFlags);
 
             notificationManager.updatePendingIntent(pendingIntent);
             notificationManager.updateContent(getString(R.string.gps_starting));
@@ -416,21 +419,17 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         }
     }
 
-    public Duration getTotalTime() {
-        return trackRecordingManager.getTrackStatistics().getTotalTime();
-    }
-
     @Deprecated
     @VisibleForTesting
-    public TrackPointCreator getHandlerServer() {
-        return handlerServer;
+    public TrackPointCreator getTrackPointCreator() {
+        return trackPointCreator;
     }
 
     public LiveData<GpsStatusValue> getGpsStatusObservable() {
         return gpsStatusObservable;
     }
 
-    public MutableLiveData<RecordingData> getRecordingDataObservable() {
+    public LiveData<RecordingData> getRecordingDataObservable() {
         return recordingDataObservable;
     }
 
@@ -442,17 +441,24 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
 
         // Compute temporary track statistics using sensorData and update time.
 
-        TrackPointCreator localHandlerServer = this.handlerServer;
-        if (localHandlerServer == null) {
+        TrackPointCreator localTrackPointCreator = this.trackPointCreator;
+        VoiceAnnouncementManager localVoiceAnnouncementManager = this.voiceAnnouncementManager;
+        if (localTrackPointCreator == null || localVoiceAnnouncementManager == null) {
             // when this happens, no recording is running and we should not send any notifications.
             //TODO This implementation is not a good idea; rather solve the issue for this properly
             return;
         }
 
-        Pair<Track, Pair<TrackPoint, SensorDataSet>> data = trackRecordingManager.get(handlerServer);
+        Pair<Track, Pair<TrackPoint, SensorDataSet>> data = trackRecordingManager.get(trackPointCreator);
+        if (data == null) {
+            Log.w(TAG, "Requesting data if not recording is taking place, should not be done.");
+            return;
+        }
         TrackPoint trackPoint = data.second.first;
         egm2008CorrectionManager.correctAltitude(this, trackPoint);
 
+        localVoiceAnnouncementManager.update(data.first);
+
         recordingDataObservable.postValue(new RecordingData(data.first, trackPoint, data.second.second));
     }
 
@@ -493,7 +499,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         private final Track.Id trackId;
         private final boolean paused;
 
-        public RecordingStatus(Track.Id trackId, boolean paused) {
+        private RecordingStatus(Track.Id trackId, boolean paused) {
             this.trackId = trackId;
             this.paused = paused;
         }
@@ -514,20 +520,23 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
             return isRecording() && !isPaused();
         }
 
-//      TODO Use
-//        public RecordingStatus pause() {
-//            return new RecordingStatus(getTrackId(), true);
-//        }
-//
-//        public RecordingStatus record(@NonNull Track.Id trackId) {
-//            return new RecordingStatus(trackId, false);
-//        }
+        private static RecordingStatus notRecording() {
+            return new RecordingStatus(null, false);
+        }
+
+        private static RecordingStatus record(@NonNull Track.Id trackId) {
+            return new RecordingStatus(trackId, false);
+        }
+
+        private RecordingStatus pause() {
+            return new RecordingStatus(getTrackId(), true);
+        }
 
         public RecordingStatus stop() {
             return STATUS_DEFAULT;
         }
 
-
+        @NonNull
         @Override
         public String toString() {
             return "RecordingStatus{" +

src/main/java/de/dennisguse/opentracks/services/handlers/AbsoluteLocationListenerPolicy.java

@@ -1,53 +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.handlers;
-
-import java.time.Duration;
-
-/**
- * This is a simple location listener policy that will always dictate the same polling interval.
- *
- * @author Sandor Dornbush
- */
-public class AbsoluteLocationListenerPolicy implements LocationListenerPolicy {
-
-    private final Duration interval;
-
-    /**
-     * Constructor.
-     *
-     * @param interval the interval to request for gps signal
-     */
-    public AbsoluteLocationListenerPolicy(Duration interval) {
-        this.interval = interval;
-    }
-
-    @Override
-    public Duration getDesiredPollingInterval() {
-        return interval;
-    }
-
-    @Override
-    public int getMinDistance_m() {
-        return 0;
-    }
-
-    @Override
-    public void updateIdleTime(Duration idleTime) {
-        // Ignore
-    }
-}

src/main/java/de/dennisguse/opentracks/services/handlers/AdaptiveLocationListenerPolicy.java

@@ -1,76 +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.handlers;
-
-import java.time.Duration;
-
-/**
- * A {@link LocationListenerPolicy} that will change based on how long the user has been stationary.
- * This policy will dictate a policy based on a min, max and idle time.
- * The policy will dictate an interval bounded by min and max, and is half of the idle time.
- *
- * @author Sandor Dornbush
- */
-public class AdaptiveLocationListenerPolicy implements LocationListenerPolicy {
-
-    private final Duration minInterval;
-    private final Duration maxInterval;
-    private final int minDistance_m;
-
-    // The time the user has been idle at the current location, in milliseconds.
-    private Duration idleTime;
-
-    /**
-     * Creates a policy that will be bounded by the given minInterval_ms and maxInterval_ms.
-     *
-     * @param minInterval   the smallest interval this policy will dictate
-     * @param maxInterval   the largest interval this policy will dictate
-     * @param minDistance_m the minimum distance
-     */
-    public AdaptiveLocationListenerPolicy(Duration minInterval, Duration maxInterval, int minDistance_m) {
-        this.minInterval = minInterval;
-        this.maxInterval = maxInterval;
-        this.minDistance_m = minDistance_m;
-    }
-
-    /*
-     * Returns an interval half of the idle time, but bounded by minInterval and maxInterval.
-     */
-    public Duration getDesiredPollingInterval() {
-        Duration desiredInterval = idleTime.dividedBy(2);
-
-        // Round to second to avoid setting the interval too often
-        desiredInterval = Duration.ofSeconds(desiredInterval.getSeconds());
-
-        if (minInterval.compareTo(desiredInterval) > 0) {
-            return minInterval;
-        } else if (maxInterval.compareTo(desiredInterval) < 0) {
-            return maxInterval;
-        }
-        return desiredInterval;
-    }
-
-    @Override
-    public int getMinDistance_m() {
-        return minDistance_m;
-    }
-
-    @Override
-    public void updateIdleTime(Duration newIdleTime) {
-        idleTime = newIdleTime;
-    }
-}

src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java

@@ -71,8 +71,8 @@ class GpsStatus {
         SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
         thresholdHorizontalAccuracy = PreferencesUtils.getRecordingDistanceInterval(sharedPreferences, context);
 
-        Duration minRecordingInterval = Duration.ofSeconds(PreferencesUtils.getMinRecordingInterval(sharedPreferences, context));
-        signalLostThreshold = !minRecordingInterval.isNegative() ? SIGNAL_LOST_THRESHOLD.plus(minRecordingInterval) : SIGNAL_LOST_THRESHOLD;
+        Duration minRecordingInterval = PreferencesUtils.getMinRecordingInterval(sharedPreferences, context);
+        signalLostThreshold = SIGNAL_LOST_THRESHOLD.plus(minRecordingInterval);
 
         gpsStatusHandler = new Handler();
     }
@@ -102,13 +102,8 @@ class GpsStatus {
         thresholdHorizontalAccuracy = value;
     }
 
-    /**
-     * Method to change the lost threshold from outside.
-     *
-     * @param value Minimal recording interval preference value in seconds or an special value: -1, -2, 0.
-     */
-    public void onMinRecordingIntervalChanged(int value) {
-        signalLostThreshold = value > 0 ? SIGNAL_LOST_THRESHOLD.plus(Duration.ofSeconds(value)) : SIGNAL_LOST_THRESHOLD;
+    public void onMinRecordingIntervalChanged(Duration value) {
+        signalLostThreshold = SIGNAL_LOST_THRESHOLD.plus(value);
     }
 
     /**

src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java

@@ -19,21 +19,20 @@ import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
-@VisibleForTesting(otherwise = 3)
+@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
 public class LocationHandler implements LocationListener, GpsStatus.GpsStatusListener {
 
     private final String TAG = LocationHandler.class.getSimpleName();
 
     private LocationManager locationManager;
-    private final TrackPointCreator handlerServer;
+    private final TrackPointCreator trackPointCreator;
     private GpsStatus gpsStatus;
-    private LocationListenerPolicy locationListenerPolicy;
-    private Duration currentRecordingInterval;
+    private Duration gpsInterval;
     private Distance thresholdHorizontalAccuracy;
     private TrackPoint lastTrackPoint;
 
-    public LocationHandler(TrackPointCreator handlerServer) {
-        this.handlerServer = handlerServer;
+    public LocationHandler(TrackPointCreator trackPointCreator) {
+        this.trackPointCreator = trackPointCreator;
     }
 
     public void onStart(@NonNull Context context, SharedPreferences sharedPreferences) {
@@ -44,6 +43,10 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
         gpsStatus.start();
     }
 
+    private boolean isStarted() {
+        return locationManager != null;
+    }
+
     @SuppressWarnings({"MissingPermission"})
     //TODO upgrade to AGP7.0.0/API31 started complaining about removeUpdates.
     public void onStop() {
@@ -60,43 +63,47 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
     }
 
     public void onSharedPreferenceChanged(@NonNull Context context, @NonNull SharedPreferences sharedPreferences, String key) {
-        if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) {
-            int minRecordingInterval = PreferencesUtils.getMinRecordingInterval(sharedPreferences, context);
-            if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) {
-                // Choose battery life over moving time accuracy.
-                locationListenerPolicy = new AdaptiveLocationListenerPolicy(Duration.ofSeconds(30), Duration.ofSeconds(5), 5);
-            } else if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptAccuracy(context)) {
-                // Get all the updates.
-                locationListenerPolicy = new AdaptiveLocationListenerPolicy(Duration.ofSeconds(1), Duration.ofSeconds(30), 0);
-            } else {
-                locationListenerPolicy = new AbsoluteLocationListenerPolicy(Duration.ofSeconds(minRecordingInterval));
-            }
+        boolean registerListener = false;
 
-            registerLocationListener();
+        if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) {
+            registerListener = true;
+
+            gpsInterval = PreferencesUtils.getMinRecordingInterval(sharedPreferences, context);
+
+            if (gpsStatus != null) {
+                gpsStatus.onMinRecordingIntervalChanged(gpsInterval);
+            }
         }
         if (PreferencesUtils.isKey(context, R.string.recording_gps_accuracy_key, key)) {
             thresholdHorizontalAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy(sharedPreferences, context);
         }
-        if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) {
+        if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) {
+            registerListener = true;
+
             if (gpsStatus != null) {
-                gpsStatus.onMinRecordingIntervalChanged(PreferencesUtils.getMinRecordingInterval(sharedPreferences, context));
+                Distance gpsMinDistance = PreferencesUtils.getRecordingDistanceInterval(sharedPreferences, context);
+                gpsStatus.onRecordingDistanceChanged(gpsMinDistance);
             }
         }
-        if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) {
-            if (gpsStatus != null) {
-                gpsStatus.onRecordingDistanceChanged(PreferencesUtils.getRecordingDistanceInterval(sharedPreferences, context));
-            }
+
+        if (registerListener) {
+            registerLocationListener();
         }
     }
 
     /**
-     * Checks if location is valid and builds a track point that will be send through HandlerServer.
+     * Checks if location is valid and builds a track point that will be send through TrackPointCreator.
      *
      * @param location {@link Location} object.
      */
     @Override
     public void onLocationChanged(@NonNull Location location) {
-        TrackPoint trackPoint = new TrackPoint(location, handlerServer.createNow());
+        if (!isStarted()) {
+            Log.w(TAG, "Location is ignored; not started.");
+            return;
+        }
+
+        TrackPoint trackPoint = new TrackPoint(location, trackPointCreator.createNow());
         boolean isAccurate = trackPoint.fulfillsAccuracy(thresholdHorizontalAccuracy);
         boolean isValid = LocationUtils.isValidLocation(location);
 
@@ -114,18 +121,8 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
             return;
         }
 
-        Duration idleTime = Duration.ofSeconds(0);
-        if (lastTrackPoint != null && trackPoint.getTime().isAfter(lastTrackPoint.getTime())) {
-            idleTime = Duration.between(lastTrackPoint.getTime(), trackPoint.getTime());
-        }
-
-        locationListenerPolicy.updateIdleTime(idleTime);
-        if (currentRecordingInterval != locationListenerPolicy.getDesiredPollingInterval()) {
-            registerLocationListener();
-        }
-
         lastTrackPoint = trackPoint;
-        handlerServer.onNewTrackPoint(trackPoint, thresholdHorizontalAccuracy);
+        trackPointCreator.onNewTrackPoint(trackPoint, thresholdHorizontalAccuracy);
     }
 
     @Override
@@ -152,9 +149,7 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
             return;
         }
         try {
-            Duration interval = locationListenerPolicy.getDesiredPollingInterval();
-            currentRecordingInterval = interval;
-            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, interval.toMillis(), locationListenerPolicy.getMinDistance_m(), this);
+            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, gpsInterval.toMillis(), 0, this);
         } catch (SecurityException e) {
             Log.e(TAG, "Could not register location listener; permissions not granted.", e);
         }
@@ -172,6 +167,6 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
      */
     @Override
     public void onGpsStatusChanged(GpsStatusValue prevStatus, GpsStatusValue currentStatus) {
-        handlerServer.sendGpsStatus(currentStatus);
+        trackPointCreator.sendGpsStatus(currentStatus);
     }
 }

src/main/java/de/dennisguse/opentracks/services/handlers/LocationListenerPolicy.java

@@ -1,46 +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.handlers;
-
-import java.time.Duration;
-
-/**
- * This is an interface for classes that will manage the location listener policy.
- *
- * @author Sandor Dornbush
- */
-interface LocationListenerPolicy {
-
-    /**
-     * Returns the polling interval this policy would like at this moment.
-     *
-     * @return the polling interval
-     */
-    Duration getDesiredPollingInterval();
-
-    /**
-     * Returns the minimum distance between updates.
-     */
-    int getMinDistance_m();
-
-    /**
-     * Notifies the amount of time the user has been idle at his current location.
-     *
-     * @param idleTime the time that the user has been idle at his current location
-     */
-    void updateIdleTime(Duration idleTime);
-}

src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java

@@ -29,8 +29,6 @@ public class TrackPointCreator {
     private Context context;
 
     private final Callback service;
-// Disabled to simplify testing and implementation of #822
-//    private ExecutorService serviceExecutor;
 
     @NonNull
     private Clock clock = Clock.systemUTC();
@@ -52,7 +50,6 @@ public class TrackPointCreator {
 
     public void start(@NonNull Context context) {
         this.context = context;
-//        serviceExecutor = Executors.newSingleThreadExecutor();
 
         SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
         locationHandler.onStart(context, sharedPreferences);
@@ -72,11 +69,15 @@ public class TrackPointCreator {
     }
 
     public void resetSensorData() {
+        if (remoteSensorManager == null || altitudeSumManager == null) {
+            Log.d(TAG, "No recording running and no reset necessary.");
+            return;
+        }
         remoteSensorManager.reset();
         altitudeSumManager.reset();
     }
 
-    //TODO TrackPoint should be created by HandlerServer; instead of in the TrackRecordingService.
+    //TODO TrackPoint should be created by TrackPointCreator; instead of in the TrackRecordingService.
     @Deprecated
     public SensorDataSet fill(TrackPoint trackPoint) {
         SensorDataSet sensorDataSet = remoteSensorManager.fill(trackPoint);
@@ -96,10 +97,15 @@ public class TrackPointCreator {
     public void stop() {
         locationHandler.onStop();
 
-//        if (serviceExecutor != null) {
-//            serviceExecutor.shutdownNow();
-//        }
-//        serviceExecutor = null;
+        if (remoteSensorManager != null) {
+            remoteSensorManager.stop();
+            remoteSensorManager = null;
+        }
+
+        if (altitudeSumManager != null) {
+            altitudeSumManager.stop(context);
+            altitudeSumManager = null;
+        }
 
         this.context = null;
     }
@@ -114,13 +120,8 @@ public class TrackPointCreator {
     }
 
     public void onNewTrackPoint(TrackPoint trackPoint, Distance thresholdHorizontalAccuracy) {
-//        if (serviceExecutor == null || serviceExecutor.isTerminated() || serviceExecutor.isShutdown()) {
-//            return;
-//        }
-
         fillAndReset(trackPoint);
 
-//        serviceExecutor.execute(() -> service.newTrackPoint(trackPoint, thresholdHorizontalAccuracy));
         service.newTrackPoint(trackPoint, thresholdHorizontalAccuracy);
     }
 
@@ -156,6 +157,7 @@ public class TrackPointCreator {
     }
 
     //TODO Limit visibility
+    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     public Instant createNow() {
         return Instant.now(clock);
     }

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

@@ -1,46 +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.tasks;
-
-import androidx.annotation.NonNull;
-
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-
-/**
- * This is interface for a task that will be executed on some schedule.
- *
- * @author Sandor Dornbush
- */
-public interface PeriodicTask {
-
-    /**
-     * Sets up this task for subsequent calls to the run method.
-     */
-    void start();
-
-    /**
-     * This method will be called periodically.
-     */
-    @Deprecated
-    void run(@NonNull Track.Id trackId, @NonNull TrackStatistics trackStatistics);
-
-    /**
-     * Shuts down this task and clean up resources.
-     */
-    void shutdown();
-}

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

@@ -1,181 +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.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-
-import java.time.Duration;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.services.TrackRecordingService;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-
-/**
- * Execute a periodic task on a time or distance schedule.
- *
- * @author Sandor Dornbush
- */
-public class PeriodicTaskExecutor {
-
-    private static final String TAG = PeriodicTaskExecutor.class.getSimpleName();
-
-    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;
-
-    private PeriodicTask periodicTask;
-
-    // Time periodic task executor
-    private TimerTaskExecutor timerTaskExecutor = null;
-
-    private boolean metricUnits;
-
-    private TrackStatistics trackStatistics;
-    private Distance nextTaskDistance = Distance.of(Double.MAX_VALUE);
-
-    public PeriodicTaskExecutor(@NonNull TrackRecordingService trackRecordingService, PeriodicTaskFactory periodicTaskFactory) {
-        this.trackRecordingService = trackRecordingService;
-        this.periodicTaskFactory = periodicTaskFactory;
-
-        TASK_FREQUENCY_OFF = Integer.parseInt(trackRecordingService.getString(R.string.frequency_off));
-        taskFrequency = TASK_FREQUENCY_OFF;
-    }
-
-    /**
-     * Restores the executor.
-     */
-    public void restore() {
-        if (!trackRecordingService.isRecording() || trackRecordingService.isPaused()) {
-            Log.d(TAG, "Not recording or paused.");
-            return;
-        }
-
-        if (!isTimeFrequency() && timerTaskExecutor != null) {
-            timerTaskExecutor.shutdown();
-            timerTaskExecutor = null;
-        }
-        if (taskFrequency == TASK_FREQUENCY_OFF) {
-            Log.d(TAG, "Task frequency is off.");
-            return;
-        }
-
-        periodicTask = periodicTaskFactory.create(trackRecordingService);
-        periodicTask.start();
-
-        if (isTimeFrequency()) {
-            if (timerTaskExecutor == null) {
-                timerTaskExecutor = new TimerTaskExecutor(periodicTask, trackRecordingService);
-            }
-            timerTaskExecutor.scheduleTask(Duration.ofMinutes(taskFrequency));
-        } else {
-            // For distance periodic task
-            updateNextTaskDistance();
-        }
-    }
-
-    /**
-     * Shuts down the executor.
-     */
-    public void shutdown() {
-        if (periodicTask != null) {
-            periodicTask.shutdown();
-            periodicTask = null;
-        }
-        if (timerTaskExecutor != null) {
-            timerTaskExecutor.shutdown();
-            timerTaskExecutor = null;
-        }
-    }
-
-    /**
-     * Updates the executor.
-     */
-    public void update(@NonNull Track.Id trackId, @NonNull TrackStatistics trackStatistics) {
-        if (!isDistanceFrequency() || periodicTask == null) {
-            return;
-        }
-
-        if (trackStatistics.getTotalDistance().greaterThan(nextTaskDistance)) {
-            periodicTask.run(trackId, trackStatistics);
-            this.trackStatistics = trackStatistics;
-            updateNextTaskDistance();
-        }
-    }
-
-    public void setTaskFrequency(int taskFrequency) {
-        this.taskFrequency = taskFrequency;
-        restore();
-    }
-
-    public void setMetricUnits(boolean metricUnits) {
-        this.metricUnits = metricUnits;
-        updateNextTaskDistance();
-    }
-
-    private void updateNextTaskDistance() {
-        if (!trackRecordingService.isRecording() || trackRecordingService.isPaused() || periodicTask == null) {
-            return;
-        }
-
-        if (!isDistanceFrequency()) {
-            nextTaskDistance = Distance.of(Double.MAX_VALUE);
-            Log.d(TAG, "SplitManager: Distance splits disabled.");
-            return;
-        }
-
-        if (trackStatistics == null) {
-            return;
-        }
-
-        nextTaskDistance = calculateNextTaskDistance(trackStatistics);
-    }
-
-    @VisibleForTesting
-    public Distance calculateNextTaskDistance(TrackStatistics trackStatistics) {
-        Distance distance = trackStatistics.getTotalDistance();
-
-        Distance announcementInterval = Distance.one(metricUnits).multipliedBy(Math.abs(taskFrequency));
-        int index = (int) (distance.dividedBy(announcementInterval));
-        return announcementInterval.multipliedBy(index + 1);
-    }
-
-    /**
-     * True if time frequency.
-     */
-    private boolean isTimeFrequency() {
-        return taskFrequency > 0;
-    }
-
-    /**
-     * True if distance frequency.
-     */
-    private boolean isDistanceFrequency() {
-        return taskFrequency < 0;
-    }
-}

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

@@ -1,37 +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 androidx.annotation.NonNull;
-
-/**
- * An interface for classes that can create {@link PeriodicTask}.
- *
- * @author Sandor Dornbush
- */
-interface PeriodicTaskFactory {
-
-    /**
-     * Creates a {@link PeriodicTask}.
-     *
-     * @return the task, or null if the task is not supported
-     */
-    @NonNull
-    PeriodicTask create(Context context);
-}

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

@@ -1,79 +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.tasks;
-
-import java.time.Duration;
-import java.util.Date;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import de.dennisguse.opentracks.services.TrackRecordingService;
-
-/**
- * This class will periodically perform a task.
- *
- * @author Sandor Dornbush
- */
-class TimerTaskExecutor {
-
-    private final PeriodicTask periodicTask;
-    private final TrackRecordingService trackRecordingService;
-
-    private TimerTask timerTask;
-    private Timer timer;
-
-    public TimerTaskExecutor(PeriodicTask periodicTask, TrackRecordingService trackRecordingService) {
-        this.periodicTask = periodicTask;
-        this.trackRecordingService = trackRecordingService;
-    }
-
-    /**
-     * Schedules the periodic task.
-     */
-    void scheduleTask(Duration interval) {
-        if (!trackRecordingService.isRecording() || trackRecordingService.isPaused()) {
-            return;
-        }
-
-        shutdown();
-        periodicTask.start();
-        timerTask = new TimerTask() {
-            @Override
-            public void run() {
-                trackRecordingService.run(periodicTask);
-            }
-        };
-        timer = new Timer(TimerTaskExecutor.class.getSimpleName());
-
-        //TODO Simplify: far too complicated for it's purpose
-        long next = System.currentTimeMillis() + interval.toMillis() - (trackRecordingService.getTotalTime().toMillis() % interval.toMillis());
-        timer.scheduleAtFixedRate(timerTask, new Date(next), interval.toMillis());
-    }
-
-    void shutdown() {
-        if (timerTask != null) {
-            timerTask.cancel();
-            timerTask = null;
-        }
-        if (timer != null) {
-            timer.cancel();
-            timer.purge();
-            timer = null;
-        }
-        periodicTask.shutdown();
-    }
-}

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

@@ -19,6 +19,7 @@ package de.dennisguse.opentracks.services.tasks;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.media.AudioManager;
+import android.media.MediaPlayer;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.UtteranceProgressListener;
 import android.util.Log;
@@ -28,6 +29,7 @@ import androidx.annotation.NonNull;
 import java.util.Arrays;
 import java.util.Locale;
 
+import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
@@ -38,13 +40,15 @@ import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
 
 /**
- * This class will periodically announce the user's {@link TrackStatistics}.
+ * This class will announce the user's {@link TrackStatistics}.
  *
  * @author Sandor Dornbush
  */
-public class AnnouncementPeriodicTask implements PeriodicTask {
+public class VoiceAnnouncement {
 
-    private static final String TAG = AnnouncementPeriodicTask.class.getSimpleName();
+    public final static int AUDIO_STREAM = TextToSpeech.Engine.DEFAULT_STREAM;
+
+    private static final String TAG = VoiceAnnouncement.class.getSimpleName();
 
     private final Context context;
 
@@ -79,7 +83,7 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
     private final UtteranceProgressListener utteranceListener = new UtteranceProgressListener() {
         @Override
         public void onStart(String utteranceId) {
-            int result = audioManager.requestAudioFocus(audioFocusChangeListener, TextToSpeech.Engine.DEFAULT_STREAM, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
+            int result = audioManager.requestAudioFocus(audioFocusChangeListener, AUDIO_STREAM, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
             if (result == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
                 Log.w(TAG, "Failed to request audio focus.");
             }
@@ -107,14 +111,14 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
 
     private boolean ttsReady = false;
 
-    AnnouncementPeriodicTask(Context context) {
+    private MediaPlayer ttsFallback;
+
+    VoiceAnnouncement(Context context) {
         this.context = context;
         audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         contentProviderUtils = new ContentProviderUtils(context);
-
     }
 
-    @Override
     public void start() {
         Log.d(TAG, "Start");
 
@@ -126,10 +130,14 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
                 ttsInitStatus = status;
             });
         }
+        if (ttsFallback == null) {
+            ttsFallback = MediaPlayer.create(context, R.raw.tts_fallback);
+            ttsFallback.setAudioStreamType(AUDIO_STREAM);
+            ttsFallback.setLooping(false);
+        }
     }
 
-    @Override
-    public void run(@NonNull Track.Id trackId, @NonNull TrackStatistics trackStatistics) {
+    public void announce(@NonNull Track track) {
         synchronized (this) {
             if (!ttsReady) {
                 ttsReady = ttsInitStatus == TextToSpeech.SUCCESS;
@@ -137,45 +145,49 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
                     onTtsReady();
                 }
             }
-            if (!ttsReady) {
-                Log.i(TAG, "TTS not ready.");
-                return;
-            }
         }
 
         if (Arrays.asList(AudioManager.MODE_IN_CALL, AudioManager.MODE_IN_COMMUNICATION)
                 .contains(audioManager.getMode())) {
-            Log.i(TAG, "Speech is not allowed at this time.");
+            Log.i(TAG, "Announcement is not allowed at this time.");
             return;
         }
 
-        Track track = contentProviderUtils.getTrack(trackId);
-        if (track == null) {
-            Log.i(TAG, "It doesn't exists a track with trackid = " + track);
+        if (!ttsReady) {
+            Log.i(TAG, "TTS not ready/available, just generating a tone.");
+            ttsFallback.seekTo(0);
+            ttsFallback.start();
             return;
         }
-        String category = track.getCategory();
+
 
         boolean isMetricUnits = PreferencesUtils.isMetricUnits(sharedPreferences, context);
-        boolean isReportSpeed = PreferencesUtils.isReportSpeed(sharedPreferences, context, category);
+        boolean isReportSpeed = PreferencesUtils.isReportSpeed(sharedPreferences, context, track.getCategory());
         Distance minGPSDistance = PreferencesUtils.getRecordingDistanceInterval(sharedPreferences, context);
 
+        //TODO Do not load all trackpoints for every announcement
         TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), null);
         IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.one(isMetricUnits), minGPSDistance);
         intervalStatistics.addTrackPoints(trackPointIterator);
         IntervalStatistics.Interval lastInterval = intervalStatistics.getLastInterval();
 
-        String announcement = AnnouncementUtils.getAnnouncement(context, trackStatistics, isMetricUnits, isReportSpeed, lastInterval);
-        speakAnnouncement(announcement);
+        String announcement = AnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), isMetricUnits, isReportSpeed, lastInterval);
+
+        // We don't care about the utterance id. It is supplied here to force onUtteranceCompleted to be called.
+        tts.speak(announcement, TextToSpeech.QUEUE_FLUSH, null, "not used");
     }
 
-    @Override
     public void shutdown() {
         if (tts != null) {
             tts.shutdown();
             tts = null;
         }
 
+        if (ttsFallback != null) {
+            ttsFallback.release();
+            ttsFallback = null;
+        }
+
         sharedPreferences = null;
     }
 
@@ -194,23 +206,4 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
         tts.setSpeechRate(PreferencesUtils.getVoiceSpeedRate(PreferencesUtils.getSharedPreferences(context), context));
         tts.setOnUtteranceProgressListener(utteranceListener);
     }
-
-    private void speakAnnouncement(String announcement) {
-        // We don't care about the utterance id. It is supplied here to force onUtteranceCompleted to be called.
-        tts.speak(announcement, TextToSpeech.QUEUE_FLUSH, null, "not used");
-    }
-
-    /**
-     * A {@link PeriodicTaskFactory} for text-to-speech announcement periodic task.
-     *
-     * @author Rodrigo Damazio
-     */
-    public static class Factory implements PeriodicTaskFactory {
-
-        @Override
-        @NonNull
-        public PeriodicTask create(Context context) {
-            return new AnnouncementPeriodicTask(context);
-        }
-    }
 }

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

@@ -0,0 +1,148 @@
+/*
+ * 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.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
+import java.time.Duration;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+
+/**
+ * Execute a periodic task on a time or distance schedule.
+ *
+ * @author Sandor Dornbush
+ */
+public class VoiceAnnouncementManager {
+
+    private static final String TAG = VoiceAnnouncementManager.class.getSimpleName();
+
+    private final TrackRecordingService trackRecordingService;
+
+    private VoiceAnnouncement voiceAnnouncement;
+
+    private TrackStatistics trackStatistics;
+
+    private static final Distance DISTANCE_OFF = Distance.of(Double.MAX_VALUE);
+    private Distance distanceFrequency = DISTANCE_OFF;
+    @NonNull
+    private Distance nextTotalDistance = DISTANCE_OFF;
+
+    private static final Duration TOTALTIME_OFF = Duration.ofMillis(Long.MAX_VALUE);
+    private Duration totalTimeFrequency = TOTALTIME_OFF;
+    @NonNull
+    private Duration nextTotalTime = TOTALTIME_OFF;
+
+    public VoiceAnnouncementManager(@NonNull TrackRecordingService trackRecordingService) {
+        this.trackRecordingService = trackRecordingService;
+    }
+
+    public void restore(@Nullable TrackStatistics trackStatistics) {
+        voiceAnnouncement = new VoiceAnnouncement(trackRecordingService);
+        voiceAnnouncement.start();
+
+        this.trackStatistics = trackStatistics;
+
+        if (!totalTimeFrequency.isZero()) {
+            nextTotalTime = calculateNextDuration();
+        }
+        if (!distanceFrequency.isZero()) {
+            nextTotalDistance = calculateNextTaskDistance();
+        }
+    }
+
+    public void update(@NonNull Track track) {
+        if (voiceAnnouncement == null) {
+            Log.e(TAG, "Cannot update when in status shutdown.");
+            return;
+        }
+
+        boolean announce = false;
+        this.trackStatistics = track.getTrackStatistics();
+        if (trackStatistics.getTotalDistance().greaterThan(nextTotalDistance)) {
+            nextTotalDistance = calculateNextTaskDistance();
+            announce = true;
+        }
+        if (!trackStatistics.getTotalTime().minus(nextTotalTime).isNegative()) {
+            nextTotalTime = calculateNextDuration();
+            announce = true;
+        }
+
+        if (announce) {
+            voiceAnnouncement.announce(track);
+        }
+    }
+
+    public void shutdown() {
+        if (voiceAnnouncement != null) {
+            voiceAnnouncement.shutdown();
+            voiceAnnouncement = null;
+        }
+    }
+
+    public void setFrequency(Duration frequency) {
+        this.totalTimeFrequency = frequency;
+        restore(this.trackStatistics);
+    }
+
+    public void setFrequency(Distance frequency) {
+        this.distanceFrequency = frequency;
+        restore(this.trackStatistics);
+    }
+
+    @VisibleForTesting
+    public Distance calculateNextTaskDistance() {
+        if (trackStatistics == null) {
+            return DISTANCE_OFF;
+        }
+
+        Distance distance = trackStatistics.getTotalDistance();
+
+        int index = (int) (distance.dividedBy(distanceFrequency));
+        return distanceFrequency.multipliedBy(index + 1);
+    }
+
+    private Duration calculateNextDuration() {
+        if (trackStatistics == null) {
+            return TOTALTIME_OFF;
+        }
+
+        Duration totalTime = trackStatistics.getTotalTime();
+        Duration intervalMod = Duration.ofMillis(trackStatistics.getTotalTime().toMillis() % totalTimeFrequency.toMillis());
+
+        return totalTime.plus(totalTimeFrequency.minus(intervalMod));
+    }
+
+    @VisibleForTesting
+    @NonNull
+    public Duration getNextTotalTime() {
+        return nextTotalTime;
+    }
+
+    @VisibleForTesting
+    @NonNull
+    public Distance getNextTotalDistance() {
+        return nextTotalDistance;
+    }
+}

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

@@ -14,11 +14,7 @@ final class PreferenceHelper {
         for (int i = 0; i < entryValues.length; i++) {
             int value = Integer.parseInt(entryValues[i]);
 
-            if (value == PreferencesUtils.getMinRecordingIntervalAdaptAccuracy(context)) {
-                entries[i] = context.getString(R.string.value_adapt_accuracy);
-            } else if (value == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) {
-                entries[i] = context.getString(R.string.value_adapt_battery_life);
-            } else if (value == PreferencesUtils.getMinRecordingIntervalDefault(context)) {
+            if (value == PreferencesUtils.getMinRecordingIntervalDefault(context).getSeconds()) {
                 entries[i] = context.getString(R.string.value_smallest_recommended);
             } else {
                 entries[i] = value < 60 ? context.getString(R.string.value_integer_second, value) : context.getString(R.string.value_integer_minute, value / 60);

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

@@ -35,15 +35,23 @@ public class ResetDialogPreference extends DialogPreference {
 
         @Override
         public void onDialogClosed(boolean positiveResult) {
-            if (positiveResult) {
-                FragmentActivity activity = getActivity();
+            if (!positiveResult) {
+                return;
+            }
 
+            FragmentActivity activity = getActivity();
+
+            String preferenceKey = getArguments().getString(PreferenceDialogFragmentCompat.ARG_KEY);
+            if (preferenceKey.equals(getString(R.string.settings_reset_key))) {
                 PreferencesUtils.resetPreferences(activity, true);
                 Toast.makeText(activity, R.string.settings_reset_done, Toast.LENGTH_SHORT).show();
+            } else if (preferenceKey.equals(getString(R.string.settings_layout_reset_key))) {
+                PreferencesUtils.resetCustomLayoutPreferences(activity);
+                Toast.makeText(activity, R.string.settings_layout_reset_done, Toast.LENGTH_SHORT).show();
+            }
 
-                if (activity instanceof ResetCallback) {
-                    ((ResetCallback) activity).onReset();
-                }
+            if (activity instanceof ResetCallback) {
+                ((ResetCallback) activity).onReset();
             }
         }
     }

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

@@ -3,12 +3,10 @@ package de.dennisguse.opentracks.settings;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.speech.tts.TextToSpeech;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.documentfile.provider.DocumentFile;
@@ -98,9 +96,6 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
 
     public static class PrefsFragment extends PreferenceFragmentCompat {
 
-        private TextToSpeech tts;
-        private int ttsInitStatus;
-
         private SharedPreferences sharedPreferences;
 
         private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> {
@@ -133,23 +128,6 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
         // Used to forward update from ChooseActivityTypeDialogFragment; TODO Could be replaced with LiveData.
         private ActivityTypePreference.ActivityPreferenceDialog activityPreferenceDialog;
 
-        private Preference announcementsFrequency;
-        private Preference announcementsSpeed;
-
-        @Override
-        public void onCreate(@Nullable Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            ttsInitStatus = TextToSpeech.ERROR;
-            tts = new TextToSpeech(getContext(), status -> {
-                ttsInitStatus = status;
-                Log.i(TAG, "TextToSpeech initialized with status " + status);
-
-                if (announcementsFrequency != null && announcementsSpeed != null) {
-                    updateVoiceAnnouncements();
-                }
-            });
-        }
-
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             sharedPreferences = PreferencesUtils.getSharedPreferences(getContext());
@@ -203,14 +181,17 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
             findPreference(getString(R.string.min_recording_interval_key))
                     .setSummaryProvider(
                             preference -> {
-                                Duration interval = Duration.ofSeconds(PreferencesUtils.getMinRecordingInterval(sharedPreferences, getContext()));
+                                Duration interval = PreferencesUtils.getMinRecordingInterval(sharedPreferences, getContext());
                                 return getString(R.string.settings_recording_location_frequency_summary, getString(R.string.value_integer_second, interval.getSeconds()));
                             }
                     );
 
-            announcementsFrequency = findPreference(getString(R.string.voice_frequency_key));
-            announcementsSpeed = findPreference(getString(R.string.voice_speed_rate_key));
-            updateVoiceAnnouncements();
+            Preference customLayoutPreference = findPreference(getString(R.string.stats_custom_layout_key));
+            customLayoutPreference.setOnPreferenceClickListener((preference) -> {
+                Intent intent = new Intent(getContext(), SettingsCustomLayoutActivity.class);
+                startActivity(intent);
+                return true;
+            });
         }
 
         @Override
@@ -271,9 +252,6 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
             super.onDestroy();
             trackRecordingServiceConnection.unbind(getContext());
             sharedPreferences = null;
-            announcementsFrequency = null;
-            announcementsSpeed = null;
-            tts = null;
         }
 
         public void setDefaultActivity(String iconValue) {
@@ -306,8 +284,11 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
         private void updateUnits() {
             boolean metricUnits = PreferencesUtils.isMetricUnits(sharedPreferences, getActivity());
 
-            ListPreference voiceFrequency = findPreference(getString(R.string.voice_frequency_key));
-            voiceFrequency.setEntries(StringUtils.getFrequencyOptions(getActivity(), metricUnits));
+            ListPreference voiceFrequency = findPreference(getString(R.string.voice_announcement_frequency_key));
+            voiceFrequency.setEntries(StringUtils.getAnnouncementFrequency(getActivity()));
+
+            ListPreference voiceDistance = findPreference(getString(R.string.voice_announcement_distance_key));
+            voiceDistance.setEntries(StringUtils.getAnnouncementDistance(getActivity(), metricUnits));
 
             ListPreference minRecordingInterval = findPreference(getString(R.string.min_recording_interval_key));
             minRecordingInterval.setEntries(PreferenceHelper.getMinRecordingIntervalEntries(getActivity()));
@@ -367,12 +348,6 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
             });
         }
 
-        private void updateVoiceAnnouncements() {
-            boolean enabled = ttsInitStatus == TextToSpeech.SUCCESS;
-            announcementsFrequency.setEnabled(enabled);
-            announcementsSpeed.setEnabled(enabled);
-        }
-
         private void onRecordingStatusChanged(TrackRecordingService.RecordingStatus status) {
             this.recordingStatus = status;
             if (!status.isRecording() && isAdded()) {

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

@@ -0,0 +1,170 @@
+package de.dennisguse.opentracks.settings;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ScrollView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.stream.IntStream;
+
+import de.dennisguse.opentracks.AbstractActivity;
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.adapters.SettingsCustomLayoutAdapter;
+import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.databinding.ActivitySettingsCustomLayoutBinding;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StatisticsUtils;
+
+public class SettingsCustomLayoutActivity extends AbstractActivity implements SettingsCustomLayoutAdapter.SettingsCustomLayoutItemClickListener {
+
+    private ActivitySettingsCustomLayoutBinding viewBinding;
+    private GridLayoutManager gridLayoutManager;
+    private SettingsCustomLayoutAdapter adapterFieldsVisible;
+    private SettingsCustomLayoutAdapter adapterFieldsHidden;
+    private Layout layoutFieldsVisible;
+    private Layout layoutFieldsHidden;
+    private SharedPreferences sharedPreferences;
+    private int numColumns;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
+
+        // Recycler view with visible stats.
+        layoutFieldsVisible = StatisticsUtils.filterVisible(PreferencesUtils.getCustomLayout(sharedPreferences, this), true);
+        adapterFieldsVisible = new SettingsCustomLayoutAdapter(this, this, layoutFieldsVisible);
+
+        numColumns = PreferencesUtils.getLayoutColumns(sharedPreferences, this);
+        RecyclerView recyclerViewVisible = viewBinding.recyclerViewVisible;
+        gridLayoutManager = new GridLayoutManager(this, numColumns);
+        gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                if (adapterFieldsVisible.isItemWide(position)) {
+                    return numColumns;
+                }
+                return 1;
+            }
+        });
+        recyclerViewVisible.setLayoutManager(gridLayoutManager);
+        recyclerViewVisible.setAdapter(adapterFieldsVisible);
+
+        ItemTouchHelper.SimpleCallback simpleCallback = new ItemTouchHelper.SimpleCallback(
+                ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.START | ItemTouchHelper.END, 0) {
+            @Override
+            public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+                int fromPosition = viewHolder.getAdapterPosition();
+                int toPosition = target.getAdapterPosition();
+                layoutFieldsVisible = adapterFieldsVisible.move(fromPosition, toPosition);
+                return true;
+            }
+
+            @Override
+            public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
+            }
+        };
+
+        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleCallback);
+        itemTouchHelper.attachToRecyclerView(recyclerViewVisible);
+
+        // Spinner with items per row.
+        ArrayAdapter<Integer> spinnerAdapter = new ArrayAdapter<>(this,
+                android.R.layout.simple_spinner_dropdown_item,
+                IntStream.of(getResources().getIntArray(R.array.stats_custom_layout_fields_columns_per_row)).boxed().toArray(Integer[]::new));
+        viewBinding.spinnerOptions.setAdapter(spinnerAdapter);
+        viewBinding.spinnerOptions.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                numColumns = position + 1;
+                gridLayoutManager.setSpanCount(numColumns);
+                PreferencesUtils.setLayoutColumns(sharedPreferences, SettingsCustomLayoutActivity.this, position + 1);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+        viewBinding.spinnerOptions.setSelection(PreferencesUtils.getLayoutColumns(sharedPreferences, SettingsCustomLayoutActivity.this) - 1);
+
+        // Recycler view with not visible stats.
+        layoutFieldsHidden = StatisticsUtils.filterVisible(PreferencesUtils.getCustomLayout(sharedPreferences, this), false);
+        adapterFieldsHidden = new SettingsCustomLayoutAdapter(this, this, layoutFieldsHidden);
+        RecyclerView recyclerViewNotVisible = viewBinding.recyclerViewNotVisible;
+        recyclerViewNotVisible.setLayoutManager(new LinearLayoutManager(this));
+        recyclerViewNotVisible.setAdapter(adapterFieldsHidden);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (!layoutFieldsVisible.getFields().isEmpty() || !layoutFieldsHidden.getFields().isEmpty()) {
+            Layout newLayout = new Layout(layoutFieldsVisible.getProfile());
+            newLayout.addFields(layoutFieldsVisible.getFields());
+            newLayout.addFields(layoutFieldsHidden.getFields());
+            PreferencesUtils.setCustomLayout(sharedPreferences, this, newLayout);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        sharedPreferences = null;
+        layoutFieldsVisible = null;
+    }
+
+    @Override
+    protected void setupActionBarBack(Toolbar toolbar) {
+        super.setupActionBarBack(toolbar);
+        toolbar.setTitle(R.string.menu_settings);
+    }
+
+    @Override
+    protected View getRootView() {
+        viewBinding = ActivitySettingsCustomLayoutBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
+    }
+
+    @Override
+    public void onSettingsCustomLayoutItemClicked(@NonNull DataField field) {
+        if (field.isVisible()) {
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.generic_choose_an_option)
+                    .setItems(new String[]{getString(field.isPrimary() ? R.string.field_set_secondary : R.string.field_set_primary), getString(R.string.field_remove_from_layout)}, (dialog, which) -> {
+                        if (which == 0) {
+                            field.togglePrimary();
+                        } else {
+                            layoutFieldsVisible.removeField(field);
+                            field.toggleVisibility();
+                            layoutFieldsHidden.addField(field);
+                        }
+
+                        adapterFieldsVisible.swapValues(layoutFieldsVisible);
+                        adapterFieldsHidden.swapValues(layoutFieldsHidden);
+                    })
+                    .create()
+                    .show();
+        } else {
+            layoutFieldsHidden.removeField(field);
+            field.toggleVisibility();
+            layoutFieldsVisible.addField(field);
+            viewBinding.scrollView.fullScroll(ScrollView.FOCUS_UP);
+
+            adapterFieldsVisible.swapValues(layoutFieldsVisible);
+            adapterFieldsHidden.swapValues(layoutFieldsHidden);
+        }
+    }
+}

src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java

@@ -1,5 +1,6 @@
 package de.dennisguse.opentracks.settings.bluetooth;
 
+import android.Manifest;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.le.BluetoothLeScanner;
 import android.bluetooth.le.ScanCallback;
@@ -8,6 +9,8 @@ import android.bluetooth.le.ScanResult;
 import android.bluetooth.le.ScanSettings;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.ParcelUuid;
 import android.text.TextUtils;
@@ -15,7 +18,10 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
 import androidx.preference.DialogPreference;
 import androidx.preference.PreferenceDialogFragmentCompat;
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
@@ -143,13 +149,39 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
 
-            List<ParcelUuid> serviceUUIDs = getArguments().getParcelableArrayList(ARG_BLE_SERVICE_UUIDS);
-
             // Don't know why: need to load the drawable _twice_, so that animation is actually started.
             bluetoothIcon = AnimatedVectorDrawableCompat.create(getContext(), R.drawable.ic_bluetooth_searching_animated_24dp);
             bluetoothIcon = AnimatedVectorDrawableCompat.create(getContext(), R.drawable.ic_bluetooth_searching_animated_24dp);
             bluetoothIcon.start();
 
+            if (
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && (
+                            ContextCompat.checkSelfPermission(getContext(), Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED ||
+                                    ContextCompat.checkSelfPermission(getContext(), Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED
+                    )
+            ) {
+                ActivityResultLauncher<String[]> requestPermissionLauncher =
+                        registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), granted -> {
+                            if (!granted.containsValue(false)) {
+                                startBluetoothScan();
+                            } else if (shouldShowRequestPermissionRationale(Manifest.permission.BLUETOOTH_SCAN) || shouldShowRequestPermissionRationale(Manifest.permission.BLUETOOTH_CONNECT)) {
+                                Toast.makeText(getContext(), R.string.permission_bluetooth_failed_rejected, Toast.LENGTH_LONG).show();
+                                dismiss();
+                            } else {
+                                Toast.makeText(getContext(), R.string.permission_bluetooth_failed, Toast.LENGTH_SHORT).show();
+                                dismiss();
+                            }
+                        });
+
+                requestPermissionLauncher.launch(new String[]{Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.BLUETOOTH_SCAN});
+            } else {
+                startBluetoothScan();
+            }
+        }
+
+        private void startBluetoothScan() {
+            List<ParcelUuid> serviceUUIDs = getArguments().getParcelableArrayList(ARG_BLE_SERVICE_UUIDS);
+
             BluetoothAdapter bluetoothAdapter = BluetoothUtils.getAdapter(getContext());
             if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled()) {
                 Log.w(TAG, "Bluetooth adapter is present or not enabled.");

src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java

@@ -178,7 +178,9 @@ public class TrackStatisticsUpdater {
         }
 
         // Update moving time
-        currentSegment.addMovingTime(movingTime);
+        if (lastTrackPoint.isMoving()) {
+            currentSegment.addMovingTime(movingTime);
+        }
 
         // Update max speed
         if (trackPoint.hasSpeed() && lastTrackPoint.hasSpeed()) {
@@ -271,6 +273,7 @@ public class TrackStatisticsUpdater {
         return true;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "TrackStatisticsUpdater{" +

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

@@ -0,0 +1,10 @@
+package de.dennisguse.opentracks.util;
+
+public final class CsvConstants {
+    private CsvConstants() {
+
+    }
+
+    public static final String LINE_SEPARATOR = ";";
+    public static final String ITEM_SEPARATOR = ",";
+}

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

@@ -0,0 +1,41 @@
+package de.dennisguse.opentracks.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import de.dennisguse.opentracks.R;
+
+public class PreferencesOpenHelper {
+    private final Context context;
+    private final SharedPreferences sharedPreferences;
+
+    private static final int PREFERENCES_VERSION = 1;
+
+    private PreferencesOpenHelper(Context context, SharedPreferences sharedPreferences) {
+        this.context = context;
+        this.sharedPreferences = sharedPreferences;
+    }
+
+    public static PreferencesOpenHelper newInstance(Context context, SharedPreferences sharedPreferences) {
+        return new PreferencesOpenHelper(context, sharedPreferences);
+    }
+
+    public void checkForUpgrade() {
+        int lastVersion = PreferencesUtils.getInt(sharedPreferences, context, R.string.prefs_last_version_key, 0);
+        if (PREFERENCES_VERSION > lastVersion) {
+            onUpgrade();
+        }
+    }
+
+    private void onUpgrade() {
+        PreferencesUtils.setInt(sharedPreferences, context, R.string.prefs_last_version_key, PREFERENCES_VERSION);
+        switch (PREFERENCES_VERSION) {
+            case 1:
+                upgradeFrom0to1();
+        }
+    }
+
+    private void upgradeFrom0to1() {
+        PreferencesUtils.setString(sharedPreferences, context, R.string.stats_custom_layout_fields_key, PreferencesUtils.buildDefaultLayout(context));
+    }
+}

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

@@ -16,9 +16,11 @@
 
 package de.dennisguse.opentracks.util;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.content.res.TypedArray;
 import android.net.Uri;
 import android.util.Log;
 
@@ -26,8 +28,18 @@ import androidx.annotation.VisibleForTesting;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.preference.PreferenceManager;
 
+import java.time.Duration;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.DataField;
 import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 
 /**
@@ -44,7 +56,9 @@ public class PreferencesUtils {
 
     @Deprecated //Should only be used to get a sharedPreference for more than one interaction!
     public static SharedPreferences getSharedPreferences(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        PreferencesOpenHelper.newInstance(context, sharedPreferences).checkForUpgrade();
+        return sharedPreferences;
     }
 
     public static String getDefaultActivity(SharedPreferences sharedPreferences, Context context) {
@@ -76,11 +90,20 @@ public class PreferencesUtils {
         return key == null || key.equals(getKey(context, keyId));
     }
 
+    public static boolean isKey(Context context, int[] keyIds, String key) {
+        for(int keyId : keyIds) {
+            if (isKey(context, keyId, key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static boolean getBoolean(SharedPreferences sharedPreferences, Context context, int keyId, boolean defaultValue) {
         return sharedPreferences.getBoolean(getKey(context, keyId), defaultValue);
     }
 
-    private static int getInt(SharedPreferences sharedPreferences, Context context, int keyId, int defaultValue) {
+    static int getInt(SharedPreferences sharedPreferences, Context context, int keyId, int defaultValue) {
         try {
             return sharedPreferences.getInt(getKey(context, keyId), defaultValue);
         } catch (ClassCastException e) {
@@ -123,6 +146,12 @@ public class PreferencesUtils {
         editor.apply();
     }
 
+    static void setInt(SharedPreferences sharedPreferences, Context context, int keyId, int value) {
+        Editor editor = sharedPreferences.edit();
+        editor.putInt(getKey(context, keyId), value);
+        editor.apply();
+    }
+
     public static boolean isMetricUnits(SharedPreferences sharedPreferences, Context context) {
         final String STATS_UNIT = context.getString(R.string.stats_units_default);
         return STATS_UNIT.equals(getString(sharedPreferences, context, R.string.stats_units_key, STATS_UNIT));
@@ -196,23 +225,23 @@ public class PreferencesUtils {
         return getBoolean(sharedPreferences, context, R.string.stats_fullscreen_while_recording_key, DEFAULT);
     }
 
-    public static boolean isShowStatsAltitude(SharedPreferences sharedPreferences, Context context) {
-        final boolean STATS_SHOW_ALTITUDE = context.getResources().getBoolean(R.bool.stats_show_altitude_default);
-        return getBoolean(sharedPreferences, context, R.string.stats_show_grade_altitude_key, STATS_SHOW_ALTITUDE);
+    public static Duration getVoiceAnnouncementFrequency(SharedPreferences sharedPreferences, Context context) {
+        final int DEFAULT = Integer.parseInt(context.getResources().getString(R.string.voice_announcement_frequency_default));
+        int value = getInt(sharedPreferences, context, R.string.voice_announcement_frequency_key, DEFAULT);
+        return Duration.ofSeconds(value);
     }
 
-    public static boolean isStatsShowCoordinate(SharedPreferences sharedPreferences, Context context) {
-        final boolean STATS_SHOW_COORDINATE = context.getResources().getBoolean(R.bool.stats_show_coordinate_default);
-        return getBoolean(sharedPreferences, context, R.string.stats_show_coordinate_key, STATS_SHOW_COORDINATE);
-    }
-
-    public static int getVoiceFrequency(SharedPreferences sharedPreferences, Context context) {
-        final int VOICE_FREQUENCY_DEFAULT = Integer.parseInt(context.getResources().getString(R.string.voice_frequency_default));
-        return getInt(sharedPreferences, context, R.string.voice_frequency_key, VOICE_FREQUENCY_DEFAULT);
+    /**
+     * @return Result depends on isMetricUnits
+     */
+    public static Distance getVoiceAnnouncementDistance(SharedPreferences sharedPreferences, Context context) {
+        final float DEFAULT = Integer.parseInt(context.getResources().getString(R.string.voice_announcement_distance_default));
+        float value = getFloat(sharedPreferences, context, R.string.voice_announcement_distance_key, DEFAULT);
+        return Distance.one(isMetricUnits(sharedPreferences, context)).multipliedBy(value);
     }
 
     public static float getVoiceSpeedRate(SharedPreferences sharedPreferences, Context context) {
-        final float DEFAULT = Float.parseFloat(context.getResources().getString(R.string.voice_frequency_default));
+        final float DEFAULT = Float.parseFloat(context.getResources().getString(R.string.voice_speed_rate_default));
         return getFloat(sharedPreferences, context, R.string.voice_speed_rate_key, DEFAULT);
     }
 
@@ -233,22 +262,19 @@ public class PreferencesUtils {
         return Distance.of(getInt(sharedPreferences, context, R.string.max_recording_distance_key, MAX_RECORDING_DISTANCE));
     }
 
-    //TODO Duration
-    public static int getMinRecordingInterval(SharedPreferences sharedPreferences, Context context) {
-        final int MIN_RECORDING_INTERVAL = Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default));
-        return getInt(sharedPreferences, context, R.string.min_recording_interval_key, MIN_RECORDING_INTERVAL);
+    public static Duration getMinRecordingInterval(SharedPreferences sharedPreferences, Context context) {
+        final Duration MIN_RECORDING_INTERVAL = getMinRecordingIntervalDefault(context);
+        Duration interval = Duration.ofSeconds(getInt(sharedPreferences, context, R.string.min_recording_interval_key, (int) MIN_RECORDING_INTERVAL.getSeconds()));
+
+        if (interval.isNegative()) {
+            // Due to removal of adaptive listener policy; used -1, and -2
+            interval = getMinRecordingIntervalDefault(context);
+        }
+        return 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 Duration getMinRecordingIntervalDefault(Context context) {
+        return Duration.ofSeconds(Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)));
     }
 
     public static Distance getThresholdHorizontalAccuracy(SharedPreferences sharedPreferences, Context context) {
@@ -318,4 +344,78 @@ public class PreferencesUtils {
     public static boolean isDefaultExportDirectoryUri(SharedPreferences sharedPreferences, Context context) {
         return getDefaultExportDirectoryUri(sharedPreferences, context) != null;
     }
+
+    public static int getLayoutColumns(SharedPreferences sharedPreferences, Context context) {
+        return getInt(sharedPreferences, context, R.string.stats_custom_layout_columns_key, context.getResources().getInteger(R.integer.stats_custom_layout_columns_default));
+    }
+
+    public static void setLayoutColumns(SharedPreferences sharedPreferences, Context context, int columns) {
+        setInt(sharedPreferences, context, R.string.stats_custom_layout_columns_key, columns);
+    }
+
+    private static List<TypedArray> getMultiTypedArray(Context context, String key) {
+        List<TypedArray> typedArrays = new ArrayList<>();
+
+        try {
+            Class<R.array> resource = R.array.class;
+            Field field;
+            int i = 0;
+
+            do {
+                field = resource.getField(key + context.getString(R.string.stats_custom_layout_fields_default_value_separator) + i);
+                typedArrays.add(context.getResources().obtainTypedArray(field.getInt(null)));
+                i++;
+            } while (field != null);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e(TAG, e.getMessage());
+        }
+
+        return typedArrays;
+    }
+
+    @SuppressLint("ResourceType")
+    static String buildDefaultLayout(Context context) {
+        List<TypedArray> fieldsArrays = getMultiTypedArray(context, "stats_custom_layout_fields_default_value");
+        return context.getString(R.string.default_activity_default) + CsvConstants.LINE_SEPARATOR
+                + fieldsArrays.stream().map(i -> i.getString(0) + CsvConstants.ITEM_SEPARATOR + i.getString(1)).collect(Collectors.joining(CsvConstants.LINE_SEPARATOR))
+                + CsvConstants.LINE_SEPARATOR;
+    }
+
+    public static Layout getCustomLayout(SharedPreferences sharedPreferences, Context context) {
+        String csvCustomLayout = getString(sharedPreferences, context, R.string.stats_custom_layout_fields_key, buildDefaultLayout(context));
+        List<String> csvParts = Arrays.asList(csvCustomLayout.split(CsvConstants.LINE_SEPARATOR));
+        Layout layout = new Layout(csvParts.get(0));
+        for (int i = 1; i < csvParts.size(); i++) {
+            String[] fieldParts = csvParts.get(i).split(CsvConstants.ITEM_SEPARATOR);
+            layout.addField(fieldParts[0], DataField.getTitleByKey(context, fieldParts[0]), fieldParts[1].equals(DataField.YES_VALUE), fieldParts[2].equals(DataField.YES_VALUE), fieldParts[0].equals(context.getString(R.string.stats_custom_layout_coordinates_key)));
+        }
+
+        return layout;
+    }
+
+    public static void setCustomLayout(SharedPreferences sharedPreferences, Context context, Layout layout) {
+        List<DataField> fields = layout.getFields();
+        if (fields.isEmpty()) {
+            return;
+        }
+
+        String csv = layout.getProfile() + CsvConstants.LINE_SEPARATOR
+                + fields.stream().map(DataField::toCsv).collect(Collectors.joining(CsvConstants.LINE_SEPARATOR)) + CsvConstants.LINE_SEPARATOR;
+        setString(sharedPreferences, context, R.string.stats_custom_layout_fields_key, csv);
+    }
+
+    public static void resetCustomLayoutPreferences(Context context) {
+        SharedPreferences settings = getSharedPreferences(context);
+        if (settings.contains(context.getString(R.string.stats_custom_layout_fields_key))) {
+            SharedPreferences.Editor editor = settings.edit();
+            editor.remove(context.getString(R.string.stats_custom_layout_fields_key));
+            editor.commit();
+        }
+        if (settings.contains(context.getString(R.string.stats_custom_layout_columns_key))) {
+            SharedPreferences.Editor editor = settings.edit();
+            editor.remove(context.getString(R.string.stats_custom_layout_columns_key));
+            editor.commit();
+        }
+    }
 }

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

@@ -0,0 +1,31 @@
+package de.dennisguse.opentracks.util;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import java.util.stream.Collectors;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Layout;
+
+public class StatisticsUtils {
+
+    public static String emptyValue(@NonNull Context context, @NonNull String statTitle) {
+        if (PreferencesUtils.isKey(context, R.string.stats_custom_layout_total_time_key, statTitle) || PreferencesUtils.isKey(context, R.string.stats_custom_layout_moving_time_key, statTitle) || PreferencesUtils.isKey(context, R.string.stats_custom_layout_pace_key, statTitle) || PreferencesUtils.isKey(context, R.string.stats_custom_layout_average_moving_pace_key, statTitle) || PreferencesUtils.isKey(context, R.string.stats_custom_layout_average_pace_key, statTitle) || PreferencesUtils.isKey(context, R.string.stats_custom_layout_fastest_pace_key, statTitle)) {
+            return context.getString(R.string.stats_empty_value_time);
+        } else if (PreferencesUtils.isKey(context, R.string.stats_custom_layout_distance_key, statTitle) || PreferencesUtils.isKey(context, R.string.stats_custom_layout_speed_key, statTitle) || PreferencesUtils.isKey(context, R.string.stats_custom_layout_average_speed_key, statTitle) || PreferencesUtils.isKey(context, R.string.stats_custom_layout_max_speed_key, statTitle) || PreferencesUtils.isKey(context, R.string.stats_custom_layout_average_moving_speed_key, statTitle)) {
+            return context.getString(R.string.stats_empty_value_float);
+        } else if (PreferencesUtils.isKey(context, R.string.stats_custom_layout_coordinates_key, statTitle)) {
+            return context.getString(R.string.stats_empty_value_coordinates);
+        } else {
+            return context.getString(R.string.stats_empty_value_integer);
+        }
+    }
+
+    public static Layout filterVisible(Layout layout, boolean visible) {
+        Layout result = new Layout(layout.getProfile());
+        result.addFields(layout.getFields().stream().filter(f -> f.isVisible() == visible).collect(Collectors.toList()));
+        return result;
+    }
+}

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

@@ -124,10 +124,22 @@ public class StringUtils {
     /**
      * Formats a coordinate
      *
+     * @param context    the context's object.
      * @param coordinate the coordinate
      */
-    public static String formatCoordinate(double coordinate) {
-        return Location.convert(coordinate, Location.FORMAT_DEGREES) + COORDINATE_DEGREE;
+    public static String formatCoordinate(Context context, double coordinate) {
+        return context.getString(R.string.location_coordinate, Location.convert(coordinate, Location.FORMAT_DEGREES));
+    }
+
+    /**
+     * Formats a complete coordinate (latitude, longitude)
+     *
+     * @param context   the context's object.
+     * @param latitude  the coordinate's latitude.
+     * @param longitude the coordinate's longitude.
+     */
+    public static String formatCoordinate(Context context, double latitude, double longitude) {
+        return context.getString(R.string.location_latitude_longitude, Location.convert(latitude, Location.FORMAT_DEGREES), Location.convert(longitude, Location.FORMAT_DEGREES));
     }
 
     /**
@@ -191,6 +203,33 @@ public class StringUtils {
         return new Pair<>(context.getString(R.string.time, minutes, seconds), unitString);
     }
 
+    public static Pair<String, String> getHeartRateParts(Context context, Float heartrate_bpm) {
+        String value = context.getString(R.string.value_none);
+        if (heartrate_bpm != null) {
+            value = StringUtils.formatDecimal(heartrate_bpm, 0);
+        }
+
+        return new Pair<>(value, context.getString(R.string.sensor_unit_beats_per_minute));
+    }
+
+    public static Pair<String, String> getCadenceParts(Context context, Float cadence_rpm) {
+        String value = context.getString(R.string.value_none);
+        if (cadence_rpm != null) {
+            value = StringUtils.formatDecimal(cadence_rpm, 0);
+        }
+
+        return new Pair<>(value, context.getString(R.string.sensor_unit_rounds_per_minute));
+    }
+
+    public static Pair<String, String> getPowerParts(Context context, Float power_w) {
+        String value = context.getString(R.string.value_none);
+        if (power_w != null) {
+            value = StringUtils.formatDecimal(power_w, 0);
+        }
+
+        return new Pair<>(value, context.getString(R.string.sensor_unit_power));
+    }
+
     /**
      * Gets a string for category.
      *
@@ -253,23 +292,29 @@ public class StringUtils {
         }
     }
 
-    /**
-     * Gets the frequency display options.
-     *
-     * @param context     the context
-     * @param metricUnits true to display in metric units
-     */
-    public static String[] getFrequencyOptions(Context context, boolean metricUnits) {
-        String[] values = context.getResources().getStringArray(R.array.frequency_values);
+    public static String[] getAnnouncementFrequency(Context context) {
+        String[] values = context.getResources().getStringArray(R.array.voice_announcement_frequency_values);
         String[] options = new String[values.length];
         for (int i = 0; i < values.length; i++) {
-            int value = Integer.parseInt(values[i]);
-            if (context.getString(R.string.frequency_off).equals(values[i])) {
+            if (context.getString(R.string.announcement_off).equals(values[i])) {
                 options[i] = context.getString(R.string.value_off);
-            } else if (value < 0) {
-                options[i] = context.getString(metricUnits ? R.string.value_integer_kilometer : R.string.value_integer_mile, Math.abs(value));
             } else {
-                options[i] = context.getString(R.string.value_integer_minute, value);
+                int value = Integer.parseInt(values[i]);
+                options[i] = context.getString(R.string.value_integer_minute, Duration.ofSeconds(value).toMinutes());
+            }
+        }
+        return options;
+    }
+
+    public static String[] getAnnouncementDistance(Context context, boolean metricUnits) {
+        String[] values = context.getResources().getStringArray(R.array.voice_announcement_distance_values);
+        String[] options = new String[values.length];
+        for (int i = 0; i < values.length; i++) {
+            if (context.getString(R.string.announcement_off).equals(values[i])) {
+                options[i] = context.getString(R.string.value_off);
+            } else {
+                int value = Integer.parseInt(values[i]);
+                options[i] = context.getString(metricUnits ? R.string.value_integer_kilometer : R.string.value_integer_mile, value);
             }
         }
         return options;
@@ -291,9 +336,24 @@ public class StringUtils {
     }
 
     public static String formatAltitude(Context context, Float altitude_m, boolean metricUnits) {
-        Pair<String, String> distanceParts = getAltitudeParts(context, altitude_m, metricUnits);
+        Pair<String, String> altitudeParts = getAltitudeParts(context, altitude_m, metricUnits);
 
-        return context.getString(R.string.altitude_with_unit, distanceParts.first, distanceParts.second);
+        return context.getString(R.string.altitude_with_unit, altitudeParts.first, altitudeParts.second);
+    }
+
+    /**
+     * @return the formatted altitudeDifference_m (or null) and it's unit as {@link Pair}
+     */
+    public static Pair<String, String> getAltitudeChangeParts(Context context, Float altitudeDifference_m, boolean metricUnits) {
+        String formattedValue = altitudeDifference_m != null ? String.valueOf((int) Distance.of(altitudeDifference_m).toM_FT(metricUnits)) : context.getString(R.string.value_unknown);
+        String unit = context.getString(metricUnits ? R.string.unit_meter : R.string.unit_feet);
+        return new Pair<>(formattedValue, unit);
+    }
+
+    public static String formatAltitudeChange(Context context, Float altitude_m, boolean metricUnits) {
+        Pair<String, String> altitudeParts = getAltitudeChangeParts(context, altitude_m, metricUnits);
+
+        return context.getString(R.string.altitude_with_unit, altitudeParts.first, altitudeParts.second);
     }
 
     public static String valueInParentheses(String text) {

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

@@ -1,13 +0,0 @@
-package de.dennisguse.opentracks.util;
-
-import android.speech.tts.TextToSpeech;
-
-public class TTSUtils {
-
-    private TTSUtils() {
-    }
-
-    public static int getTTSStream() {
-        return TextToSpeech.Engine.DEFAULT_STREAM;
-    }
-}

src/main/java/de/dennisguse/opentracks/viewmodels/SensorDataModel.java

@@ -1,56 +0,0 @@
-package de.dennisguse.opentracks.viewmodels;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.sensor.SensorData;
-import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
-import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower;
-import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
-import de.dennisguse.opentracks.util.StringUtils;
-
-public class SensorDataModel {
-    private int labelId;
-    private final String sensorValue;
-    private String sensorName;
-    private int unitId;
-
-    public SensorDataModel(int labelId, int unitId, float sensorValue) {
-        this.labelId = labelId;
-        this.unitId = unitId;
-        this.sensorValue = StringUtils.formatDecimal(sensorValue, 0);
-    }
-
-    public SensorDataModel(SensorData<Float> sensorData) {
-        this.sensorName = sensorData.getSensorNameOrAddress();
-        this.sensorValue = sensorData.hasValue() && sensorData.isRecent() ? StringUtils.formatDecimal(sensorData.getValue(), 0) : null;
-        if (sensorData instanceof SensorDataHeartRate) {
-            this.labelId = R.string.sensor_state_heart_rate;
-            this.unitId = R.string.sensor_unit_beats_per_minute;
-        } else if (sensorData instanceof SensorDataCycling.Cadence) {
-            this.labelId = R.string.sensor_state_cadence;
-            this.unitId = R.string.sensor_unit_rounds_per_minute;
-        } else if (sensorData instanceof SensorDataCyclingPower) {
-            this.labelId = R.string.sensor_state_power;
-            this.unitId = R.string.sensor_unit_power;
-        }
-    }
-
-    public int getLabelId() {
-        return labelId;
-    }
-
-    public int getUnitId() {
-        return unitId;
-    }
-
-    public String getSensorName() {
-        return sensorName;
-    }
-
-    public String getSensorValue() {
-        return sensorValue;
-    }
-
-    public boolean hasValue() {
-        return sensorValue != null;
-    }
-}

src/main/java/de/dennisguse/opentracks/viewmodels/StatisticData.java

@@ -0,0 +1,45 @@
+package de.dennisguse.opentracks.viewmodels;
+
+import android.util.Pair;
+
+import androidx.annotation.NonNull;
+
+import de.dennisguse.opentracks.content.data.DataField;
+
+public class StatisticData {
+    private final DataField dataField;
+    private final String value;
+    private final String unit;
+    private final String description;
+
+    public StatisticData(@NonNull DataField dataField, @NonNull Pair<String, String> valueAndUnit, String description) {
+        this.dataField = dataField;
+        this.value = valueAndUnit.first;
+        this.unit = valueAndUnit.second;
+        this.description = description;
+    }
+
+    public DataField getField() {
+        return dataField;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public boolean hasValue() {
+        return value != null;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public boolean hasDescription() {
+        return description != null;
+    }
+}

src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java

@@ -0,0 +1,205 @@
+package de.dennisguse.opentracks.viewmodels;
+
+import android.content.Context;
+import android.util.Pair;
+
+import androidx.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.stats.SensorStatistics;
+import de.dennisguse.opentracks.util.StringUtils;
+
+public class StatisticDataBuilder {
+
+    public static List<StatisticData> fromRecordingData(@NonNull Context context, @NonNull TrackRecordingService.RecordingData recordingData, @NonNull Layout layout, boolean metricUnits) {
+        List<StatisticData> statisticDataList = layout.getFields().stream()
+                .filter(DataField::isVisible)
+                .map(field -> build(context, recordingData, field.getKey(), field.isPrimary(), metricUnits))
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+        statisticDataList.addAll(getSensorStatsDataIfNeeded(context, recordingData, statisticDataList, metricUnits));
+        return statisticDataList;
+    }
+
+    private static StatisticData build(@NonNull Context context, @NonNull TrackRecordingService.RecordingData recordingData, @NonNull String fieldKey, boolean isPrimary, boolean metricUnits) {
+        final TrackPoint latestTrackPoint = recordingData.getLatestTrackPoint();
+        final SensorDataSet sensorDataSet = recordingData.getSensorDataSet();
+
+        String title = null;
+        String description = null;
+        Pair<String, String> valueAndUnit = null;
+        boolean isWide = false;
+        if (fieldKey.equals(context.getString(R.string.stats_custom_layout_total_time_key))) {
+            valueAndUnit = new Pair<>(StringUtils.formatElapsedTime(recordingData.getTrackStatistics().getTotalTime()), null);
+            title = context.getString(R.string.stats_total_time);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_moving_time_key))) {
+            valueAndUnit = new Pair<>(StringUtils.formatElapsedTime(recordingData.getTrackStatistics().getMovingTime()), null);
+            title = context.getString(R.string.stats_moving_time);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_distance_key))) {
+            valueAndUnit = StringUtils.getDistanceParts(context, recordingData.getTrackStatistics().getTotalDistance(), metricUnits);
+            title = context.getString(R.string.stats_distance);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_speed_key)) ||  fieldKey.equals(context.getString(R.string.stats_custom_layout_pace_key))) {
+            boolean reportSpeed = fieldKey.equals("speed");
+            title = fieldKey.equals("speed") ? context.getString(R.string.stats_speed) : context.getString(R.string.stats_pace);
+            Speed speed = latestTrackPoint != null && latestTrackPoint.hasSpeed() ? latestTrackPoint.getSpeed() : null;
+            if (sensorDataSet != null && sensorDataSet.getCyclingDistanceSpeed() != null && sensorDataSet.getCyclingDistanceSpeed().hasValue()) {
+                valueAndUnit = StringUtils.getSpeedParts(context, sensorDataSet.getCyclingDistanceSpeed().getValue().getSpeed(), metricUnits, reportSpeed);
+                description = context.getString(R.string.description_speed_source_sensor, sensorDataSet.getCyclingDistanceSpeed().getSensorNameOrAddress());
+            } else {
+                valueAndUnit = StringUtils.getSpeedParts(context, speed, metricUnits, reportSpeed);
+                description = context.getString(R.string.description_speed_source_gps);
+            }
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_average_moving_speed_key))) {
+            valueAndUnit = StringUtils.getSpeedParts(context, recordingData.getTrackStatistics().getAverageMovingSpeed(), metricUnits, true);
+            title = context.getString(R.string.stats_average_moving_speed);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_average_speed_key))) {
+            valueAndUnit = StringUtils.getSpeedParts(context, recordingData.getTrackStatistics().getAverageSpeed(), metricUnits, true);
+            title = context.getString(R.string.stats_average_speed);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_max_speed_key))) {
+            valueAndUnit = StringUtils.getSpeedParts(context, recordingData.getTrackStatistics().getMaxSpeed(), metricUnits, true);
+            title = context.getString(R.string.stats_max_speed);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_average_moving_pace_key))) {
+            valueAndUnit = StringUtils.getSpeedParts(context, recordingData.getTrackStatistics().getAverageMovingSpeed(), metricUnits, false);
+            title = context.getString(R.string.stats_average_moving_pace);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_average_pace_key))) {
+            valueAndUnit = StringUtils.getSpeedParts(context, recordingData.getTrackStatistics().getAverageSpeed(), metricUnits, false);
+            title = context.getString(R.string.stats_average_pace);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_fastest_pace_key))) {
+            valueAndUnit = StringUtils.getSpeedParts(context, recordingData.getTrackStatistics().getMaxSpeed(), metricUnits, true);
+            title = context.getString(R.string.stats_fastest_pace);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_altitude_key))) {
+            Float altitude = latestTrackPoint != null && latestTrackPoint.hasAltitude() ? (float) latestTrackPoint.getAltitude().toM() : null;
+            title = context.getString(R.string.stats_altitude);
+            description = latestTrackPoint != null && latestTrackPoint.hasAltitude() ? context.getString(latestTrackPoint.getAltitude().getLabelId()) : null;
+            valueAndUnit = StringUtils.getAltitudeParts(context, altitude, metricUnits);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_gain_key))) {
+            valueAndUnit = StringUtils.getAltitudeChangeParts(context, recordingData.getTrackStatistics().getTotalAltitudeGain(), metricUnits);
+            title = context.getString(R.string.stats_gain);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_loss_key))) {
+            valueAndUnit = StringUtils.getAltitudeChangeParts(context, recordingData.getTrackStatistics().getTotalAltitudeLoss(), metricUnits);
+            title = context.getString(R.string.stats_loss);
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_coordinates_key))) {
+            title = context.getString(R.string.stats_coordinates);
+            isWide = true;
+            if (latestTrackPoint != null && latestTrackPoint.hasLocation()) {
+                valueAndUnit = new Pair<>(StringUtils.formatCoordinate(context, latestTrackPoint.getLatitude(), latestTrackPoint.getLongitude()), null);
+            } else {
+                valueAndUnit = new Pair<>(context.getString(R.string.value_none), null);
+            }
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_heart_rate_key))) {
+            title = context.getString(R.string.stats_sensors_heart_rate);
+            if (sensorDataSet != null && sensorDataSet.getHeartRate() != null && sensorDataSet.getHeartRate().hasValue()) {
+                valueAndUnit = StringUtils.getHeartRateParts(context, sensorDataSet.getHeartRate().getValue());
+                description = sensorDataSet.getHeartRate().getSensorNameOrAddress();
+            } else {
+                valueAndUnit = StringUtils.getHeartRateParts(context, null);
+                description = context.getString(R.string.value_none);
+            }
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_cadence_key))) {
+            title = context.getString(R.string.stats_sensors_cadence);
+            if (sensorDataSet != null && sensorDataSet.getCyclingCadence() != null && sensorDataSet.getCyclingCadence().hasValue()) {
+                valueAndUnit = StringUtils.getCadenceParts(context, sensorDataSet.getCyclingCadence().getValue());
+                description = sensorDataSet.getCyclingCadence().getSensorNameOrAddress();
+            } else {
+                valueAndUnit = StringUtils.getCadenceParts(context, null);
+                description = context.getString(R.string.value_none);
+            }
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_power_key))) {
+            title = context.getString(R.string.stats_sensors_power);
+            if (sensorDataSet != null && sensorDataSet.getCyclingPower() != null && sensorDataSet.getCyclingPower().hasValue()) {
+                valueAndUnit = StringUtils.getPowerParts(context, sensorDataSet.getCyclingPower().getValue());
+                description = sensorDataSet.getCyclingPower().getSensorNameOrAddress();
+            } else {
+                valueAndUnit = StringUtils.getPowerParts(context, null);
+                description = context.getString(R.string.value_none);
+            }
+        }
+
+        if (valueAndUnit == null) {
+            return null;
+        }
+
+        return new StatisticData(new DataField(fieldKey, title, true, isPrimary, isWide), valueAndUnit, description);
+    }
+
+    /**
+     * Builds a list of StatisticData with sensors connected but not in statisticDataList.
+     */
+    private static List<StatisticData> getSensorStatsDataIfNeeded(Context context, TrackRecordingService.RecordingData recordingData, List<StatisticData> statisticDataList, boolean metricUnits) {
+        List<StatisticData> sensorDataList = new ArrayList<>();
+        SensorDataSet sensorDataSet = recordingData.getSensorDataSet();
+        if (sensorDataSet == null) {
+            return sensorDataList;
+        }
+        if (statisticDataList.stream().noneMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_heart_rate))) && sensorDataSet.getHeartRate() != null && sensorDataSet.getHeartRate().hasValue()) {
+            sensorDataList.add(build(context, recordingData, "heart_rate", true, metricUnits));
+        }
+        if (statisticDataList.stream().noneMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_cadence))) && sensorDataSet.getCyclingCadence() != null && sensorDataSet.getCyclingCadence().hasValue()) {
+            sensorDataList.add(build(context, recordingData, "cadence", true, metricUnits));
+        }
+        if (statisticDataList.stream().noneMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_power))) && sensorDataSet.getCyclingPower() != null && sensorDataSet.getCyclingPower().hasValue()) {
+            sensorDataList.add(build(context, recordingData, "power", true, metricUnits));
+        }
+
+        return sensorDataList;
+    }
+
+    public static List<StatisticData> fromSensorStatistics(@NonNull Context context, @NonNull SensorStatistics sensorStatistics) {
+        List<StatisticData> sensorDataList = new ArrayList<>();
+
+        if (sensorStatistics.hasHeartRate()) {
+            sensorDataList.add(
+                    new StatisticData(
+                            new DataField(context.getString(R.string.stats_custom_layout_heart_rate_key), context.getString(R.string.sensor_state_heart_rate_max), true, true, false),
+                            StringUtils.getHeartRateParts(context, sensorStatistics.getMaxHeartRate()),
+                            null
+                    )
+            );
+            sensorDataList.add(
+                    new StatisticData(
+                            new DataField(context.getString(R.string.stats_custom_layout_average_heart_rate_key), context.getString(R.string.sensor_state_heart_rate_avg), true, true, false),
+                            StringUtils.getHeartRateParts(context, sensorStatistics.getAvgHeartRate()),
+                            null
+                    )
+            );
+        }
+        if (sensorStatistics.hasCadence()) {
+            sensorDataList.add(
+                    new StatisticData(
+                            new DataField(context.getString(R.string.stats_custom_layout_cadence_key), context.getString(R.string.sensor_state_cadence_max), true, true, false),
+                            StringUtils.getCadenceParts(context, sensorStatistics.getMaxCadence()),
+                            null
+                    )
+            );
+            sensorDataList.add(
+                    new StatisticData(
+                            new DataField(context.getString(R.string.stats_custom_layout_average_cadence_key), context.getString(R.string.sensor_state_cadence_avg), true, true, false),
+                            StringUtils.getCadenceParts(context, sensorStatistics.getAvgCadence()),
+                            null
+                    )
+            );
+        }
+        if (sensorStatistics.hasPower()) {
+            sensorDataList.add(
+                    new StatisticData(
+                            new DataField(context.getString(R.string.stats_custom_layout_power_key), context.getString(R.string.sensor_state_power_avg), true, true, false),
+                            StringUtils.getPowerParts(context, sensorStatistics.getAvgPower()),
+                            null
+                    )
+            );
+        }
+
+        return sensorDataList;
+    }
+}

src/main/java/de/dennisguse/opentracks/viewmodels/StatisticsDataModel.java

@@ -0,0 +1,35 @@
+package de.dennisguse.opentracks.viewmodels;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.List;
+
+import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+
+public class StatisticsDataModel extends AndroidViewModel {
+
+    private MutableLiveData<List<StatisticData>> statsData;
+
+    public StatisticsDataModel(@NonNull Application application) {
+        super(application);
+    }
+
+    public MutableLiveData<List<StatisticData>> getStatsData() {
+        if (statsData == null) {
+            statsData = new MutableLiveData<>();
+        }
+        return statsData;
+    }
+
+    public void update(TrackRecordingService.RecordingData recordingData, Layout layout, boolean metricUnit) {
+        new Thread(() -> {
+            List<StatisticData> statisticDataList = StatisticDataBuilder.fromRecordingData(getApplication(), recordingData, layout, metricUnit);
+            statsData.postValue(statisticDataList);
+        }).start();
+    }
+}

src/main/res/drawable/ic_baseline_drag_indicator_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,18c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2 0.9,-2 2,-2 2,0.9 2,2zM9,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM9,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM15,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM15,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM15,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>

src/main/res/drawable/ic_baseline_visibility_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>