Release: v4.17.6

Revert "Bugfix: on idle detection reset movement-based sensor data."
This reverts commit fd9646bb1f.
2026-09-30 16:52:21 +02:00 · 2025-01-20 07:55:59 +01:00 · 2025-01-20 07:53:45 +01:00 · 2025-01-10 07:36:55 +01:00 · 2025-01-03 22:50:50 +01:00 · 2025-01-03 07:15:03 +01:00
165 changed files with 1420 additions and 865 deletions
@@ -9,6 +9,9 @@ jobs:
    steps:
      - name: checkout
        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0 #TODO See https://github.com/actions/checkout/issues/1471

      - uses: actions/setup-java@v4
        with:
@@ -19,7 +22,7 @@ jobs:
        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}"
+          ./gradlew assembleNightlyRelease -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 }}
@@ -1,5 +1,4 @@
 name: Linting
-
 on:
  push:
  pull_request:
@@ -10,12 +9,15 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - name: Checkout repository
+      - name: checkout
        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0 #TODO See https://github.com/actions/checkout/issues/1471

      - uses: actions/setup-java@v4
        with:
-          distribution: 'zulu'
+          distribution: 'adopt'
          java-version: '17'

      - run: ./gradlew lint
@@ -7,16 +7,25 @@ on:
 jobs:
  test:
    timeout-minutes: 45
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
    steps:
      - name: checkout
        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0 #TODO See https://github.com/actions/checkout/issues/1471

      - uses: actions/setup-java@v4
        with:
          distribution: 'adopt'
          java-version: '17'

+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
      - name: run tests
        uses: reactivecircus/android-emulator-runner@v2.33.0
        with:
@@ -12,7 +12,7 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
    </tr>
    <tr>
        <td align="center">
-            <a href="https://f-droid.org/packages/de.dennisguse.opentracks">
+            <a href="https://f-droid.org/packages/de.dennisguse.opentracks.playstore">
                <img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="60" align="middle">
            </a>
        </td>
@@ -29,7 +29,7 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
    </tr>
    <tr>
        <td align="center">
-            <img alt="OpenTracks version published on F-Droid" src="https://img.shields.io/f-droid/v/de.dennisguse.opentracks.svg" align="middle" >
+            <img alt="OpenTracks version published on F-Droid" src="https://img.shields.io/f-droid/v/de.dennisguse.opentracks.playstore.svg" align="middle" >
        </td>
        <td></td>
        <td align="center">
@@ -109,19 +109,20 @@ The API can be invoked by sending an explicit Intent to start an activity.
 * Debug: `de.dennisguse.opentracks.debug`
 * Nightly: `de.dennisguse.opentracks.nightly`

-`Class`:
-
+`Classes`:
 * **Start a recording:**  `de.dennisguse.opentracks.publicapi.StartRecording`
+    * Set track data: `TRACK_NAME`, `TRACK_DESCRIPTION`, `TRACK_CATEGORY`, and `TRACK_ICON` (
+      non-localized identifier
+      see [/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38](/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38)).
+      NOTE: if `TRACK_ICON` is not present, `TRACK_CATEGORY` will be used to determine the icon (
+      localized).
+    * Send recorded data to another application via _Dashboard API_: `STATS_TARGET_PACKAGE` and
+      `STATS_TARGET_CLASS`
 * **Stop a recording:**  `de.dennisguse.opentracks.publicapi.StopRecording`
+* **Create a marker:**  `de.dennisguse.opentracks.publicapi.CreateMarker`

 For testing via adb: `adb shell am start -e someParameter someValue -n "package/class"`

-`StartRecording` supports the following parameters:
-
-* Set track data: `TRACK_NAME`, `TRACK_DESCRIPTION`, `TRACK_CATEGORY`, and `TRACK_ICON` (non-localized identifier see [/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38](/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38)). 
-  NOTE: if `TRACK_ICON` is not present, `TRACK_CATEGORY` will be used to determine the icon (localized).
-* Send recorded data to another application via _Dashboard API_: `STATS_TARGET_PACKAGE` and `STATS_TARGET_CLASS`
-
 The Public API is disabled by default to protect the user's privacy, but it can easily be enabled in the settings.

 ## File formats compatibility with open-source software
@@ -2,39 +2,31 @@

 ## Craft new releases

-1. Get next _version code_ (main): `git rev-list HEAD --count main`
-2. Decide on _version name_ (semantic versioning)
-3. Manually update _version code_ and _version name_ in `build.gradle`
-4. Create changelog (`_version code_.txt`)
-5. Create commit with all changes
-6. Tag newly create commit with _version name_ (e.g., v3.2.1)
-7. Push commits and tags to public repository
-8. Add changelog to tag (Github releases)
+1. Execute use `RELEASE.sh`.
+2. Push to Github
+3. Create release on Github (incl. changelog)
+   This actually creates a tag that is later used by F-Droid
+4. Pull from Github
+5. Build reproducible release and attach to release
+6. ... wait until reproducibility is verified by F-Droid

-## F-Droid
-Application id: de.dennisguse.opentracks
+Two releases will be created:
+* Application id: `de.dennisguse.opentracks` (irreproducible)
+* Application id: `de.dennisguse.opentracks.playstore` (reproducible)

-It if it properly tagged F-Droid takes care of building the app and publishing.
-Usually, it takes two days before the update is published (build, signed, and published). 
+For F-Droid the build status can be found [here](https://monitor.f-droid.org/builds/build).

-The recent build activity can be found [here](https://monitor.f-droid.org/builds/build)
+## Reproducible builds

-## Google Play Store
-Application id: `de.dennisguse.opentracks.playstore`
+A lot of detailed information can be found [here](https://f-droid.org/docs/Reproducible_Builds/)

-Requirement: `gem install fastlane`
-
-1. Build signed apk
-   (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 metadata`
-   (requires API key configured in `Appfile`)
-
-Supported languages: https://support.google.com/googleplay/android-developer/table/4419860
+Technical requirements:
+* Must be build using OpenJDK17

 ## Translations (localization)

 Translations of the OpenTracks are handled in
-Weblate: [https://hosted.weblate.org/projects/opentracks/](https://hosted.weblate.org/projects/opentracks)
-.
+Weblate: [https://hosted.weblate.org/projects/opentracks/](https://hosted.weblate.org/projects/opentracks).
+
+## Google Play Store
+Supported languages: https://support.google.com/googleplay/android-developer/table/4419860
@@ -66,6 +66,7 @@ We do not support type of movement (i.e., walking vs running).
 ### 0x2A6D: Environmental Sensing Service
 Sadly, Bluetooth sensors providing _air pressure_ via Environmental Sensing Service seem to be very rare.

+* [Flybeeper Pressure Sensor](https://market.flybeeper.com/device/ps1)
 * NoTrustIssues: https://github.com/OpenTracksApp/NoTrustIssues
  An Android app that exposes the internal barometer via Environmental Sensing Service.

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
+
+JAVA_VERSION=`java --version`
+if [[ $JAVA_VERSION != "openjdk 17."* ]]; then
+  echo "OpenJDK version should be 17.X"
+  exit -1;
+fi
+
+RELEASE_STORE_PASSWORD=
+read -s -p "Enter store password: " RELEASE_STORE_PASSWORD
+echo ""
+read -s -p "Enter key alias: " RELEASE_KEY_ALIAS
+echo ""
+read -s -p "Enter key password: " RELEASE_KEY_PASSWORD
+echo ""
+
+./gradlew --no-configuration-cache \
+  clean \
+  assembleReproducibleRelease \
+  -Drelease_store_file=`ls ../*.jks` \
+  -Drelease_store_file="../keystore_opentracks.jks" \
+  -Drelease_store_password="$RELEASE_STORE_PASSWORD" \
+  -Drelease_key_alias="$RELEASE_KEY_ALIAS" \
+  -Drelease_key_password="$RELEASE_KEY_PASSWORD"
@@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.1'
+        classpath 'com.android.tools.build:gradle:8.8.0'
    }
 }

@@ -26,7 +26,7 @@ def getVersionName = { ->
        }
        return stdout.toString().trim()
    } catch (ignored) {
-        return null
+        throw new GradleException('VersionName could not be read:' + ignored.message)
    }
 }

@@ -39,7 +39,7 @@ def getVersionCode = { ->
        }
        return Integer.valueOf(stdout.toString().trim())
    } catch (ignored) {
-        return null
+        throw new GradleException('VersionCode could not be read:' + ignored.message)
    }
 }

@@ -63,25 +63,33 @@ android {
    }

    defaultConfig {
-        applicationId "de.dennisguse.opentracks"
-        versionCode 5909
-        versionName "v4.14.1"
+        applicationId 'de.dennisguse.opentracks'
+        versionCode 6022
+        versionName "v4.17.6"

        buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""

        minSdk 26
        targetSdk 35

-        testInstrumentationRunner "de.dennisguse.opentracks.TestRunner"
+        testInstrumentationRunner 'de.dennisguse.opentracks.TestRunner'
        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")
+            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')
+            }
+        }
+        release {
+            if (System.getProperty("release_store_file") != null) {
+                storeFile file(System.getProperty("release_store_file"))
+                storePassword System.getProperty("release_store_password")
+                keyAlias System.getProperty("release_key_alias")
+                keyPassword System.getProperty("release_key_password")
            }
        }
    }
@@ -90,42 +98,67 @@ android {

    buildTypes {
        debug {
-            applicationIdSuffix ".debug"
-            versionNameSuffix "-debug"
+            applicationIdSuffix '.debug'
+            versionNameSuffix '-debug'
        }
-
-        nightly {
-            signingConfig signingConfigs.nightly
-            applicationIdSuffix ".nightly"
-        }
-
        release {
            crunchPngs false
            minifyEnabled false
        }
+    }

-        releasePlayStore {
-            applicationIdSuffix ".playstore"
-            versionNameSuffix "-PlayStore"
-            signingConfig signingConfigs.debug
+
+    flavorDimensions 'version'
+    productFlavors {
+        nightly {
+            dimension 'version'
+            applicationId 'de.dennisguse.opentracks.nightly'
+            signingConfig signingConfigs.nightly
+        }
+        irreproducible {
+            // Non-reproducible: https://f-droid.org/de/packages/de.dennisguse.opentracks/
+            dimension 'version'
+            applicationId 'de.dennisguse.opentracks'
+            versionNameSuffix 'irreproducible'
+        }
+        reproducible {
+            // Developer Binaries: https://github.com/OpenTracksApp/OSMDashboard/releases/download/v%v/de.dennisguse.opentracks.playstore_%v.apk
+            // FDroid: https://f-droid.org/de/packages/de.dennisguse.opentracks.playstore
+            // PlayStore: https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore
+            dimension 'version'
+            applicationId 'de.dennisguse.opentracks.playstore'
+            signingConfig signingConfigs.release
        }
    }

    applicationVariants.configureEach { variant ->
-        variant.resValue "string", "applicationId", variant.applicationId
+        variant.resValue 'string', 'applicationId', variant.applicationId

-        if (variant.buildType.name == 'nightly') {
-            variant.outputs.configureEach {
+        variant.outputs.configureEach {
+            if (variant.flavorName == 'nightly') {
                setVersionCodeOverride(getVersionCode())
                setVersionNameOverride(getVersionName())
+            }
+
+            if (variant.flavorName == 'reproducible') {
+                outputFileName = "${applicationId}_${variant.versionName}.apk"
+            } else {
                outputFileName = "${applicationId}_${variant.versionCode}.apk"
            }
        }
    }
+
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
+    }
+
 }

 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'

    implementation 'androidx.appcompat:appcompat:1.7.0'
    implementation 'androidx.preference:preference:1.2.1'
@@ -143,7 +176,7 @@ dependencies {
    androidTestImplementation 'androidx.test:rules:1.6.1'
    androidTestImplementation 'androidx.test:runner:1.6.2'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-    androidTestImplementation 'org.mockito:mockito-android:5.14.2'
+    androidTestImplementation 'org.mockito:mockito-android:5.15.2'

    androidTestUtil 'androidx.test:orchestrator:1.5.1'
 }
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:cc="http://creativecommons.org/ns#"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    height="188"
-    id="svg2"
-    version="1.1"
-    viewBox="0 0 78 188"
-    width="78"
-    xmlns="http://www.w3.org/2000/svg">
-    <defs id="defs6" />
-    <g id="layer1" />
-    <g
-        style="display:inline"
-        id="layer2" />
-    <metadata id="metadata8">
-        <rdf:RDF>
-            <cc:Work rdf:about="">
-                <dc:format>image/svg+xml</dc:format>
-                <dc:title />
-                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-            </cc:Work>
-        </rdf:RDF>
-    </metadata>
-    <path
-        style="fill:#cccccc;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.7019608"
-        d="m 1,150 38,37 39,-37 H 50 V 97 L 29,81 v 69 z"
-        id="path31161" />
-    <path
-        style="fill:#cccccc;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.7019608"
-        d="M 29,51 V 70 L 50,86 V 67 Z"
-        id="path31169" />
-    <path
-        style="fill:#cccccc;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.7019608"
-        d="M 29,23 V 40 L 50,56 V 39 Z"
-        id="path31192" />
-    <path
-        style="fill:#cccccc;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.7019608"
-        d="M 29,0 V 14 L 50,29 V 16 Z"
-        id="path31194" />
-</svg>
@@ -0,0 +1,7 @@
+v4.14.1: OpenTracks
+
+Změny:
+- Detekce zastavení může být zakázána
+
+Oprava chyby:
+- Rozhraní přidávání obrázků ke značkám bylo skryto
@@ -0,0 +1,4 @@
+v4.14.2: OpenTracks
+
+Oprava chyby:
+- Android 15: rozhraní již nepřetéká (edge-to-edge)
@@ -0,0 +1,8 @@
+v4.15.0: OpenTracks
+
+Změny:
+- Výběr jazyka v aplikaci (Android 14 nebo novější)
+- Funkce zobrazit na mapě podporuje pouze aplikaci OSM Dashboard (odstraněno KML/KMZ nebo GPX) 
+
+Vývojář:
+- GitHub Actions nyní používají Ubuntu
@@ -0,0 +1,4 @@
+v4.16.0: OpenTracks
+
+Oprava chyby:
+- PublicAPI: spuštění záznamu nezaznamenalo žádná data
@@ -0,0 +1,8 @@
+v4.16.1: OpenTracks
+
+Změny:
+- Výběr jazyka v aplikaci je nyní k dispozici pro všechny verze systému Android
+  (na základě velké poptávky)
+
+Vývojář:
+- GitHub Actions: při checkoutu se nestahovaly značky (noční aktualizace)
@@ -0,0 +1,7 @@
+v4.17.0: OpenTracks
+
+Změny:
+- Veřejné rozhraní API pro vytváření značek (během záznamu)
+
+Oprava chyby:
+- Senzory: při nečinnosti nastavena data pohybových senzorů na 0
@@ -0,0 +1,5 @@
+v4.17.1: OpenTracks
+
+Změny:
+- Reprodukovatelné sestavení: uvidíme, jestli to bude fungovat.
+  Varianta pro Obchod Play bude odeslána F-Droidu, který ji ověří a zveřejní.
@@ -0,0 +1,8 @@
+v4.17.2: OpenTracks
+
+Změny:
+- Reprodukovatelné sestavení: uvidíme, zda to bude fungovat
+  Varianta pro Obchod Play bude odeslána do F-Droidu, kde bude ověřena a zveřejněna.
+
+Vývojář:
+- F-Droid vyžaduje použití Product Flavors (namísto Build Types)
@@ -0,0 +1,7 @@
+v4.17.2: OpenTracks
+
+Změny:
+- Reprodukovatelné sestavení: uvidíme, zda to bude fungovat.
+
+Vývojář:
+- Pokus o opravu názvu souboru APK...
@@ -0,0 +1,8 @@
+v4.17.4: OpenTracks
+
+
+Změny:
+- Reprodukovatelné sestavení: uvidíme, jestli to bude fungovat.
+
+Vývojář:
+- Odstranění DependencyInfo.
@@ -0,0 +1,10 @@
+v4.17.5: OpenTracks
+
+Změny:
+- Reprodukovatelné sestavení: uvidíme, jestli to bude fungovat.
+
+Oprava chyby:
+- Reprodukovatelné sestavení používá ikonu z Obchodu Play.
+
+Vývojář:
+- Přidán soubor RELEASE_BUILD.sh
@@ -0,0 +1,4 @@
+v4.14.2: OpenTracks
+
+Bugfix:
+- Android 15: UI is not overflowing anymore (edge-to-edge)
@@ -0,0 +1,8 @@
+v4.15.0: OpenTracks
+
+Changes:
+- In-app language selector (Android 14 or later)
+- Show-on-map-feature only supports OSM Dashboard (removed KML/KMZ or GPX) 
+
+Developer:
+- Github actions now uses Ubuntu
@@ -0,0 +1,5 @@
+v4.16.0: OpenTracks
+
+Bugfix:
+- PublicAPI: starting a recording didn't record no data
+
@@ -0,0 +1,8 @@
+v4.16.1: OpenTracks
+
+Changes:
+- In-app language selector now available for all Android versions
+  (due to some popular demand)
+
+Developer:
+- Github actions: checkout was not fetching tags (nightly)
@@ -0,0 +1,8 @@
+v4.17.0: OpenTracks
+
+Changes:
+- Public API to create markers (while recording)
+
+Bugfix:
+- Sensors: on idle, set movement-based sensor data to 0
+
@@ -0,0 +1,5 @@
+v4.17.1: OpenTracks
+
+Changes:
+- Reproducible build: let's see if it works.
+  The PlayStore variant will be submitted to F-Droid, verified and published them.
@@ -0,0 +1,9 @@
+v4.17.2: OpenTracks
+
+Changes:
+- Reproducible build: let's see if it works.
+  The PlayStore variant will be submitted to F-Droid, verified and published them.
+
+Developer:
+- F-Droid requires to use Product Flavors (instead of Build Types)
+
@@ -0,0 +1,9 @@
+v4.17.3: OpenTracks
+
+Changes:
+- Reproducible build: let's see if it works.
+
+Developer:
+- Just trying to get the APK filename, right...
+
+
@@ -0,0 +1,8 @@
+v4.17.4: OpenTracks
+
+
+Changes:
+- Reproducible build: let's see if it works.
+
+Developer:
+- Removing DependencyInfo.
@@ -0,0 +1,10 @@
+v4.17.5: OpenTracks
+
+Changes:
+- Reproducible build: let's see if it works.
+
+Bugfix:
+- Reproducible build uses PlayStore icon.
+
+Developer:
+- Added RELEASE_BUILD.sh
@@ -0,0 +1,5 @@
+v4.17.6: OpenTracks
+
+Bugfix:
+- UI: GPS data may be not shown regularly (does not affect recorded data)
+  Introduced in v4.17.0
@@ -0,0 +1,7 @@
+v4.14.1: OpenTracks
+
+Cambios:
+-  Detección de inactividad se puede desactivar
+
+Correcciones de errores:
+- UI para añadir imágenes a los marcadores estaba oculto
@@ -0,0 +1,7 @@
+v4.14.1 : OpenTracks
+
+Changements :
+− La détection d’immobilité peut être désactivée
+
+Correction de bogue :
+− L’interface utilisateur pour ajouter des images aux marqueurs était cachée
@@ -0,0 +1,4 @@
+v4.14.2 : OpenTracks
+
+Correction de bogue :
+− Android 15 : l’interface utilisateur ne débordera plus (bord-à-bord / edge-to-edge)
@@ -0,0 +1,8 @@
+v4.15.0 : OpenTracks
+
+Changements :
+− Sélection de la langue sur l’application (Android 14 ou plus)
+− La fonctionnalité « montrer sur la carte » prend en charge uniquement OSM Dashboard (suppression de KML/KMZ ou GPX)
+
+Développeurs :
+− Les actions Github utilisent désormais Ubuntu
@@ -0,0 +1,7 @@
+v4.17.0 : OpenTracks
+
+Changements :
+− IPA (API) publique pour créer des marqueurs (lors de l’enregistrement)
+
+Correction de bogue :
+− Capteurs : quand immobile, les données des capteurs de mouvements sont mises à 0
@@ -0,0 +1,7 @@
+v4.14.1: OpenTracks
+
+Athruithe:
+- Is féidir brath díomhaoin a dhíchumasú
+
+Ceartúchán Bug:
+- Bhí Chomhéadain chun pictiúir a chur le marcóirí i bhfolach
@@ -0,0 +1,4 @@
+v4.14.2: OpenTracks
+
+Ceartúchán Bug:
+- Android 15: Níl an Chomhéadain ag cur thar maoil níos mó (ó imeall go himeall)
@@ -0,0 +1,8 @@
+v4.15.0: OpenTracks
+
+Athruithe:
+- Roghnóir teanga in-app (Android 14 nó níos déanaí)
+- Ní thacaíonn an ghné taispeáin-ar-mapa ach le Painéal OSM (bainte KML/KMZ nó GPX)
+
+Forbróir:
+- Úsáideann gníomhartha Github anois Ubuntu
@@ -0,0 +1,4 @@
+v4.16.0: OpenTracks
+
+Ceartúchán Bug:
+- PublicAPI: níor taifeadadh aon sonraí le tosú taifeadta
@@ -0,0 +1,8 @@
+v4.16.1: OpenTracks
+
+Athruithe:
+- Roghnóir teanga in-app ar fáil anois do gach leagan Android
+ (mar gheall ar roinnt éileamh coitianta)
+
+Forbróir:
+- Gníomhartha Github: ní raibh an tseiceáil amach ag fáil clibeanna (oíche)
@@ -0,0 +1,7 @@
+v4.17.0: OpenTracks
+
+Athruithe:
+- API poiblí chun marcóirí a chruthú (agus tú ag taifeadadh)
+
+Ceartúchán Bug:
+- Braiteoirí: i gcás díomhaoin, socraigh sonraí braiteora bunaithe ar ghluaiseacht go 0
@@ -0,0 +1,5 @@
+v4.17.1: OpenTracks
+
+Athruithe:
+- Tógáil atáirgthe: féachaimis an n-oibríonn sé.
+ Cuirfear an leagan PlayStore faoi bhráid F-Droid, fíorófar iad agus foilseofar iad.
@@ -0,0 +1,8 @@
+v4.17.2: OpenTracks
+
+Athruithe:
+- Tógáil atáirgthe: féachaimis an n-oibríonn sé.
+ Cuirfear an leagan PlayStore faoi bhráid F-Droid, fíorófar iad agus foilseofar iad.
+
+Forbróir:
+- Éilíonn F-Droid Blasanna Táirge a úsáid (in ionad Cineálacha Tógála)
@@ -0,0 +1,7 @@
+v4.17.3: OpenTracks
+
+Athruithe:
+- Tógáil atáirgthe: féachaimis an n-oibríonn sé.
+
+Forbróir:
+- Díreach ag iarraidh ainm an chomhaid APK a fháil, ceart ...
@@ -0,0 +1,8 @@
+v4.17.4: OpenTracks
+
+
+Athruithe:
+- Tógáil atáirgthe: féachaimis an n-oibríonn sé.
+
+Forbróir:
+- DependencyInfo a bhaint.
@@ -0,0 +1,10 @@
+v4.17.5: OpenTracks
+
+Athruithe:
+- Tógáil atáirgthe: féachaimis an n-oibríonn sé.
+
+Ceartúchán Bug:
+- Úsáideann tógáil atáirgthe íocón PlayStore.
+
+Forbróir:
+- Curtha leis RELEASE_BUILD.sh
@@ -0,0 +1,8 @@
+v4.17.2: OpenTracks
+
+Cambios:
+- Compilación reproducible: comprobemos se funciona ben.
+  Enviaremos a F-Droid a variante da Play Store, para que a verifiquen e publiquen.
+
+Desenvolvemento:
+- F-Droid require que usemos Product Flavors (no lugar de Build Types)
@@ -0,0 +1,7 @@
+v4.17.3: OpenTracks
+
+Cambios:
+- Compilación reproducible: agardemos que funcione ben.
+
+Desenvolvemento:
+- Intento de que o nome do ficheiro APK sai a ben, vexamos...
@@ -0,0 +1,7 @@
+v4.14.1: OpenTracks
+
+Veranderingen:
+- Detectie van inactiviteit kan worden uitgeschakeld
+
+Opgeloste probleemoplossing:
+- Gebruikersinterface voor het toevoegen van afbeeldingen aan markeringen is verborgen
@@ -0,0 +1,4 @@
+v4.14.2: OpenTracks
+
+Bugfix:
+- Android 15: gebruikersinterface loopt niet meer over (rand tot rand)
@@ -0,0 +1,8 @@
+v4.15.0: OpenTracks
+
+Wijzigingen:
+- In-app taalkiezer (Android 14 of hoger)
+- Show-on-map-functie ondersteunt alleen OSM Dashboard (verwijderd KML/KMZ of GPX) 
+
+Ontwikkelaar:
+- Github-acties gebruiken nu Ubuntu
@@ -0,0 +1,4 @@
+v4.16.0: OpenTracks
+
+Opgelost probleem:
+- PublicAPI: bij het starten van een opname zijn geen gegevens vastgelegd
@@ -0,0 +1,8 @@
+v4.16.1: OpenTracks
+
+Veranderingen:
+- In-app taalkiezer nu beschikbaar voor alle Android-versies
+  (op veler verzoek)
+
+Ontwikkelaar:
+- Github-acties: checkout was not fetching tags (nightly)
@@ -0,0 +1,9 @@
+v4.17.0: OpenTracks
+
+Aanpassing:
+
+- Openbare API om markeringen te maken (tijdens opname)
+
+Opgelost:
+
+- Sensoren: bij rust de op beweging gebaseerde sensorgegevens op 0 zetten
@@ -0,0 +1,5 @@
+v4.17.1: OpenTracks
+
+Veranderingen:
+- Reproduceerbare build: laten we eens kijken of het werkt.
+  De PlayStore-variant wordt ingediend bij F-Droid, geverifieerd en gepubliceerd.
@@ -0,0 +1,8 @@
+v4.17.2: OpenTracks
+
+Veranderingen:
+- Reproduceerbare build: laten we eens kijken of het werkt.
+  De PlayStore-variant wordt ingediend bij F-Droid, geverifieerd en gepubliceerd.
+
+Ontwikkelaar:
+- F-Droid vereist het gebruik van productsmaken (in plaats van buildtypes)
@@ -0,0 +1,7 @@
+v4.17.3: OpenTracks
+
+Veranderingen:
+- Reproduceerbare build: laten we eens kijken of het werkt.
+
+Ontwikkelaar:
+- Ik probeer gewoon de APK-bestandsnaam te krijgen, toch...
@@ -0,0 +1,8 @@
+v4.17.4: OpenTracks
+
+
+Veranderingen:
+- Reproduceerbare build: laten we eens kijken of het werkt.
+
+Ontwikkelaar:
+- DependencyInfo verwijderen.
@@ -0,0 +1,10 @@
+v4.17.5: OpenTracks
+
+Veranderingen:
+- Reproduceerbare build: laten we eens kijken of het werkt.
+
+Opgelost probleem:
+- Reproduceerbare build maakt gebruik van het PlayStore-pictogram.
+
+Ontwikkelaar:
+- Toegevoegd RELEASE_BUILD.sh
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -482,7 +482,7 @@ public class CustomContentProviderUtilsTest {
        assertEquals(contentProviderUtils.getMarkers(trackId).size(), 1);

        // Get marker id that needs to delete.
-        Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1)));
+        Marker.Id marker1Id = contentProviderUtils.insertMarker(marker1);

        // Delete
        contentProviderUtils.deleteMarker(context, marker1Id);
@@ -509,7 +509,7 @@ public class CustomContentProviderUtilsTest {
        assertEquals(contentProviderUtils.getMarkers(trackId).size(), 1);

        // Get marker id that needs to delete.
-        Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1)));
+        Marker.Id marker1Id = contentProviderUtils.insertMarker(marker1);

        // Check marker has photo and it's in the external storage.
        assertTrue(marker1.hasPhoto());
@@ -553,11 +553,11 @@ public class CustomContentProviderUtilsTest {
        // Insert at first.
        Marker marker1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
        marker1.setDescription(MOCK_DESC);
-        Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1)));
+        Marker.Id marker1Id = contentProviderUtils.insertMarker(marker1);

        Marker marker2 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
        marker2.setDescription(MOCK_DESC);
-        Marker.Id marker2Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker2)));
+        Marker.Id marker2Id = contentProviderUtils.insertMarker(marker2);

        // Delete
        assertNotNull(contentProviderUtils.getMarker(marker1Id));
@@ -598,7 +598,7 @@ public class CustomContentProviderUtilsTest {

        Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
        marker.setDescription(TEST_DESC);
-        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));
+        Marker.Id markerId = contentProviderUtils.insertMarker(marker);

        assertEquals(TEST_DESC, contentProviderUtils.getMarker(markerId).getDescription());
    }
@@ -614,7 +614,7 @@ public class CustomContentProviderUtilsTest {
        // Insert at first.
        Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
        marker.setDescription(TEST_DESC);
-        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));
+        Marker.Id markerId = contentProviderUtils.insertMarker(marker);

        // Update
        marker = contentProviderUtils.getMarker(markerId);
@@ -638,7 +638,7 @@ public class CustomContentProviderUtilsTest {
        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
        marker.setDescription(TEST_DESC);
-        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));
+        Marker.Id markerId = contentProviderUtils.insertMarker(marker);

        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id());
        assertTrue(dir.exists());
@@ -673,7 +673,7 @@ public class CustomContentProviderUtilsTest {
        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
        marker.setDescription(TEST_DESC);
-        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));
+        Marker.Id markerId = contentProviderUtils.insertMarker(marker);

        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id());
        assertTrue(dir.exists());
@@ -709,7 +709,7 @@ public class CustomContentProviderUtilsTest {
        marker.setDescription(TEST_DESC);
        Marker otherMarker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
        otherMarker.setDescription(TEST_DESC);
-        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));
+        Marker.Id markerId = contentProviderUtils.insertMarker(marker);
        contentProviderUtils.insertMarker(otherMarker);

        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id());
@@ -9,6 +9,7 @@ import org.junit.Test;

 import java.util.Set;

+import de.dennisguse.opentracks.BuildConfig;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;

@@ -34,6 +35,7 @@ public class ShareContentProviderTest {
    public void testCreateURIescapeFilename() {
        Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(Set.of(new Track.Id(1)), "../../&1=1", TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA);

-        assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/KML_WITH_TRACKDETAIL_AND_SENSORDATA/1/..%2F..%2F%261%3D1"), shareURIandMIME.first);
+
+        assertEquals(Uri.parse("content://" + BuildConfig.APPLICATION_ID + ".content/tracks/KML_WITH_TRACKDETAIL_AND_SENSORDATA/1/..%2F..%2F%261%3D1"), shareURIandMIME.first);
    }
 }
@@ -157,7 +157,7 @@ public class ExportImportTest {
        contentProviderUtils.insertMarker(new Marker("Marker 2", "Marker 2 desc", "Marker 2 category", null, trackId, service.getLastStoredTrackPointWithLocation(), ""));

        trackPointCreator.setClock("2020-02-02T02:02:18Z");
-        trackPointCreator.getSensorManager().sensorDataSet = new SensorDataSet();
+        trackPointCreator.getSensorManager().sensorDataSet = new SensorDataSet(trackPointCreator);
        service.endCurrentTrack();

        trackPointCreator.setClock("2020-02-02T02:03:20Z");
@@ -172,7 +172,7 @@ public class ExportImportTest {

        sendLocation(trackPointCreator, "2020-02-02T02:03:50Z", 3, 16.001, 10, 27, 15, 10, 0f);

-        trackPointCreator.getSensorManager().sensorDataSet = new SensorDataSet();
+        trackPointCreator.getSensorManager().sensorDataSet = new SensorDataSet(trackPointCreator);
        trackPointCreator.setClock("2020-02-02T02:04:00Z");
        service.endCurrentTrack();

@@ -550,22 +550,22 @@ public class ExportImportTest {

        AggregatorCyclingPower cyclingPower = Mockito.mock(AggregatorCyclingPower.class);
        Mockito.when(cyclingPower.hasValue()).thenReturn(true);
-        Mockito.when(cyclingPower.getValue()).thenReturn(Power.of(power));
+        Mockito.when(cyclingPower.getValue(Mockito.any())).thenReturn(Power.of(power));
        sensorDataSet.add(cyclingPower);

-        AggregatorHeartRate agheartRate = Mockito.mock(AggregatorHeartRate.class);
-        Mockito.when(agheartRate.getValue()).thenReturn(HeartRate.of(heartRate));
-        sensorDataSet.add(agheartRate);
+        AggregatorHeartRate avgHeartRate = Mockito.mock(AggregatorHeartRate.class);
+        Mockito.when(avgHeartRate.getValue(Mockito.any())).thenReturn(HeartRate.of(heartRate));
+        sensorDataSet.add(avgHeartRate);

        AggregatorCyclingCadence cyclingCadence = Mockito.mock(AggregatorCyclingCadence.class);
        Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
-        Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
+        Mockito.when(cyclingCadence.getValue(Mockito.any())).thenReturn(Cadence.of(cadence));
        sensorDataSet.add(cyclingCadence);

        if (distance != null && speed != null) {
            AggregatorCyclingDistanceSpeed distanceSpeed = Mockito.mock(AggregatorCyclingDistanceSpeed.class);
            Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
-            Mockito.when(distanceSpeed.getValue()).thenReturn(new AggregatorCyclingDistanceSpeed.Data(null, distance, Speed.of(speed)));
+            Mockito.when(distanceSpeed.getValue(Mockito.any())).thenReturn(new AggregatorCyclingDistanceSpeed.Data(null, distance, Speed.of(speed)));
            sensorDataSet.add(distanceSpeed);
        } else {
            sensorDataSet.add(new AggregatorCyclingDistanceSpeed("", ""));
@@ -582,7 +582,7 @@ public class ExportImportTest {
        if (altitudeGain != null) {
            AggregatorBarometer barometer = Mockito.mock(AggregatorBarometer.class);
            Mockito.when(barometer.hasValue()).thenReturn(true);
-            Mockito.when(barometer.getValue()).thenReturn(new AltitudeGainLoss(altitudeGain, altitudeGain));
+            Mockito.when(barometer.getValue(Mockito.any())).thenReturn(new AltitudeGainLoss(altitudeGain, altitudeGain));
            sensorDataSet.add(barometer);
        }  else {
            sensorDataSet.add(new AggregatorBarometer("test", null));
@@ -31,13 +31,7 @@ public class PublicApiTest {

    private final Context context = ApplicationProvider.getApplicationContext();

-    @Test
-    public void StartTest() {
-        PreferencesUtils.setBoolean(R.string.publicapi_enabled_key, true);
-
-        context.startActivity(IntentUtils.newIntent(context, StartRecording.class));
-    }
-
+    //NOTE: this doesn't check if the TrackRecordingService was started in foreground.
    @Test
    public void StartStopTest() throws InterruptedException {
        PreferencesUtils.setBoolean(R.string.publicapi_enabled_key, true);
@@ -3,13 +3,15 @@ package de.dennisguse.opentracks.sensors.sensorData;
 import org.junit.Assert;
 import org.junit.Test;

+import java.time.Instant;
+
 import de.dennisguse.opentracks.data.models.AtmosphericPressure;

 public class AggregatorBarometerTest {

    private static void addSensorValue(AggregatorBarometer aggregatorBarometer, float[] values) {
        for (float f : values) {
-            aggregatorBarometer.add(new Raw<>(AtmosphericPressure.ofHPA(f)));
+            aggregatorBarometer.add(new Raw<>(Instant.MIN, AtmosphericPressure.ofHPA(f)));
        }
    }

@@ -9,6 +9,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;

+import java.time.Instant;
+
 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.sensors.BluetoothHandlerCyclingCadence;
@@ -23,11 +25,11 @@ public class SensorDataCyclingTest {
        AggregatorCyclingCadence current = new AggregatorCyclingCadence("", "");

        // when
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(1, 1024)));
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(2, 2048)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(1, 1024)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(2, 2048)));

        // then
-        assertEquals(60, current.getValue().getRPM(), 0.01);
+        assertEquals(60, current.getValue(Instant.MIN).getRPM(), 0.01);
    }

    @Test
@@ -35,11 +37,11 @@ public class SensorDataCyclingTest {
        AggregatorCyclingCadence current = new AggregatorCyclingCadence("", "");

        // when
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(1, 6184)));
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(2, 8016)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(1, 6184)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(2, 8016)));

        // then
-        assertEquals(33.53, current.getValue().getRPM(), 0.01);
+        assertEquals(33.53, current.getValue(Instant.MIN).getRPM(), 0.01);
    }

    @Test
@@ -47,11 +49,11 @@ public class SensorDataCyclingTest {
        AggregatorCyclingCadence current = new AggregatorCyclingCadence("", "");

        // when
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(1, 1024)));
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(1, 2048)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(1, 1024)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(1, 2048)));

        // then
-        assertEquals(Cadence.of(0), current.getValue());
+        assertEquals(Cadence.of(0), current.getValue(Instant.MIN));
    }


@@ -60,8 +62,8 @@ public class SensorDataCyclingTest {
        AggregatorCyclingCadence current = new AggregatorCyclingCadence("", "");

        // when
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(1, 1024)));
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(2, 1024)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(1, 1024)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(2, 1024)));

        // then
        assertFalse(current.hasValue()); //TODO Cadence should be 0?
@@ -72,11 +74,11 @@ public class SensorDataCyclingTest {
        AggregatorCyclingCadence current = new AggregatorCyclingCadence("", "");

        // when
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(1, UintUtils.UINT16_MAX - 1024)));
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(2, 0)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(1, UintUtils.UINT16_MAX - 1024)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(2, 0)));

        // then
-        assertEquals(60, current.getValue().getRPM(), 0.01);
+        assertEquals(60, current.getValue(Instant.MIN).getRPM(), 0.01);
    }

    @Test
@@ -85,13 +87,13 @@ public class SensorDataCyclingTest {
        AggregatorCyclingCadence current = new AggregatorCyclingCadence("", "");

        // when
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(UintUtils.UINT32_MAX - 1, 1024)));
-        current.add(new Raw<>(new BluetoothHandlerCyclingCadence.CrankData(0, 2048)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(UintUtils.UINT32_MAX - 1, 1024)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(0, 2048)));

        // then
        // TODO See #953
 //        assertEquals(60, current.getValue().getRPM(), 0.01);
-        assertNull(current.getValue());
+        assertNull(current.getValue(Instant.MIN));
    }

    @Test
@@ -100,12 +102,12 @@ public class SensorDataCyclingTest {
        current.setWheelCircumference(Distance.ofMM(2150));

        // when
-        current.add(new Raw<>(new BluetoothHandlerCyclingDistanceSpeed.WheelData(1, 6184)));
-        current.add(new Raw<>(new BluetoothHandlerCyclingDistanceSpeed.WheelData(2, 8016)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingDistanceSpeed.WheelData(1, 6184)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingDistanceSpeed.WheelData(2, 8016)));

        // then
-        assertEquals(2.15, current.getValue().distance().toM(), 0.01);
-        assertEquals(1.20, current.getValue().speed().toMPS(), 0.01);
+        assertEquals(2.15, current.getValue(Instant.MIN).distance().toM(), 0.01);
+        assertEquals(1.20, current.getValue(Instant.MIN).speed().toMPS(), 0.01);
    }

    @Test
@@ -115,14 +117,14 @@ public class SensorDataCyclingTest {
        current.setWheelCircumference(Distance.ofMM(2000));

        // when
-        current.add(new Raw<>(new BluetoothHandlerCyclingDistanceSpeed.WheelData(UintUtils.UINT32_MAX - 1, 1024)));
-        current.add(new Raw<>(new BluetoothHandlerCyclingDistanceSpeed.WheelData(0, 2048)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingDistanceSpeed.WheelData(UintUtils.UINT32_MAX - 1, 1024)));
+        current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingDistanceSpeed.WheelData(0, 2048)));


        // then
        // TODO See #953
 //        assertEquals(2, current.getValue().getDistance().toM(), 0.01);
 //        assertEquals(2, current.getValue().getSpeed().toMPS(), 0.01);
-        assertNull(current.getValue());
+        assertNull(current.getValue(Instant.MIN));
    }
 }
@@ -304,11 +304,11 @@ public class TrackRecordingServiceRecordingTest {
        String sensor1 = "2020-02-02T02:02:03Z";
        trackPointCreator.setClock(sensor1);

-        sensorManager.onChanged(new Raw<>(HeartRate.of(5))); //Should be ignored
+        sensorManager.onChanged(new Raw<>(sensor1, HeartRate.of(5))); //Should be ignored

        String sensor3 = "2020-02-02T02:02:13Z";
        trackPointCreator.setClock(sensor3);
-        sensorManager.onChanged(new Raw<>(HeartRate.of(7)));
+        sensorManager.onChanged(new Raw<>(sensor3, HeartRate.of(7)));

        String stopTime = "2020-02-02T02:02:15Z";
        trackPointCreator.setClock(stopTime);
@@ -646,12 +646,12 @@ public class TrackRecordingServiceRecordingTest {
        // when
        String sensor1 = "2020-02-02T02:02:03Z";
        trackPointCreator.setClock(sensor1);
-        sensorManager.onChanged(new Raw<>(new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(0)))); //Should be ignored
+        sensorManager.onChanged(new Raw<>(sensor1, new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(0)))); //Should be ignored

        // when
        String sensor2 = "2020-02-02T02:02:04Z";
        trackPointCreator.setClock(sensor2);
-        sensorManager.onChanged(new Raw<>(new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(2))));
+        sensorManager.onChanged(new Raw<>(sensor2, new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(2))));

        // when
        String gps1 = "2020-02-02T02:02:05Z";
@@ -660,12 +660,12 @@ public class TrackRecordingServiceRecordingTest {
        // when
        String sensor3 = "2020-02-02T02:02:06Z";
        trackPointCreator.setClock(sensor3);
-        sensorManager.onChanged(new Raw<>(new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(12))));
+        sensorManager.onChanged(new Raw<>(sensor3, new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(12))));

        // when
        String sensor4 = "2020-02-02T02:02:07Z";
        trackPointCreator.setClock(sensor4);
-        sensorManager.onChanged(new Raw<>(new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(14)))); //Should be ignored
+        sensorManager.onChanged(new Raw<>(sensor4, new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(14)))); //Should be ignored

        // when
        String gps2 = "2020-02-02T02:02:08Z";
@@ -674,7 +674,7 @@ public class TrackRecordingServiceRecordingTest {
        // when
        String sensor5 = "2020-02-02T02:02:10Z";
        trackPointCreator.setClock(sensor5);
-        sensorManager.onChanged(new Raw<>(new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(16)))); //Should be ignored
+        sensorManager.onChanged(new Raw<>(sensor5, new BluetoothHandlerRunningSpeedAndCadence.Data(Speed.of(5), null, Distance.of(16)))); //Should be ignored

        // when
        String gps3 = "2020-02-02T02:02:12Z";
@@ -730,7 +730,7 @@ public class TrackRecordingServiceRecordingTest {
    private void mockAltitudeChange(TrackPointCreator trackPointCreator, float altitudeGain) {
        AggregatorBarometer barometer = Mockito.mock(AggregatorBarometer.class);
        Mockito.when(barometer.hasValue()).thenReturn(true);
-        Mockito.when(barometer.getValue()).thenReturn(new AltitudeGainLoss(altitudeGain, altitudeGain));
+        Mockito.when(barometer.getValue(Mockito.any())).thenReturn(new AltitudeGainLoss(altitudeGain, altitudeGain));

        trackPointCreator.getSensorManager().sensorDataSet.barometer = barometer;
    }
@@ -1,9 +1,11 @@
 package de.dennisguse.opentracks.services.announcement;

 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;

 import android.content.Context;
 import android.icu.text.MessageFormat;
+import android.os.Build;
 import android.util.Pair;

 import androidx.test.core.app.ApplicationProvider;
@@ -13,8 +15,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;

 import java.time.Duration;
+import java.time.Instant;
 import java.util.Locale;
 import java.util.Map;

@@ -26,6 +30,7 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.stats.SensorStatistics;
@@ -45,6 +50,7 @@ public class VoiceAnnouncementUtilsTest {
    public void setUp() {
        contentProviderUtils = new ContentProviderUtils(context);

+        PreferencesUtils.setVoiceAnnounceHeartRateCurrent(false);
        PreferencesUtils.setVoiceAnnounceLapHeartRate(false);
        PreferencesUtils.setVoiceAnnounceAverageHeartRate(false);
        PreferencesUtils.setVoiceAnnounceTotalDistance(true);
@@ -53,68 +59,101 @@ public class VoiceAnnouncementUtilsTest {
        PreferencesUtils.setVoiceAnnounceLapSpeedPace(true);
    }

+    @Test
+    public void sdkRequirement() {
+        assertFalse("Due to DateTimeFormatter using NBSP, these tests only work in SDK34+", Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE);
+    }
+
    @Test
    public void getAnnouncement_metric_speed() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.of(20000));
        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
        stats.setMaxSpeed(Speed.of(100));
        stats.setTotalAltitudeGain(6000f);

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement);
+        assertEquals("12:00 AM. Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement);
    }

    @Test
    public void getAnnouncement_metric_speed_rounding_check() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.of(20000));
        stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1).plusSeconds(1));
        stats.setMaxSpeed(Speed.of(100));
        stats.setTotalAltitudeGain(6000f);

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 20.0 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement);
+        assertEquals("12:00 AM. Total distance 20.0 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement);
    }

    @Test
    public void getAnnouncement_metric_distance_rounding_check() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.of(19999));
        stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1));
        stats.setMaxSpeed(Speed.of(100));
        stats.setTotalAltitudeGain(6000f);

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 20.0 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
+        assertEquals("12:00 AM. Total distance 20.0 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
    }

    @Test
    public void getAnnouncement_metric_distance_rounding_check_two() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.of(19900));
        stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1));
        stats.setMaxSpeed(Speed.of(100));
        stats.setTotalAltitudeGain(6000f);

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 19.9 kilometers. 1 hour. Average moving speed 19.9 kilometers per hour.", announcement);
+        assertEquals("12:00 AM. Total distance 19.9 kilometers. 1 hour. Average moving speed 19.9 kilometers per hour.", announcement);
    }

    @Test
@@ -132,27 +171,40 @@ public class VoiceAnnouncementUtilsTest {
            lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
        }

+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, true, lastInterval, null).toString();

        // then
-        assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement);
+        assertEquals("12:16 AM. Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement);
    }

    @Test
    public void getAnnouncement_metric_pace() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.of(20000));
        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
        stats.setMaxSpeed(Speed.of(100));
        stats.setTotalAltitudeGain(6000f);

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, false, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, false, null, null).toString();

        // then
-        assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement);
+        assertEquals("12:00 AM. Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement);
    }

    @Test
@@ -170,69 +222,103 @@ public class VoiceAnnouncementUtilsTest {
            lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
        }

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, false, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, false, lastInterval, null).toString();

        // then
-        assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement);
+        assertEquals("12:16 AM. Total distance 14.2 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement);
    }

    @Test
    public void getAnnouncement_imperial_speed() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.of(20000));
        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
        stats.setMaxSpeed(Speed.of(100));
        stats.setTotalAltitudeGain(6000f);

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.IMPERIAL_FEET, true, null, null).toString();

        // then
-        assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement);
+        assertEquals("12:00 AM. Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement);
    }

    @Test
    public void getAnnouncement_imperial_speed_1() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.ofMile(1.1));
        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1));

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.IMPERIAL_FEET, true, null, null).toString();

        // then
-        assertEquals("Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement);
+        assertEquals("12:00 AM. Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement);
    }

    @Test
    public void getAnnouncement_imperial_meter_speed_1() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.ofMile(1.1));
        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1));

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_METER, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.IMPERIAL_METER, true, null, null).toString();

        // then
-        assertEquals("Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement);
+        assertEquals("12:00 AM. Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement);
    }

    @Test
    public void getAnnouncement_metric_speed_1() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.ofKilometer(1.1));
        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1));

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 1.1 kilometers. 1 hour. Average moving speed 1.1 kilometers per hour.", announcement);
+        assertEquals("12:00 AM. Total distance 1.1 kilometers. 1 hour. Average moving speed 1.1 kilometers per hour.", announcement);
    }

    @Test
@@ -250,27 +336,40 @@ public class VoiceAnnouncementUtilsTest {
            lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
        }

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, true, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.IMPERIAL_FEET, true, lastInterval, null).toString();

        // then
-        assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement);
+        assertEquals("12:16 AM. Total distance 8.8 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement);
    }

    @Test
    public void getAnnouncement_imperial_pace() {
        TrackStatistics stats = new TrackStatistics();
+        stats.setStartTime(Instant.EPOCH);
        stats.setTotalDistance(Distance.of(20000));
        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
        stats.setMaxSpeed(Speed.of(100));
        stats.setTotalAltitudeGain(6000f);

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, false, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.IMPERIAL_FEET, false, null, null).toString();

        // then
-        assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement);
+        assertEquals("12:00 AM. Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement);
    }

    @Test
@@ -288,11 +387,17 @@ public class VoiceAnnouncementUtilsTest {
            lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
        }

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, false, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.IMPERIAL_FEET, false, lastInterval, null).toString();

        // then
-        assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement);
+        assertEquals("12:16 AM. Total distance 8.8 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement);
    }

    @Test
@@ -314,17 +419,25 @@ public class VoiceAnnouncementUtilsTest {

        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null, null);

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();

        // then
-        assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour. Average heart rate 180 bpm. Current heart rate 133 bpm.", announcement);
+        assertEquals("12:16 AM. Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour. Average heart rate 180 bpm. Lap heart rate 133 bpm.", announcement);
    }

    @Test
-    public void getAnnouncement_only_lap_heart_rate() {
+    public void getAnnouncement_heart_rate() {
+        PreferencesUtils.setVoiceAnnounceHeartRateCurrent(true);
        PreferencesUtils.setVoiceAnnounceLapHeartRate(true);
-        PreferencesUtils.setVoiceAnnounceAverageHeartRate(false);
+        PreferencesUtils.setVoiceAnnounceAverageHeartRate(true);
+
        PreferencesUtils.setVoiceAnnounceTotalDistance(false);
        PreferencesUtils.setVoiceAnnounceMovingTime(false);
        PreferencesUtils.setVoiceAnnounceAverageSpeedPace(false);
@@ -344,11 +457,17 @@ public class VoiceAnnouncementUtilsTest {

        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null, null);

+        Track track = new Track();
+        track.setTrackStatistics(stats);
+
+        SensorDataSet dataSet = Mockito.mock(SensorDataSet.class);
+        Mockito.when(dataSet.getHeartRate()).thenReturn(new Pair<>(HeartRate.of(60), "unused"));
+
        // when
-        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, track, dataSet, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();

        // then
-        assertEquals(" Current heart rate 133 bpm.", announcement);
+        assertEquals("12:16 AM.  Current heart rate 60 bpm. Average heart rate 180 bpm. Lap heart rate 133 bpm.", announcement);
    }

    @Test
@@ -98,6 +98,14 @@ limitations under the License.
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
+        <activity
+            android:name=".publicapi.CreateMarker"
+            android:exported="true"
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>

        <!-- NOTE: the name of the MAIN/LAUNCHER is used by icon packs; if this is changed, icon packs break.-->
        <activity
@@ -401,6 +409,16 @@ limitations under the License.
            android:name=".services.TrackDeleteService"
            android:exported="false"
            android:permission="android.permission.BIND_JOB_SERVICE"/>
+
+        <!--Necessary for SDK < 33 to (re-)store per app locale information-->
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
    </application>

    <queries>
@@ -286,6 +286,11 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
            return true;
        }

+        if (item.getItemId() == R.id.track_list_about) {
+            startActivity(IntentUtils.newIntent(this, AboutActivity.class));
+            return true;
+        }
+
        return super.onOptionsItemSelected(item);
    }

@@ -487,12 +487,11 @@ public class ContentProviderUtils {
        return markers;
    }

-    /**
-     * @return the content provider URI of the inserted marker.
-     */
-    public Uri insertMarker(@NonNull Marker marker) {
+    // TODO Merge with updateMarker
+    public Marker.Id insertMarker(@NonNull Marker marker) {
        marker.setId(null);
-        return contentResolver.insert(MarkerColumns.CONTENT_URI, createContentValues(marker));
+        Uri uri = contentResolver.insert(MarkerColumns.CONTENT_URI, createContentValues(marker));
+        return new Marker.Id(ContentUris.parseId(uri));
    }

    private void deleteMarkerPhoto(Context context, Marker marker) {
@@ -118,7 +118,13 @@ public class Track {
    }

    public OffsetDateTime getStartTime() {
-        return trackStatistics.getStartTime().atOffset(zoneOffset);
+        return trackStatistics
+                .getStartTime().atOffset(zoneOffset);
+    }
+
+    public OffsetDateTime getStopTime() {
+        return trackStatistics
+                .getStopTime().atOffset(zoneOffset);
    }

    @NonNull
@@ -13,7 +13,7 @@ import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.PreferencesUtils;

-public abstract class AbstractAPIActivity extends AppCompatActivity {
+abstract class AbstractAPIActivity extends AppCompatActivity {

    private final String TAG = AbstractAPIActivity.class.getSimpleName();

@@ -33,11 +33,15 @@ public abstract class AbstractAPIActivity extends AppCompatActivity {
    protected void onCreate(@Nullable Bundle savedInstanceState) {
        SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
        super.onCreate(savedInstanceState);
-        splashScreen.setKeepOnScreenCondition(() -> true );
+        splashScreen.setKeepOnScreenCondition(() -> true);

        if (PreferencesUtils.isPublicAPIenabled()) {
            Log.i(TAG, "Received and trying to execute requested action.");
-            TrackRecordingServiceConnection.execute(this, serviceConnectedCallback);
+            if (requiresForeground()) {
+                TrackRecordingServiceConnection.executeForeground(this, serviceConnectedCallback);
+            } else {
+                TrackRecordingServiceConnection.execute(this, serviceConnectedCallback);
+            }
        } else {
            Toast.makeText(this, getString(R.string.settings_public_api_disabled_toast), Toast.LENGTH_LONG).show();
            Log.w(TAG, "Public API is disabled; ignoring request.");
@@ -48,4 +52,8 @@ public abstract class AbstractAPIActivity extends AppCompatActivity {
    protected abstract void execute(TrackRecordingService service);

    protected abstract boolean isPostExecuteStopService();
+
+    protected boolean requiresForeground() {
+        return false;
+    }
 }
@@ -0,0 +1,16 @@
+package de.dennisguse.opentracks.publicapi;
+
+import de.dennisguse.opentracks.services.TrackRecordingService;
+
+public class CreateMarker extends AbstractAPIActivity {
+
+    @Override
+    protected void execute(TrackRecordingService service) {
+        service.createMarker();
+    }
+
+    @Override
+    protected boolean isPostExecuteStopService() {
+        return false;
+    }
+}
@@ -12,7 +12,7 @@ import de.dennisguse.opentracks.ui.markers.MarkerEditActivity;
 import de.dennisguse.opentracks.util.IntentUtils;

 /**
- * Public API to creates a Marker for a given track with a given location
+ * INTERNAL: only meant for clients of OSMDashboard API.
 */
 public class CreateMarkerActivity extends AppCompatActivity {

@@ -23,8 +23,11 @@ public class CreateMarkerActivity extends AppCompatActivity {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        Track.Id trackId = new Track.Id(getIntent().getLongExtra(EXTRA_TRACK_ID, 0L));
+        Track.Id trackId = new Track.Id(getIntent().getLongExtra(EXTRA_TRACK_ID, -1L));
        Location location = getIntent().getParcelableExtra(EXTRA_LOCATION);
+        if (!getIntent().hasExtra(EXTRA_TRACK_ID) || location == null) {
+            throw new IllegalStateException("Parameter 'track_id' and/or 'location' missing or invalid.");
+        }

        TrackRecordingServiceConnection.execute(this, (service, self) -> {
            Intent intent = IntentUtils
@@ -1,34 +1,19 @@
 package de.dennisguse.opentracks.publicapi;

 import android.content.Intent;
-import android.database.Cursor;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.View;

-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.viewpager.widget.ViewPager;

-import java.util.ArrayList;
 import java.util.List;

-import de.dennisguse.opentracks.AbstractActivity;
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.databinding.MarkerDetailActivityBinding;
-import de.dennisguse.opentracks.ui.markers.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.ui.markers.MarkerDetailActivity;
-import de.dennisguse.opentracks.ui.markers.MarkerDetailFragment;
 import de.dennisguse.opentracks.util.IntentUtils;

 /**
- * Public api to show an existing marker
+ * INTERNAL: only meant for clients of OSMDashboard API.
 */
 public class ShowMarkerActivity extends AppCompatActivity {

@@ -44,10 +29,11 @@ public class ShowMarkerActivity extends AppCompatActivity {
    protected void onCreate(Bundle bundle) {
        super.onCreate(bundle);

-        Marker.Id markerId = new Marker.Id(getIntent().getLongExtra(EXTRA_MARKER_ID, 0));
-        if (markerId.id() == 0) {
-            throw new IllegalStateException("No valid markerId provided");
+        if (!getIntent().hasExtra(EXTRA_MARKER_ID)) {
+            throw new IllegalStateException("Parameter 'markerId' missing");
        }
+
+        Marker.Id markerId = new Marker.Id(getIntent().getLongExtra(EXTRA_MARKER_ID, -1));
        Intent intent = IntentUtils.newIntent(this, MarkerDetailActivity.class)
                .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, markerId);
        startActivity(intent);
@@ -62,4 +62,9 @@ public class StartRecording extends AbstractAPIActivity {
    protected boolean isPostExecuteStopService() {
        return false;
    }
+
+    @Override
+    protected boolean requiresForeground() {
+        return true;
+    }
 }
@@ -33,7 +33,7 @@ public class BluetoothHandlerBarometricPressure implements SensorHandlerInterfac
        AtmosphericPressure value = parseEnvironmentalSensing(characteristic);
        if (value == null) return;

-        observer.onChange(new Raw<>(value));
+        observer.onChange(new Raw<>(observer.getNow(), value));
    }

    /**
@@ -33,7 +33,7 @@ public class BluetoothHandlerCyclingCadence implements SensorHandlerInterface {
        if (serviceMeasurementUUID.equals(BluetoothHandlerManagerCyclingPower.CYCLING_POWER)) {
            BluetoothHandlerManagerCyclingPower.Data data = BluetoothHandlerManagerCyclingPower.parseCyclingPower(characteristic);
            if (data != null && data.crank() != null) {
-                observer.onChange(new Raw<>(data.crank()));
+                observer.onChange(new Raw<>(observer.getNow(), data.crank()));
            }
            return;
        }
@@ -42,7 +42,7 @@ public class BluetoothHandlerCyclingCadence implements SensorHandlerInterface {
            Pair<BluetoothHandlerCyclingDistanceSpeed.WheelData, CrankData> data = BluetoothHandlerCyclingDistanceSpeed.parseCyclingCrankAndWheel(address, sensorName, characteristic);

            if (data != null && data.second != null) {
-                observer.onChange(new Raw<>(data.second));
+                observer.onChange(new Raw<>(observer.getNow(), data.second));
            }
            return;
        }
@@ -34,7 +34,7 @@ public class BluetoothHandlerCyclingDistanceSpeed implements SensorHandlerInterf
    public void handlePayload(SensorManager.SensorDataChangedObserver observer, ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic) {
        Pair<WheelData, BluetoothHandlerCyclingCadence.CrankData> data = parseCyclingCrankAndWheel(address, sensorName, characteristic);
        if (data.first != null) {
-            observer.onChange(new Raw<>(data.first));
+            observer.onChange(new Raw<>(observer.getNow(), data.first));
        }
    }

@@ -35,7 +35,7 @@ public class BluetoothHandlerManagerCyclingPower implements SensorHandlerInterfa
        Data cyclingPower = parseCyclingPower(characteristic);

        if (cyclingPower != null) {
-            observer.onChange(new Raw<>(cyclingPower));
+            observer.onChange(new Raw<>(observer.getNow(), cyclingPower));
        }
    }

@@ -45,7 +45,7 @@ public class BluetoothHandlerManagerHeartRate implements SensorHandlerInterface
        HeartRate heartRate = parseHeartRate(characteristic);

        if (heartRate != null) {
-            observer.onChange(new Raw<>(heartRate));
+            observer.onChange(new Raw<>(observer.getNow(), heartRate));
        }
    }

@@ -36,7 +36,7 @@ public class BluetoothHandlerRunningSpeedAndCadence implements SensorHandlerInte
    @Override
    public void handlePayload(SensorManager.SensorDataChangedObserver observer, @NonNull ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic) {
        Data data = parseRunningSpeedAndCadence(sensorName, characteristic);
-        observer.onChange(new Raw<>(data));
+        observer.onChange(new Raw<>(observer.getNow(), data));
    }

    @VisibleForTesting
@@ -8,6 +8,8 @@ import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;

+import java.time.Instant;
+
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.Aggregator;
 import de.dennisguse.opentracks.sensors.sensorData.Raw;
@@ -21,7 +23,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange

    //TODO Should be final and not be visible for testing
    @VisibleForTesting
-    public SensorDataSet sensorDataSet = new SensorDataSet();
+    public SensorDataSet sensorDataSet;

    private final TrackPointCreator observer;

@@ -47,6 +49,11 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
        public void onRemove(Aggregator<?, ?> aggregator) {
            sensorDataSet.remove(aggregator);
        }
+
+        @Override
+        public Instant getNow() {
+            return observer.createNow();
+        }
    };

    private BluetoothRemoteSensorManager bluetoothSensorManager;
@@ -57,6 +64,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange

    public SensorManager(TrackPointCreator observer) {
        this.observer = observer;
+        this.sensorDataSet = new SensorDataSet(observer);
    }

    public void start(Context context, Handler handler) {
@@ -138,5 +146,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
        void onDisconnect(Aggregator<?, ?> sensorData);

        void onRemove(Aggregator<?, ?> sensorData);
+
+        Instant getNow();
    }
 }
@@ -22,7 +22,7 @@ public class BarometerInternal implements Driver {

    private static final int SAMPLING_PERIOD = (int) TimeUnit.SECONDS.toMicros(5);

-    private final SensorManager.SensorDataChangedObserver listener;
+    private final SensorManager.SensorDataChangedObserver observer;

    private Context context;

@@ -34,7 +34,7 @@ public class BarometerInternal implements Driver {
                return;
            }

-            listener.onChange(new Raw<>(AtmosphericPressure.ofHPA(event.values[0])));
+            observer.onChange(new Raw<>(observer.getNow(), AtmosphericPressure.ofHPA(event.values[0])));
        }

        @Override
@@ -43,8 +43,8 @@ public class BarometerInternal implements Driver {
        }
    };

-    public BarometerInternal(@NonNull SensorManager.SensorDataChangedObserver listener) {
-        this.listener = listener;
+    public BarometerInternal(@NonNull SensorManager.SensorDataChangedObserver observer) {
+        this.observer = observer;

    }

@@ -60,7 +60,7 @@ public class BarometerInternal implements Driver {

        if (sensorManager.registerListener(sensorEventListener, pressureSensor, SAMPLING_PERIOD, handler)) {
            this.context = context;
-            listener.onConnect(new AggregatorBarometer("internal", null));
+            observer.onConnect(new AggregatorBarometer("internal", null));
            return;
        }

@@ -42,11 +42,11 @@ public abstract class Aggregator<Input, Output> {
    @NonNull
    protected abstract Output getNoneValue();

-    public Output getValue() {
+    public Output getValue(Instant now) {
        if (!hasValue()) {
            return null; //TODO Check if this is a good idea!
        }
-        if (isRecent()) {
+        if (isRecent(now)) {
            return value;
        }
        return getNoneValue();
@@ -60,12 +60,12 @@ public abstract class Aggregator<Input, Output> {
    /**
     * Is the data recent considering the current time.
     */
-    private boolean isRecent() {
+    private boolean isRecent(Instant now) {
        if (previous == null) {
            return false;
        }

-        return Instant.now()
+        return now
                .isBefore(previous.time().plus(BluetoothRemoteSensorManager.MAX_SENSOR_DATE_SET_AGE));
    }

@@ -2,15 +2,21 @@ package de.dennisguse.opentracks.sensors.sensorData;


 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;

+import java.time.Clock;
 import java.time.Instant;

 public record Raw<T>(
-        @NonNull T value,
-
-        @NonNull Instant time
+        @NonNull Instant time,
+        @NonNull T value
 ) {
-    public Raw(@NonNull T value) {
-        this(value, Instant.now()); //TODO We should be using the MonotonicClock
+    public Raw(@NonNull Clock clock, @NonNull T value) {
+        this(clock.instant(), value);
+    }
+
+    @VisibleForTesting
+    public Raw(@NonNull String time, @NonNull T value) {
+        this(Instant.parse(time), value);
    }
 }
@@ -17,9 +17,10 @@ import de.dennisguse.opentracks.sensors.BluetoothHandlerCyclingCadence;
 import de.dennisguse.opentracks.sensors.BluetoothHandlerCyclingDistanceSpeed;
 import de.dennisguse.opentracks.sensors.BluetoothHandlerManagerCyclingPower;
 import de.dennisguse.opentracks.sensors.BluetoothHandlerRunningSpeedAndCadence;
+import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;

-public final class SensorDataSet {
+public class SensorDataSet {

    private static final String TAG = SensorDataSet.class.getSimpleName();

@@ -43,11 +44,15 @@ public final class SensorDataSet {

    public AggregatorGPS gps;

-    public SensorDataSet() {
+    private TrackPointCreator trackPointCreator;
+
+    public SensorDataSet(TrackPointCreator trackPointCreator) {
+        this.trackPointCreator = trackPointCreator;
    }

+    @Deprecated //TODO This is not a copy constructor anymore, but it should be - aggregators are no value objects; best guess: can be removed
    public SensorDataSet(SensorDataSet toCopy) {
-        //TODO This is not a copy constructor anymore, but it should be - aggregators are no value objects
+        this.trackPointCreator = toCopy.trackPointCreator;
        this.heartRate = toCopy.heartRate;
        this.cyclingCadence = toCopy.cyclingCadence;
        this.cyclingDistanceSpeed = toCopy.cyclingDistanceSpeed;
@@ -59,7 +64,7 @@ public final class SensorDataSet {

    public Pair<HeartRate, String> getHeartRate() {
        if (heartRate != null) {
-            return new Pair<>(heartRate.getValue(), heartRate.getSensorNameOrAddress());
+            return new Pair<>(heartRate.getValue(trackPointCreator.createNow()), heartRate.getSensorNameOrAddress());
        }

        return null;
@@ -67,7 +72,7 @@ public final class SensorDataSet {

    public Pair<Cadence, String> getCadence() {
        if (cyclingCadence != null) {
-            return new Pair<>(cyclingCadence.getValue(), cyclingCadence.getSensorNameOrAddress());
+            return new Pair<>(cyclingCadence.getValue(trackPointCreator.createNow()), cyclingCadence.getSensorNameOrAddress());
        }

        if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasValue() && runningDistanceSpeedCadence.value.cadence() != null) {
@@ -78,11 +83,11 @@ public final class SensorDataSet {
    }

    public Pair<Speed, String> getSpeed() {
-        if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue() && cyclingDistanceSpeed.getValue().speed() != null) {
-            return new Pair<>(cyclingDistanceSpeed.getValue().speed(), cyclingDistanceSpeed.getSensorNameOrAddress());
+        if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue() && cyclingDistanceSpeed.getValue(trackPointCreator.createNow()).speed() != null) {
+            return new Pair<>(cyclingDistanceSpeed.getValue(trackPointCreator.createNow()).speed(), cyclingDistanceSpeed.getSensorNameOrAddress());
        }

-        if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasValue() && runningDistanceSpeedCadence.getValue().speed() != null) {
+        if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasValue() && runningDistanceSpeedCadence.getValue(trackPointCreator.createNow()).speed() != null) {
            return new Pair<>(runningDistanceSpeedCadence.value.speed(), runningDistanceSpeedCadence.getSensorNameOrAddress());
        }

@@ -152,7 +157,7 @@ public final class SensorDataSet {

    public void fillTrackPoint(TrackPoint trackPoint) {
        if (gps != null && gps.hasValue()) {
-            trackPoint.setPosition(gps.getValue());
+            trackPoint.setPosition(gps.getValue(trackPointCreator.createNow()));
        }

        if (getHeartRate() != null) {
@@ -168,20 +173,20 @@ public final class SensorDataSet {
        }

        if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue()) {
-            trackPoint.setSensorDistance(cyclingDistanceSpeed.getValue().distanceOverall());
+            trackPoint.setSensorDistance(cyclingDistanceSpeed.getValue(trackPointCreator.createNow()).distanceOverall());
        }

        if (cyclingPower != null && cyclingPower.hasValue()) {
-            trackPoint.setPower(cyclingPower.getValue());
+            trackPoint.setPower(cyclingPower.getValue(trackPointCreator.createNow()));
        }

        if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasValue()) {
-            trackPoint.setSensorDistance(runningDistanceSpeedCadence.getValue().distance());
+            trackPoint.setSensorDistance(runningDistanceSpeedCadence.getValue(trackPointCreator.createNow()).distance());
        }

        if (barometer != null && barometer.hasValue()) {
-            trackPoint.setAltitudeGain(barometer.getValue().gain_m());
-            trackPoint.setAltitudeLoss(barometer.getValue().loss_m());
+            trackPoint.setAltitudeGain(barometer.getValue(trackPointCreator.createNow()).gain_m());
+            trackPoint.setAltitudeLoss(barometer.getValue(trackPointCreator.createNow()).loss_m());
        }
    }

@@ -36,7 +36,9 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.time.Duration;

+import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
@@ -243,6 +245,20 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        gpsStatusObservable.postValue(STATUS_GPS_DEFAULT);
    }

+    public Marker.Id createMarker() {
+        if (!isRecording()) {
+            return null;
+        }
+
+        //TODO This contains some duplication to TrackRecodingActivity's Marker creation
+        TrackPoint trackPoint = trackRecordingManager.getLastStoredTrackPointWithLocation();
+        if (trackPoint == null) {
+            return null;
+        }
+        Marker marker = new Marker(recordingStatus.trackId(), trackPoint);
+        return new ContentProviderUtils(this).insertMarker(marker);
+    }
+
    @Override
    public boolean newTrackPoint(TrackPoint trackPoint, Distance thresholdHorizontalAccuracy) {
        if (!isRecording()) {
@@ -301,7 +317,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        // Compute temporary track statistics using sensorData and update time.
        Pair<Track, Pair<TrackPoint, SensorDataSet>> data = trackRecordingManager.getDataForUI();

-        voiceAnnouncementManager.announceStatisticsIfNeeded(data.first);
+        voiceAnnouncementManager.announceStatisticsIfNeeded(data.first, data.second.second);

        recordingDataObservable.postValue(new RecordingData(data.first, data.second.first, data.second.second));
    }
@@ -22,7 +22,6 @@ import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.UtteranceProgressListener;
-import android.text.Spannable;
 import android.util.Log;

 import androidx.annotation.NonNull;
@@ -118,7 +117,7 @@ public class TTSManager {
        }
    }

-    public void announce(@NonNull Spannable announcement) {
+    public void speak(@NonNull CharSequence announcement) {
        synchronized (this) {
            if (!ttsReady) {
                ttsReady = ttsInitStatus == TextToSpeech.SUCCESS;
@@ -33,6 +33,7 @@ import de.dennisguse.opentracks.data.TrackPointIterator;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
@@ -115,10 +116,10 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
            return;
        }

-        voiceAnnouncement.announce(VoiceAnnouncementUtils.createIdle(context));
+        voiceAnnouncement.speak(VoiceAnnouncementUtils.createIdle(context));
    }

-    public void announceStatisticsIfNeeded(@NonNull Track track) {
+    public void announceStatisticsIfNeeded(@NonNull Track track, @NonNull SensorDataSet sensorDataSet) {
        if (shouldNotAnnounce()) {
            return;
        }
@@ -135,11 +136,11 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
        }

        if (announce) {
-            voiceAnnouncement.announce(createAnnouncement(track));
+            voiceAnnouncement.speak(createAnnouncement(track, sensorDataSet));
        }
    }

-    private Spannable createAnnouncement(Track track) {
+    private Spannable createAnnouncement(Track track, SensorDataSet sensorDataSet) {
        Distance currentIntervalDistance = PreferencesUtils.getVoiceAnnouncementDistance();
        if (currentIntervalDistance != intervalDistance) {
            intervalStatistics = new IntervalStatistics(currentIntervalDistance);
@@ -155,7 +156,7 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
            sensorStatistics = contentProviderUtils.getSensorStats(track.getId());
        }

-        return VoiceAnnouncementUtils.createStatistics(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track), lastInterval, sensorStatistics);
+        return VoiceAnnouncementUtils.createStatistics(context, track, sensorDataSet, PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track), lastInterval, sensorStatistics);
    }

    public void stop() {
@@ -3,29 +3,38 @@ package de.dennisguse.opentracks.services.announcement;
 import static android.text.Spanned.SPAN_INCLUSIVE_EXCLUSIVE;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceAverageHeartRate;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceAverageSpeedPace;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceHeartRateCurrent;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapHeartRate;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapPower;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapSpeedPace;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceMovingTime;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTime;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTotalDistance;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceUnit;

 import android.content.Context;
 import android.icu.text.MessageFormat;
 import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.style.TtsSpan;
+import android.util.Pair;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import java.time.Duration;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.Map;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.Power;
+import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
@@ -42,8 +51,15 @@ class VoiceAnnouncementUtils {
                .append(context.getString(R.string.voiceIdle));
    }

-    static Spannable createStatistics(Context context, TrackStatistics trackStatistics, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) {
+    static Spannable createStatistics(Context context, Track track, SensorDataSet sensorDataSet, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) {
+        TrackStatistics trackStatistics = track.getTrackStatistics();
+
        SpannableStringBuilder builder = new SpannableStringBuilder();
+
+        if (shouldVoiceAnnounceTime()) {
+            appendTime(builder, track.getStopTime());
+        }
+
        Distance totalDistance = trackStatistics.getTotalDistance();
        Speed averageMovingSpeed = trackStatistics.getAverageMovingSpeed();
        Speed currentDistancePerTime = currentInterval != null ? currentInterval.getSpeed() : null;
@@ -92,88 +108,99 @@ class VoiceAnnouncementUtils {
            // Punctuation helps introduce natural pauses in TTS
            builder.append(".");
        }
-        if (totalDistance.isZero()) {
-            return builder;
-        }
+
+        boolean hasTravelledDistance = !totalDistance.isZero();

        // Announce time
        Duration movingTime = trackStatistics.getMovingTime();
-        if (shouldVoiceAnnounceMovingTime() && !movingTime.isZero()) {
+        if (shouldVoiceAnnounceMovingTime() && hasTravelledDistance && !movingTime.isZero()) {
            appendDuration(context, builder, movingTime);
            builder.append(".");
        }

-        if (isReportSpeed) {
-            if (shouldVoiceAnnounceAverageSpeedPace()) {
-                double speedInUnit = averageMovingSpeed.to(unitSystem);
-                builder.append(" ")
-                        .append(context.getString(R.string.speed));
-                String template = context.getResources().getString(speedId);
-                appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", speedInUnit)), speedInUnit, 1, unitSpeedTTS);
-                builder.append(".");
-            }
-            if (shouldVoiceAnnounceLapSpeedPace() && currentDistancePerTime != null) {
-                double currentDistancePerTimeInUnit = currentDistancePerTime.to(unitSystem);
-                if (currentDistancePerTimeInUnit > 0) {
+        if (hasTravelledDistance) {
+            if (isReportSpeed) {
+                if (shouldVoiceAnnounceAverageSpeedPace()) {
+                    double speedInUnit = averageMovingSpeed.to(unitSystem);
                    builder.append(" ")
-                            .append(context.getString(R.string.lap_speed));
+                            .append(context.getString(R.string.speed));
                    String template = context.getResources().getString(speedId);
-                    appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", currentDistancePerTimeInUnit)), currentDistancePerTimeInUnit, 1, unitSpeedTTS);
+                    appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", speedInUnit)), speedInUnit, 1, unitSpeedTTS);
                    builder.append(".");
                }
-            }
-        } else {
-            if (shouldVoiceAnnounceAverageSpeedPace()) {
-                Duration time = averageMovingSpeed.toPace(unitSystem);
-                builder.append(" ")
-                        .append(context.getString(R.string.pace));
-                appendDuration(context, builder, time);
-                builder.append(" ")
-                        .append(context.getString(perUnitStringId))
-                        .append(".");
-            }
+                if (shouldVoiceAnnounceLapSpeedPace() && currentDistancePerTime != null) {
+                    double currentDistancePerTimeInUnit = currentDistancePerTime.to(unitSystem);
+                    if (currentDistancePerTimeInUnit > 0) {
+                        builder.append(" ")
+                                .append(context.getString(R.string.lap_speed));
+                        String template = context.getResources().getString(speedId);
+                        appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", currentDistancePerTimeInUnit)), currentDistancePerTimeInUnit, 1, unitSpeedTTS);
+                        builder.append(".");
+                    }
+                }
+            } else {
+                if (shouldVoiceAnnounceAverageSpeedPace()) {
+                    Duration time = averageMovingSpeed.toPace(unitSystem);
+                    builder.append(" ")
+                            .append(context.getString(R.string.pace));
+                    appendDuration(context, builder, time);
+                    builder.append(" ")
+                            .append(context.getString(perUnitStringId))
+                            .append(".");
+                }

-            if (shouldVoiceAnnounceLapSpeedPace() && currentDistancePerTime != null) {
-                Duration currentTime = currentDistancePerTime.toPace(unitSystem);
-                builder.append(" ")
-                        .append(context.getString(R.string.lap_time));
-                appendDuration(context, builder, currentTime);
-                builder.append(" ")
-                        .append(context.getString(perUnitStringId))
-                        .append(".");
+                if (shouldVoiceAnnounceLapSpeedPace() && currentDistancePerTime != null) {
+                    Duration currentTime = currentDistancePerTime.toPace(unitSystem);
+                    builder.append(" ")
+                            .append(context.getString(R.string.lap_time));
+                    appendDuration(context, builder, currentTime);
+                    builder.append(" ")
+                            .append(context.getString(perUnitStringId))
+                            .append(".");
+                }
            }
        }

-        if (shouldVoiceAnnounceAverageHeartRate() && sensorStatistics != null && sensorStatistics.hasHeartRate()) {
-            int averageHeartRate = Math.round(sensorStatistics.avgHeartRate().getBPM());
-
-            builder.append(" ")
-                    .append(context.getString(R.string.average_heart_rate));
-            appendCardinal(builder, context.getString(R.string.sensor_state_heart_rate_value, averageHeartRate), averageHeartRate);
-            builder.append(".");
-        }
-        if (shouldVoiceAnnounceLapHeartRate() && currentInterval != null && currentInterval.hasAverageHeartRate()) {
-            int currentHeartRate = Math.round(currentInterval.getAverageHeartRate().getBPM());
+        Pair<HeartRate, String> heartrate = sensorDataSet.getHeartRate();
+        if (shouldVoiceAnnounceHeartRateCurrent() && heartrate != null && heartrate.first != null) { //TODO Check has an announcable value?
+            int averageHeartRate = Math.round(heartrate.first.getBPM());

            builder.append(" ")
                    .append(context.getString(R.string.current_heart_rate));
-            appendCardinal(builder, context.getString(R.string.sensor_state_heart_rate_value, currentHeartRate), currentHeartRate);
+            appendCardinal(builder, context.getString(R.string.sensor_state_heart_rate_value, averageHeartRate), averageHeartRate);
            builder.append(".");
        }
+        if (hasTravelledDistance) {
+            if (shouldVoiceAnnounceAverageHeartRate() && sensorStatistics != null && sensorStatistics.hasHeartRate()) {
+                int averageHeartRate = Math.round(sensorStatistics.avgHeartRate().getBPM());

-        if (shouldVoiceAnnounceLapPower() && currentInterval != null && currentInterval.hasAveragePower()) {
-            int currentPower = Math.round(currentInterval.getAveragePower().getW());
-            if(shouldVoiceAnnounceUnit()) {
-                String template = context.getResources().getString(R.string.power_x_watt);
                builder.append(" ")
-                        .append(MessageFormat.format(template, Map.of("x", currentPower)));
-            } else {
-                builder.append(" ").append(context.getString(R.string.power)).append(" ");
-                builder.append(String.valueOf(currentPower));
+                        .append(context.getString(R.string.average_heart_rate));
+                appendCardinal(builder, context.getString(R.string.sensor_state_heart_rate_value, averageHeartRate), averageHeartRate);
+                builder.append(".");
            }
-            builder.append(".");
-        }
+            if (shouldVoiceAnnounceLapHeartRate() && currentInterval != null && currentInterval.hasAverageHeartRate()) {
+                int currentHeartRate = Math.round(currentInterval.getAverageHeartRate().getBPM());

+                builder.append(" ")
+                        .append(context.getString(R.string.lap_heart_rate));
+                appendCardinal(builder, context.getString(R.string.sensor_state_heart_rate_value, currentHeartRate), currentHeartRate);
+                builder.append(".");
+            }
+
+            if (shouldVoiceAnnounceLapPower() && currentInterval != null && currentInterval.hasAveragePower()) {
+                int currentPower = Math.round(currentInterval.getAveragePower().getW());
+                if (shouldVoiceAnnounceUnit()) {
+                    String template = context.getResources().getString(R.string.power_x_watt);
+                    builder.append(" ")
+                            .append(MessageFormat.format(template, Map.of("x", currentPower)));
+                } else {
+                    builder.append(" ").append(context.getString(R.string.power)).append(" ");
+                    builder.append(String.valueOf(currentPower));
+                }
+                builder.append(".");
+            }
+        }
        return builder;
    }

@@ -196,6 +223,20 @@ class VoiceAnnouncementUtils {
        }
    }

+    private static void appendTime(@NonNull SpannableStringBuilder builder, OffsetDateTime now) {
+        TtsSpan.TimeBuilder ttsSpan = new TtsSpan.TimeBuilder();
+        ttsSpan.setHours(now.getHour());
+        ttsSpan.setMinutes(now.getMinute());
+
+        String formattedTime = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
+                        .format(now);
+
+        Spannable spannable = new SpannableString(formattedTime + ".");
+        spannable.setSpan(ttsSpan.build(), 0, spannable.length(), SPAN_INCLUSIVE_EXCLUSIVE);
+        builder.append(spannable);
+        builder.append(" ");
+    }
+
    /**
     * Speaks as: 98.14 [UNIT] - ninety eight point one four [UNIT with correct plural form]
     *
@@ -37,7 +37,7 @@ public class GPSManager implements SensorConnector, LocationListenerCompat, GpsS

    private TrackPointCreator trackPointCreator;

-    private SensorManager.SensorDataChangedObserver listener;
+    private SensorManager.SensorDataChangedObserver observer;
    private Context context;
    private Handler handler;

@@ -46,9 +46,9 @@ public class GPSManager implements SensorConnector, LocationListenerCompat, GpsS
    private Duration gpsInterval;
    private Distance thresholdHorizontalAccuracy;

-    public GPSManager(TrackPointCreator trackPointCreator, SensorManager.SensorDataChangedObserver listener) {
+    public GPSManager(TrackPointCreator trackPointCreator, SensorManager.SensorDataChangedObserver observer) {
        this.trackPointCreator = trackPointCreator;
-        this.listener = listener;
+        this.observer = observer;
    }

    public void start(@NonNull Context context, @NonNull Handler handler) {
@@ -60,7 +60,7 @@ public class GPSManager implements SensorConnector, LocationListenerCompat, GpsS
        gpsStatusManager = new GpsStatusManager(context, this, handler);
        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);

-        listener.onConnect(new AggregatorGPS("internal"));
+        observer.onConnect(new AggregatorGPS("internal"));

        registerLocationListener();
        gpsStatusManager.start();
@@ -82,8 +82,8 @@ public class GPSManager implements SensorConnector, LocationListenerCompat, GpsS
        gpsStatusManager.stop();
        gpsStatusManager = null;

-        listener.onDisconnect(new AggregatorGPS("internal"));
-        listener = null;
+        observer.onDisconnect(new AggregatorGPS("internal"));
+        observer = null;

        trackPointCreator = null;
    }
@@ -139,7 +139,7 @@ public class GPSManager implements SensorConnector, LocationListenerCompat, GpsS
            return;
        }

-        listener.onChange(new Raw<>(Position.of(location)));
+        observer.onChange(new Raw<>(observer.getNow(), Position.of(location)));
    }

    @Override
@@ -124,8 +124,7 @@ public class TrackPointCreator implements SharedPreferences.OnSharedPreferenceCh
        return new Pair<>(currentTrackPoint, sensorDataSet);
    }

-    @VisibleForTesting
-    Instant createNow() {
+    public Instant createNow() {
        return Instant.now(clock);
    }

@@ -0,0 +1,149 @@
+package de.dennisguse.opentracks.settings;
+
+import android.annotation.SuppressLint;
+import android.app.LocaleConfig;
+import android.content.Context;
+import android.os.Build;
+import android.os.LocaleList;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.app.LocaleManagerCompat;
+import androidx.core.os.LocaleListCompat;
+import androidx.preference.ListPreference;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+
+import de.dennisguse.opentracks.R;
+
+public class LocalePreference extends ListPreference {
+
+    private String TAG = LocalePreference.class.getSimpleName();
+
+    public LocalePreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context);
+    }
+
+    public LocalePreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    public LocalePreference(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public LocalePreference(@NonNull Context context) {
+        super(context);
+        init(context);
+    }
+
+    // /data/user/0/de.dennisguse.opentracks.debug/files/androidx.appcompat.app.AppCompatDelegate.application_locales_record_file: open failed: ENOENT (No such file or directory)
+    private void init(Context context) {
+        setPersistent(false);
+
+        LocaleItem systemDefaultLocale = new LocaleItem("", context.getString(R.string.settings_locale_system_default));
+
+        LocaleItem currentLocale = new LocaleItem(Locale.getDefault().toLanguageTag(), Locale.getDefault().getDisplayName());
+
+        // All available options
+        LocaleList supportedLocales = getLocaleListCompat();
+
+        ArrayList<LocaleItem> localeItemsSorting = new ArrayList<>();
+        for (int i = 0; i < supportedLocales.size(); i++) {
+            Locale current = supportedLocales.get(i);
+            localeItemsSorting.add(new LocaleItem(current.toLanguageTag(), current.getDisplayName()));
+        }
+
+        localeItemsSorting.removeIf(current -> current.languageTag.equals(currentLocale.languageTag));
+        localeItemsSorting.sort(Comparator.comparing(o -> o.displayName));
+
+        ArrayList<LocaleItem> localeItemList = new ArrayList<>();
+        localeItemList.add(systemDefaultLocale);
+        localeItemList.add(currentLocale);
+        localeItemList.addAll(localeItemsSorting);
+
+        ArrayList<String> entries = new ArrayList<>();
+        ArrayList<String> entryValues = new ArrayList<>();
+
+        for (LocaleItem current : localeItemList) {
+            entries.add(current.displayName);
+            entryValues.add(current.languageTag);
+        }
+
+        setEntries(entries.toArray(new String[]{}));
+        setEntryValues(entryValues.toArray(new String[]{}));
+
+        if (AppCompatDelegate.getApplicationLocales().equals(LocaleListCompat.getEmptyLocaleList())) {
+            setValue(systemDefaultLocale.languageTag);
+        } else {
+            setValue(currentLocale.languageTag);
+        }
+    }
+
+    @Override
+    public void setOnPreferenceChangeListener(@Nullable OnPreferenceChangeListener onPreferenceChangeListener) {
+        super.setOnPreferenceChangeListener(onPreferenceChangeListener);
+    }
+
+    @Override
+    public boolean callChangeListener(Object newValue) {
+        LocaleListCompat newLocale = LocaleListCompat.getEmptyLocaleList();
+        if (!newValue.equals("")) {
+            newLocale = LocaleListCompat.forLanguageTags((String) newValue);
+        }
+        AppCompatDelegate.setApplicationLocales(newLocale);
+        return super.callChangeListener(newValue);
+    }
+
+    record LocaleItem(
+            String languageTag,
+            String displayName
+    ) {
+    }
+
+    // TODO Get this functionality from any Androidx compat library: should be in LocaleListCompat or LocaleManagerCompat
+    // 2024-12-12: on Android 14-: LocaleManagerCompat.getApplicationLocales(getContext()) returned "[]"
+    // See: https://stackoverflow.com/questions/78116375/per-app-language-preferences-get-list-of-apps-available-language-programmatic
+    @Deprecated
+    private LocaleList getLocaleListCompat() {
+        var a = LocaleManagerCompat.getApplicationLocales(getContext());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            return LocaleConfig.fromContextIgnoringOverride(getContext()).getSupportedLocales();
+        }
+
+        @SuppressLint("DiscouragedApi") int localesConfigId = getContext().getResources().getIdentifier("_generated_res_locale_config", "xml", getContext().getPackageName());
+
+        List<String> localeList = new ArrayList<>();
+        XmlPullParser xpp = getContext().getResources().getXml(localesConfigId);
+        try {
+            while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+                if (xpp.getEventType() == XmlPullParser.START_TAG) {
+                    if ("locale".equals(xpp.getName()) && xpp.getAttributeCount() > 0 && xpp.getAttributeName(0).equals("name")) {
+                        localeList.add(xpp.getAttributeValue(0));
+                    }
+                }
+                xpp.next();
+            }
+        } catch (IOException | XmlPullParserException e) {
+            Log.e(TAG, "Could not load locales: " + e.getMessage());
+        }
+        Optional<String> locales = localeList.stream().reduce((s1, s2) -> s1 + "," + s2);
+        return locales
+                .map(LocaleList::forLanguageTags)
+                .orElseGet(LocaleList::getEmptyLocaleList);
+    }
+}
@@ -52,7 +52,6 @@ import de.dennisguse.opentracks.sensors.SensorType;
 import de.dennisguse.opentracks.ui.customRecordingLayout.CsvLayoutUtils;
 import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
 import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO;
-import de.dennisguse.opentracks.util.IntentDashboardUtils;

 /**
 * Utilities to access preferences stored in {@link SharedPreferences}.
@@ -333,6 +332,10 @@ public class PreferencesUtils {
        return getBoolean(R.string.voice_announce_idle_key, true);
    }

+    public static boolean shouldVoiceAnnounceTime() {
+        return getBoolean(R.string.voice_announce_unit_key, true);
+    }
+
    public static boolean shouldVoiceAnnounceUnit() {
        return getBoolean(R.string.voice_announce_unit_key, true);
    }
@@ -430,14 +433,23 @@ public class PreferencesUtils {
        setBoolean(R.string.voice_announce_lap_speed_pace_key, value);
    }

-    public static boolean shouldVoiceAnnounceLapHeartRate() {
-        return getBoolean(R.string.voice_announce_lap_heart_rate_key, false);
-    }
-
    public static boolean shouldVoiceAnnounceLapPower() {
        return getBoolean(R.string.voice_announce_lap_power_key, false);
    }

+    public static boolean shouldVoiceAnnounceHeartRateCurrent() {
+        return getBoolean(R.string.voice_announce_heart_rate_current_key, false);
+    }
+
+    @VisibleForTesting
+    public static void setVoiceAnnounceHeartRateCurrent(boolean value) {
+        setBoolean(R.string.voice_announce_heart_rate_current_key, value);
+    }
+
+    public static boolean shouldVoiceAnnounceLapHeartRate() {
+        return getBoolean(R.string.voice_announce_lap_heart_rate_key, false);
+    }
+
    @VisibleForTesting
    public static void setVoiceAnnounceLapHeartRate(boolean value) {
        setBoolean(R.string.voice_announce_lap_heart_rate_key, value);
@@ -860,14 +872,6 @@ public class PreferencesUtils {
        sharedPreferences.edit().clear().commit();
    }

-    public static void setShowOnMapFormat(final String showOnMapFormat) {
-        setString(R.string.show_on_map_format_key, showOnMapFormat);
-    }
-
-    public static String getShowOnMapFormat() {
-        return getString(R.string.show_on_map_format_key, IntentDashboardUtils.PREFERENCE_ID_ASK);
-    }
-
    public static int getTotalRowsDeleted() {
        return getInt(R.string.total_rows_deleted_key, 0);
    }
--- a/Show More
+++ b/Show More