Release: v3.20.1

Translated using Weblate (Spanish (Latin America))
Currently translated at 100.0% (427 of 427 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/es_419/
2026-10-02 09:33:06 +02:00 · 2021-09-03 19:46:51 +02:00 · 2021-09-02 21:55:28 +02:00 · 2021-09-02 21:55:25 +02:00 · 2021-09-02 21:55:15 +02:00 · 2021-08-31 08:45:48 +02:00
255 changed files with 6173 additions and 5518 deletions
@@ -0,0 +1,34 @@
+#https://github.com/marketplace/actions/android-emulator-runner
+name: Build nightly
+on: [ push ]
+
+jobs:
+  nightly-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2.3.4
+
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+
+      - name: Assemble nighlty APK
+        shell: bash
+        run: |
+          echo ${NIGHTLY_STORE_FILE} | base64 -d > KEY_NIGHTLY.jks
+          ./gradlew assembleNightly -Dnightly_store_file=KEY_NIGHTLY.jks -Dnightly_store_password="${NIGHTLY_STORE_PASSWORD}" -Dnightly_key_alias="${NIGHTLY_KEY_ALIAS}" -Dnightly_key_password="${NIGHTLY_STORE_PASSWORD}"
+        env:
+          NIGHTLY_STORE_FILE: ${{ secrets.NIGHTLY_STORE_FILE }}
+          NIGHTLY_STORE_PASSWORD: ${{ secrets.NIGHTLY_STORE_PASSWORD }}
+          NIGHTLY_KEY_ALIAS: ${{ secrets.NIGHTLY_KEY_ALIAS }}
+
+      - name: Archive
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: OpenTracks-nightly.apk
+          path: ./build/outputs/apk/nightly/OpenTracks-nightly.apk
+          retention-days: 7
+
@@ -1,31 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  schedule:
-    - cron: '0 6 * * 1'
-
-jobs:
-  analyse:
-    name: Analyse
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2.3.4
-      with:
-        fetch-depth: 2
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: java
-
-    - run: |
-       ./gradlew build
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
@@ -0,0 +1,19 @@
+name: Linting
+
+on: [ push ]
+
+jobs:
+  analyse:
+    name: Analyse
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2.3.4
+
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+
+      - run: ./gradlew lint
@@ -1,19 +1,25 @@
 #https://github.com/marketplace/actions/android-emulator-runner
 name: Test
-on: [push, pull_request]
+on: [ push ]
 jobs:
  test:
+    timeout-minutes: 45
    runs-on: macos-latest
    strategy:
      matrix:
-        api-level: [ 23, 26, 29 ]
-        target: [default]
+        api-level: [ 23, 26 ] #TODO Re-enable 29
+        target: [ default ]
    steps:
      - name: checkout
        uses: actions/checkout@v2.3.4

+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+
      - name: run tests
-        uses: reactivecircus/android-emulator-runner@v2.19.0
+        uses: reactivecircus/android-emulator-runner@v2.20.0
        with:
          api-level: ${{ matrix.api-level }}
          target: ${{ matrix.target }}
@@ -21,3 +27,11 @@ jobs:
          profile: Nexus 6
          script: ./gradlew connectedCheck

+      - name: Archive
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: code-coverage-report
+          path: build/reports/androidTests/
+          retention-days: 7
+
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
@@ -51,16 +51,16 @@ _OpenTracks_ is a sport tracking application that completely respects your priva

 ## Screenshots
 <div>
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot1.png">
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot2.png">
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot3.png">
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot4.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot1.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot2.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot3.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot4.png">
 </div>
 <div>
-	<img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot5.png">
-    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot6.png">
-	<img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot7.png">
-	<img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot8.png">
+	<img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot5.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot6.png">
+	<img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot7.png">
+	<img width="23%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot8.png">
 </div>

 ## Features
@@ -79,6 +79,8 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
  * cycling: speed and distance
  * cycling: cadence
  * cycling: power meter
+  * running: speed and cadence
+  An overview of tested sensors: [README_TESTED_SENSORS.md](README_TESTED_SENSORS.md)

 ### Gadgetbridge integration

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

 ## Translations (localization)

@@ -11,6 +11,7 @@
 * Wahoo Tickr (Model: WFBTHR02)
 * Mi Band 3, Amazfit Band 5, Amazfit Bip. These devices are manufactured by Huami, and other Huami devices will very likely work. Theoretically, this sensor must be enabled, but testing reveals that it works even without enabling. For details on how to enable see [Gadgetbridge wiki](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Huami-Heartrate-measurement#bluetooth-heart-rate-sensor)
 * Amazfit Neo. But first you have to enable "Discoverable" and "Activity heart rate sharing" in the official Zepp app. (after pairing with OpenTracks you can disable them again)
+* Garmin HRM-Dual (Reference: 010-12883-00)

 ## CSCP: Cycling Cadence and Speed Service

@@ -50,3 +51,8 @@ Also the distance is not computed.
 * Wahoo Kickr v4.0
 * Rotor 2INpower DM Road (only supports power measurement, cadence measurement is propietary @ firmware v1.061)

+## RSC: running cadence and speed
+
+We do not support type of movement (i.e., walking vs running).
+
+* Polar Stride
@@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
    }
 }

@@ -24,13 +24,8 @@ def getVersionName = { ->
            commandLine 'git', 'describe', '--tags'
            standardOutput = stdout
        }
-        exec {
-            commandLine 'git', 'log', '--format="%h"', '-n 1'
-            standardOutput = stdout
-        }
-        return stdout.toString().replace('\n', '-').replace('"', '').trim()
-    }
-    catch (ignored) {
+        return stdout.toString().trim()
+    } catch (ignored) {
        return null
    }
 }
@@ -39,11 +34,11 @@ android {
    compileOptions {
        coreLibraryDesugaringEnabled true

-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
    }

-    compileSdkVersion 30
+    compileSdkVersion 31

    buildFeatures {
        viewBinding = true
@@ -55,17 +50,27 @@ android {

    defaultConfig {
        applicationId "de.dennisguse.opentracks"
-        versionCode 4253
-        versionName "v3.18.6"
+        versionCode 4441
+        versionName "v3.20.1"

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


-
        minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments clearPackageData: 'true'
+    }
+    signingConfigs {
+        nightly {
+            if (System.getProperty("nightly_store_file") != null) {
+                storeFile file(System.getProperty("nightly_store_file"))
+                storePassword System.getProperty("nightly_store_password")
+                keyAlias System.getProperty("nightly_key_alias")
+                keyPassword System.getProperty("nightly_key_password")
+            }
+        }
    }

    buildTypes {
@@ -74,6 +79,12 @@ android {
            versionNameSuffix "-debug"
        }

+        nightly {
+            signingConfig signingConfigs.nightly
+            applicationIdSuffix ".nightly"
+            versionNameSuffix "-nightly"
+        }
+
        release {
            minifyEnabled false
        }
@@ -92,7 +103,7 @@ android {
 dependencies {
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'

-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
    implementation 'androidx.preference:preference:1.1.1'
    implementation 'androidx.documentfile:documentfile:1.0.1'
    implementation 'com.google.android.material:material:1.4.0'
@@ -103,5 +114,7 @@ dependencies {
    androidTestImplementation 'androidx.test:rules:1.4.0'
    androidTestImplementation 'androidx.test:runner:1.4.0'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'org.mockito:mockito-android:3.10.0'
+    androidTestImplementation 'org.mockito:mockito-android:3.12.4'
+
+    androidTestUtil 'androidx.test:orchestrator:1.4.0'
 }
@@ -43,7 +43,6 @@ class TrackPoint {
    - sensor_power
 }

-
 class Marker {
    - id
    - trackId
@@ -58,6 +57,26 @@ class Marker {
    - photoUrl
 }

+class DataField {
+    - key
+    - title
+    - isVisible
+    - isPrimary
+    - isWide
+}
+
+class StatisticData {
+    - value
+    - unit
+    - description
+}
+StatisticData o-- DataField
+
+class Layout {
+    - profile
+}
+Layout "1" o-- "many" DataField
+
 note left of TrackPoint
 As of OpenTracks version 3.15.0, all times are using device time.
 Before that TrackPoint.time contained GPS time (determined by GPS hardware).
@@ -77,4 +96,4 @@ Trackpoints of Type.SEGMENT_START_MANUAL or Type.SEGMENT_END_MANUAL do not conta

 Tracks recorded prior to OpenTracks version 3.15.0, do neither begin with a Type.SEGMENT_START_MANUAL nor end with a Type.SEGMENT_END_MANUAL.
 end note
-@enduml
+@enduml
@@ -0,0 +1,3 @@
+README.md
+Appfile
+report.xml
@@ -16,23 +16,11 @@
 default_platform(:android)

 platform :android do
-  desc "Runs all the tests"
-  lane :test do
-    gradle(task: "test")
-  end
-
-  desc "Submit a new Beta Build to Crashlytics Beta"
-  lane :beta do
-    gradle(task: "clean assembleRelease")
-    crashlytics
-  
-    # sh "your_script.sh"
-    # You can also use other beta testing services here
-  end
-
-  desc "Deploy a new version to the Google Play"
-  lane :deploy do
-    gradle(task: "clean assembleRelease")
-    upload_to_play_store
+  desc "Upload metadata"
+  lane :metadata do
+    upload_to_play_store(
+        skip_upload_apk: true,
+        skip_upload_changelogs: true
+    )
  end
 end
@@ -12,4 +12,4 @@ Changes:
 - Removed Bluetooth classic sensors
 - Removed Protobuf
 - Removed calorie estimation and activity estimation
- Removed MyTracks Service API (i.e., no integration with other apps)
+- Removed MyTracks Service API (i.e., no integration with other apps)
@@ -14,4 +14,4 @@ Bugfixes:

 Developer:
 - Test are executable (but many failing)
- Enabled continuous integration with TravisCI (no tests)
+- Enabled continuous integration with TravisCI (no tests)
@@ -11,4 +11,4 @@ Bugfix:

 Developer:
 - Upgrade to Gradle 5.6
- Do not minify release builds
+- Do not minify release builds
@@ -13,4 +13,4 @@ Developer:
 - Removed unused parcelable functionality
 - Major cleanup and reformatting
 - Do not use broadcast for app to widget communication
- stats_content.xml does not include other files
+- stats_content.xml does not include other files
@@ -4,4 +4,4 @@ Changes:
 - Settings are now on a single page

 Developer:
- Settings moved to Androidx compat (uses fragments)
+- Settings moved to Androidx compat (uses fragments)
@@ -10,4 +10,4 @@ Bugfix:

 Developer:
 - Replaced actionbar with toolbar
- Migrated to androidx appcompat (incl. Material Design)
+- Migrated to androidx appcompat (incl. Material Design)
@@ -11,4 +11,4 @@ Bugfix:
 - Heart rate wasn't always shown while recording

 Developer:
- Enabled TravisCI instrumentation tests
+- Enabled TravisCI instrumentation tests
@@ -2,4 +2,4 @@ v3.2.4: OpenTracks

 Bugfix:
 - Settings activity crashes
-  Removed possibility to change voice/split frequency from the context menu
+  Removed possibility to change voice/split frequency from the context menu
@@ -12,4 +12,4 @@ Developer:
  - if Settings cannot be loaded reset all preferences
  - moved access to preferences to PreferencesUtil
  - moved default of preferences from code to xml
-  - use SummaryProvider
+  - use SummaryProvider
@@ -5,4 +5,4 @@ Changes:
 - Remove shortcut to Bluetooth settings

 Developer:
- Preferences: moved default of preferences from code to xml
+- Preferences: moved default of preferences from code to xml
@@ -7,4 +7,4 @@ Changes:
 - Added help (in Settings)

 Bugfix:
- TrackDetailActivity: disabled non-working landscape mode (temporary)
+- TrackDetailActivity: disabled non-working landscape mode (temporary)
@@ -7,4 +7,4 @@ Bugfixes:
 - Export via KMZ did not export picture filenames correctly
 - Sharing multiple tracks did not include KMZ files
 - MarkerDetailActivity's UI was not shown
- Settings crashed if preference of heart rate was not initialized
+- Settings crashed if preference of heart rate was not initialized
@@ -7,4 +7,4 @@ Changes:

 Bugfixes:
 - Statistics: heart rate was not shown
- Statistics: time was briefly reset to 0s
+- Statistics: time was briefly reset to 0s
@@ -9,4 +9,4 @@ Bugfix:
 Developer:
 - Replaced TabHost by TabsLayout
 - Removed special first waypoint
- Removed duplicate translations
+- Removed duplicate translations
@@ -11,4 +11,4 @@ Bugfix:

 Developer:
 - Database: remove unused columns
- Database: add indices
+- Database: add indices
@@ -7,4 +7,4 @@ Bugfix:
 - Import of KMZ did not process the photo URL correctly

 Developer:
- Simplified data processing
+- Simplified data processing
@@ -1,4 +1,4 @@
 v3.6.1: OpenTracks

 Bugfix:
- KMZ import: store correct picture path
+- KMZ import: store correct picture path
@@ -1,4 +1,4 @@
 v3.6.2: OpenTracks

 Bugfix:
- Charts were not shown correctly (introduced in v3.6.0)
+- Charts were not shown correctly (introduced in v3.6.0)
@@ -10,4 +10,4 @@ Bugfix:
 - KMZ import: only import used images

 Developer:
- Refactored TrackRecordingService
+- Refactored TrackRecordingService
@@ -4,4 +4,4 @@ Workaround:
 - Hide start GPS button

 Bugfix:
- Fixed null pointer
+- Fixed null pointer
@@ -3,4 +3,4 @@ v3.7.2: OpenTracks
 Bugfix:
 - Re-added start GPS button
 - Track name is not overwritten at the end of a recording
- Markers: removing a photo also deletes the file
+- Markers: removing a photo also deletes the file
@@ -4,4 +4,4 @@ Bugfix:
 - Fixed computation of cadence and speed (via Bluetooth LE sensor)

 Developer:
- Removed unused translations
+- Removed unused translations
@@ -9,4 +9,4 @@ Bugfix:

 Developer:
 - Split TrackDetailActivity
- StatsFragement successor uses ConstraintLayout
+- StatsFragement successor uses ConstraintLayout
@@ -8,4 +8,4 @@ Changes:
 - Show track on map: file format can be selected and opening dashboard works on Android R (API 30+)

 Bugfix:
- App icon now correctly implemented
+- App icon now correctly implemented
@@ -8,4 +8,4 @@ Changes:

 Developer:
 - Replaced AsyncTasks with Threads
- Synchronization: UUID is generated per track (not yet exported)
+- Synchronization: UUID is generated per track (not yet exported)
@@ -13,4 +13,4 @@ Bugfixes:
 - Editing a marker failed on orientation change

 Developer:
- Refactored TrackRecordingService
+- Refactored TrackRecordingService
@@ -5,4 +5,4 @@ Changes:
 - Dashboard is started on the same task

 Bugfixes:
- Intent filters for importing files were far too optimistic
+- Intent filters for importing files were far too optimistic
@@ -11,4 +11,4 @@ Changes:
 Bugfixes:
 - Fixed some rare crashes (NPE)
 - Pace formatting corrected
- App icon in launcher repositioned
+- App icon in launcher repositioned
@@ -1,4 +1,4 @@
 v3.9.1: OpenTracks

 Bugfixes:
- GPS pre-start shows status of fix
+- GPS pre-start shows status of fix
@@ -2,4 +2,4 @@ v3.9.2: OpenTracks

 Bugfixes:
 - Fixed force close on API<25 (due to an animation)
- Reset recording state (on app startup) if crashed while recording
+- Reset recording state (on app startup) if crashed while recording
@@ -1,4 +1,4 @@
 v3.9.3: OpenTracks

 Bugfixes:
- Fixed export all tracks bug.
+- Fixed export all tracks bug.
@@ -7,4 +7,4 @@ Changes:

 Bugfix:
 - GPS was not turned off when stopping a recording
- Show on map via KML/KMZ/GPX was broken due to refactoring
+- Show on map via KML/KMZ/GPX was broken due to refactoring
@@ -2,4 +2,3 @@ v3.13.2: OpenTracks

 Bugfix:
 - Crash in landscape mode
-
@@ -7,4 +7,4 @@ Changes:
 - Marker list performance improved 

 Developer:
- Track.Id/Marker.Id: use null 
+- Track.Id/Marker.Id: use null
@@ -15,4 +15,3 @@ Developer:
 - Replaced communication via SharedPreferences 
 - Use non-static service binder
 - Use altitude in the code base (instead of elevation)
-
@@ -8,4 +8,3 @@ Bugfix:
 - Crash if using pace for voice announcements (introduced in v3.17.0)
 - Statistics showed pace initially (introduced in v3.17.0)
 - Rare crash when deleting tracks
-
@@ -0,0 +1,16 @@
+v3.19.0: OpenTracks
+
+Changes:
+- Support for Running Speed and Cadence (RCS) sensors implemented
+- When sharing a track: a share picture is created
+- No vibration when starting a recording
+- While recording: UI shows most recently received altitude, speed, and bearing (even if not stored)
+
+Bugfix:
+- Computation of total duration should not include paused durations (requires re-import)
+- (again) Use custom summaries if present
+
+Developer:
+- Upgrade to SDK31 and AGP7.0.0 (requires JDK11)
+- TrackRecordingService: extacted sensor fusion (TrackPointCreator) and TrackPoint storage (TrackRecordingManager)
+- ExportImportTest is now deterministics/ constant
@@ -0,0 +1,8 @@
+v3.19.1: OpenTracks
+
+Changes:
+- Updated translations.
+
+Bugfix:
+- Export All Tracks bug fixed.
+- Resume Track bug fixed.
@@ -0,0 +1,9 @@
+v3.20.0: OpenTracks
+
+Changes:
+- While recording: statistics UI is now configurable
+
+Bugfix:
+- Changing track name/ category while recording was ignored (introduced in v3.19.0)
+
+
@@ -0,0 +1,7 @@
+v3.20.1: OpenTracks
+
+Changes:
+- Announcements can now be used by both distance and time
+- Announcements beep if no Text-to-speech software is installed
+- Removed adaptive GPS location frequency
+
@@ -7,4 +7,4 @@ Bugfix:
 -

 Developer:
-
+-
@@ -7,5 +7,5 @@ Features:
 * Altitude shown in EGM2008 (above mean sea level); exported as WGS84
 * Voice announcements
 * Supports Bluetooth LE sensors: heart rate, speed and distance (cycling), cadence (cycling), and power meter (cycling)
-* Export data: export tracks either as KMZ (incl. photos), KML,  or GPX
-* No Internet access: Internet is not used
+* Export data: export tracks either as KMZ (incl. photos), KML, or GPX
+* No Internet access: Internet is not used
@@ -1 +1 @@
-A sport tracker that completely respects your privacy.
+A sport tracker that completely respects your privacy.
@@ -1,11 +1,11 @@
-OpenTracks estas sporto spuranta aplikon kiu tute respektas vian privatecon.
+OpenTracks estas aplikaĵo por registri vian sportan aktivecon, kiu plene respektas vian privatecon.

-Karakterizaĵoj:
-* Sporto spurado: spuri via sporto kaj subĉielaj aktivecoj
-* Fotoj kaj signoj: mark interesaj lokoj dum spurado
-* Altitudo akiro kaj perdo: tra barometric sentilo
-* Altitudo montrita en EGM2008 (supre signifas marnivelo); eksportita kiel WGS84
-* # Vo? o anoncoj
-* Elportas Bluetooth LE sentiloj: koro imposto, rapido kaj distanco (biciklado), kadenco (biciklado), kaj potenco metro (biciklado)
-* Eksportado datumoj: eksporti vojetoj aŭ kiel KMZ (incl. fotoj), KML, aŭ GPX
-* Neniu aliro al Interreto: Internet ne estas uzita
+Eblaĵoj:
+• registri vian sportan kaj alian aktivecon eksterdome
+• fotoj kaj markoj: marki interesajn lokojn dum registri aktivecon
+• registri ŝanĝon de altitudo uzante barometron
+• montri altitudon en EGM2008 (super averaĝa marnivelo); elporti ilin kiel WGS84
+• voĉaj anoncoj
+• subteno por sentiloj BLE por registri vian pulson, rapidon, veturigitan distancon, pedal-rapidon, povumon (biciklado)
+• elporti datumojn al dosieroj KMZ (kun fotoj), KML aŭ GPX
+• funkcias malkonekte: interreta permeso ne estas uzata
@@ -1 +1 @@
-Sporto spuristo ke tute respektas vian privatecon.
+Registrilo de via sporta aktiveco, kiu respektas vian privatecon.
@@ -0,0 +1,16 @@
+v3.18.6: „OpenTracks“
+
+Pakeitimai:
+- „Rodyti žemėlapyje“ funkcionalumas per KML, o ne KMZ
+- Pranešime balsu nėra programos pavadinimo
+- Įrašant: aukščio padidėjimas / praradimas atnaujinamas kas sekundę
+- Išversti parduotuvės aprašymai
+
+Bufiksai:
+- Ištaisyti neteisingi balso pranešimų vertimai
+
+Programuotojas:
+- „Android12“ leidimai (BLUETOOTH_SCAN)
+- „Android12“ leidimai (ACCESS_COARSE_LOCATION)
+- Tvirtinimas „TrackPoints“ (testavimas)
+- Pašalinti nepanaudoti vertimai
@@ -0,0 +1,11 @@
+„OpenTracks“ yra sporto stebėjimo programa, visiškai gerbianti jūsų privatumą.
+
+Funkcijos:
+* Sporto sekimas: stebėkite savo sportinę ir lauko veiklą
+* Nuotraukos ir žymekliai: stebėdami stebėkite įdomias vietas
+* Aukščio padidėjimas ir praradimas: per barometrinį jutiklį
+* EGM2008 nurodytas aukštis (virš vidutinio jūros lygio); eksportuota kaip WGS84
+* Balso pranešimai
+* Palaiko „Bluetooth LE“ jutiklius: širdies ritmą, greitį ir atstumą (važiuojant dviračiu), ritmą (dviračiu) ir galios matuoklį (važiuojant dviračiu)
+* Eksportuoti duomenis: eksportuoti takelius kaip KMZ (įskaitant nuotraukas), KML arba GPX
+* Nėra interneto prieigos: internetas nenaudojamas
@@ -0,0 +1 @@
+Sporto sekimo priemonė, visiškai gerbianti jūsų privatumą.
@@ -0,0 +1 @@
+OpenTracks
@@ -0,0 +1,16 @@
+v3.18.6: OpenTracks
+
+Endringer:
+- «Vis på kart»-funksjonalitet via KML istedenfor KMZ
+- Stemmekunngjøringer inkluderer ikke programnavn
+- Under opptak: Høydeendringer registrert hvert sekund
+- Butikk-oversettelser oversatt
+
+Feilfikser:
+- Fikset ugyldige stemmekunngjøringsoversettelser
+
+Utviklere:
+- Android12-tilganger (Blåtannsskanning)
+- Android12-tilganger (tilgang til grovposisjon)
+- Fastsetting for TrackPoints (testing)
+- Fjernet ubrukte oversettelser
@@ -0,0 +1,11 @@
+OpenTracks er en sportsporingsapp som respekterer ditt personvern.
+
+Funksjoner:
+* Sportsporing: Registrer dine sports- og utendørsaktiviteter
+* Bilder og markører: Marker interessante steder under sporing
+* Total stigning og nedstigning: via barometersensor
+* Høyde vist i EGM2008 (over havnivå); eksportert som WGS84
+* Talemeldinger
+* Støtter Blåtann LE-sensorer: puls, hastighet og distanse (sykling), kadens (sykling) og wattmåler (sykling)
+* Eksport av data: Enten som KMZ (inkl. bilder), KML eller GPX
+* Ingen internettilgang: Internett brukes ikke
@@ -0,0 +1 @@
+En sportsregistrerer som respekterer ditt personvern.
@@ -0,0 +1 @@
+OpenTracks
@@ -0,0 +1,16 @@
+v3.18.6: OpenTracks
+
+Mudanças:
+- Funcionalidade "Mostrar no mapa" via KML em vez de KMZ
+- O anúncio de voz não inclui o nome do aplicativo
+- Durante a gravação: o ganho / perda de elevação é atualizado a cada segundo
+- Descrições da loja traduzidas
+
+Correções:
+- Correções de traduções inválidas no anúncios de voz
+
+Desenvolvedores:
+- Permissões Android12 (BLUETOOTH_SCAN)
+- Permissões Android12 (ACCESS_COARSE_LOCATION)
+- Confirmação de TrackPoints (em teste)
+- Removidas as traduções não utilizadas
@@ -7,5 +7,5 @@ Características:
 * Altitude mostrada no EGM2008 (acima do nível médio do mar); exportado como WGS84
 * Anúncios de voz
 * Suporta sensores Bluetooth LE: frequência cardíaca, velocidade e distância (ciclismo), cadência (ciclismo) e medidor de potência (ciclismo)
-* Exportar dados: exporte trilhas como KMZ (incluindo fotos), KML ou GPX
+* Exportar dados: exporte trilhas como KMZ (incluindo fotos), KML, ou GPX
 * Sem acesso à Internet: a Internet não é usada
@@ -0,0 +1,16 @@
+v3.18.6: OpenTracks
+
+Spremembe:
+
+- "Prikaži na zemljevidu"-funkcionalnost prek KML namesto KMZ
+- Glasovno obvestilo ne vključuje imena aplikacije
+- Med snemanjem: pridobitev/izguba nadmorske višine se posodobi vsako sekundo
+- Prevedeni opisi trgovin
+
+Bufiksi:
+- Vključene so bile naslednje možnosti: popravljeni neveljavni prevodi glasovnih napovedi
+
+Razvijalec:
+- Android12 (BLUETOOTH_SCAN)
+- Android12 dovoljenja (ACCESS_COARSE_LOCATION)
+- Zagotavljanje za TrackPoints (testiranje)
@@ -1,7 +1,7 @@
 OpenTracks je aplikacija za sledenje športu, ki popolnoma spoštuje vašo zasebnost.

 Značilnosti:
-* Športno sledenje: sledite svojim športnim aktivnostim in aktivnostim na prostem.
+* Sledenje športu: sledite svojim športnim aktivnostim in aktivnostim na prostem.
 * Fotografije in oznake: med sledenjem označite zanimive lokacije
 * Pridobivanje in izgubljanje nadmorske višine: prek barometričnega senzorja
 * Nadmorska višina je prikazana v EGM2008 (nad srednjo morsko gladino); izvozi se kot WGS84
@@ -0,0 +1,16 @@
+v3.18.6: OpenTracks
+
+Förändring:
+- "Visa på kartan" - funktionalitet via KML istället för KMZ
+- Röstmeddelande inkluderar inte appnamn
+- Under inspelning: höjd vinst / förlust uppdateras varje sekund
+- Store beskrivningar översatt
+
+Bufixar:
+- Fast ogiltig röst tillkännagivande översättningar
+
+Utvecklare:
+- Android12 behörigheter (BLUETOOTH_SCAN)
+- Android12 behörigheter (ACCESS_COARSE_LOCATION)
+- Bedömning av spårpunkter (provning)
+- Bort oanvända översättningar
@@ -1,5 +1,6 @@
+#Wed Jul 28 23:10:13 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
@@ -1,191 +0,0 @@
-package de.dennisguse.opentracks;
-
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-
-import androidx.test.espresso.DataInteraction;
-import androidx.test.espresso.UiController;
-import androidx.test.espresso.ViewAction;
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.ext.junit.rules.ActivityScenarioRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.GrantPermissionRule;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
-
-import static androidx.test.espresso.Espresso.onData;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.scrollTo;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
-import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anything;
-import static org.hamcrest.Matchers.is;
-
-/**
- * Espresso test that checks the unit for activity category selected.
- * Also it checks that unit is properly when user change from a pace activity to an speed one.
- */
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class EspressoCategoryUnitTest {
-
-    @Rule
-    public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
-
-    @Rule
-    public TestRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
-    private final Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
-    @Rule
-    public TestRule mLocaleRule = new PreferenceMetricUnitRule(context, true);
-
-    @Test
-    public void changeBetweenCategoryUpdateProperlyUnitTest() {
-        // Start record.
-        ViewInteraction appCompatImageButton = onView(
-                allOf(withId(R.id.controller_record), withContentDescription("Record"),
-                        childAtPosition(
-                                allOf(withId(R.id.controller_container),
-                                        childAtPosition(
-                                                withId(R.id.controller_fragment),
-                                                0)),
-                                0),
-                        isDisplayed()));
-        appCompatImageButton.perform(click());
-
-        {
-            // Change to running activity (pace activity).
-            ViewInteraction appCompatImageView = onView(
-                    allOf(withId(R.id.stats_activity_type_icon),
-                            childAtPosition(
-                                    childAtPosition(
-                                            withClassName(is("android.widget.ScrollView")),
-                                            0),
-                                    7)));
-            appCompatImageView.perform(scrollTo(), click());
-
-            DataInteraction imageView = onData(anything())
-                    .inAdapterView(allOf(withId(R.id.choose_activity_type_grid_view),
-                            childAtPosition(
-                                    withClassName(is("android.widget.LinearLayout")),
-                                    0)))
-                    .atPosition(1);
-            imageView.perform(click());
-        }
-
-        // Pace (min/km) in all fields.
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_speed_unit)));
-            textView.perform(waitFor(2000));
-            textView.check(matches(withText("min/km")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_average_speed_unit)));
-            textView.check(matches(withText("min/km")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_max_speed_unit)));
-            textView.check(matches(withText("min/km")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_moving_speed_unit)));
-            textView.check(matches(withText("min/km")));
-        }
-
-        {
-            // Change to biking activity (speed activity).
-            ViewInteraction appCompatImageView = onView(
-                    allOf(withId(R.id.stats_activity_type_icon),
-                            childAtPosition(
-                                    childAtPosition(
-                                            withClassName(is("android.widget.ScrollView")),
-                                            0),
-                                    7)));
-            appCompatImageView.perform(scrollTo(), click());
-
-            DataInteraction imageView = onData(anything())
-                    .inAdapterView(allOf(withId(R.id.choose_activity_type_grid_view),
-                            childAtPosition(
-                                    withClassName(is("android.widget.LinearLayout")),
-                                    0)))
-                    .atPosition(9);
-            imageView.perform(click());
-        }
-
-        // Speed (km/h) in all fields.
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_speed_unit)));
-            textView.perform(waitFor(2000));
-            textView.check(matches(withText("km/h")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_average_speed_unit)));
-            textView.check(matches(withText("km/h")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_max_speed_unit)));
-            textView.check(matches(withText("km/h")));
-        }
-        {
-            ViewInteraction textView = onView(allOf(withId(R.id.stats_moving_speed_unit)));
-            textView.check(matches(withText("km/h")));
-        }
-    }
-
-    private static Matcher<View> childAtPosition(
-            final Matcher<View> parentMatcher, final int position) {
-
-        return new TypeSafeMatcher<View>() {
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("Child at position " + position + " in parent ");
-                parentMatcher.describeTo(description);
-            }
-
-            @Override
-            public boolean matchesSafely(View view) {
-                ViewParent parent = view.getParent();
-                return parent instanceof ViewGroup && parentMatcher.matches(parent)
-                        && view.equals(((ViewGroup) parent).getChildAt(position));
-            }
-        };
-    }
-
-    private static ViewAction waitFor(final long duration_ms) {
-        return new ViewAction() {
-
-            @Override
-            public String getDescription() {
-                return "Wait for milliseconds.";
-            }
-
-            @Override
-            public Matcher<View> getConstraints() {
-                return isDisplayed();
-            }
-
-            @Override
-            public void perform(UiController uiController, final View view) {
-                uiController.loopMainThreadForAtLeast(duration_ms);
-            }
-        };
-    }
-}
@@ -0,0 +1,138 @@
+package de.dennisguse.opentracks;
+
+
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.espresso.NoMatchingViewException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.ViewAssertion;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.action.MotionEvents;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.rule.GrantPermissionRule;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.*;
+import static androidx.test.espresso.matcher.ViewMatchers.*;
+
+import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.hamcrest.CoreMatchers.is;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class EspressoCustomLayoutTest {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    @Rule
+    public ActivityTestRule<TrackListActivity> mActivityTestRule = new ActivityTestRule<>(TrackListActivity.class);
+
+    @Rule
+    public GrantPermissionRule mGrantPermissionRule =
+            GrantPermissionRule.grant(
+                    "android.permission.ACCESS_FINE_LOCATION");
+
+    @Test
+    public void customLayoutTest() {
+        // TrackListActivity: start recording
+        ViewInteraction trackControllerRecordButton = onView(withId(R.id.controller_record));
+        trackControllerRecordButton.perform(click());
+
+        // Get custom layout preferences and check all data fields are showed.
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
+        Layout layout = PreferencesUtils.getCustomLayout(sharedPreferences, context);
+
+        onView(withId(R.id.stats_recycler_view)).check(new RecyclerViewItemCountAssertion((int) layout.getFields().stream().filter(DataField::isVisible).count()));
+
+        // stop recording
+        ViewInteraction trackControllerStopButton = onView(withId(R.id.controller_stop));
+        trackControllerStopButton.perform(veryLongTouch(1600));
+    }
+
+    private static class RecyclerViewItemCountAssertion implements ViewAssertion {
+        private final int expectedCount;
+
+        public RecyclerViewItemCountAssertion(int expectedCount) {
+            this.expectedCount = expectedCount;
+        }
+
+        @Override
+        public void check(View view, NoMatchingViewException noViewFoundException) {
+            if (noViewFoundException != null) {
+                throw noViewFoundException;
+            }
+
+            RecyclerView recyclerView = (RecyclerView) view;
+            RecyclerView.Adapter<?> adapter = recyclerView.getAdapter();
+            assertThat(adapter.getItemCount(), is(expectedCount));
+        }
+    }
+
+    private static Matcher<View> childAtPosition(
+            final Matcher<View> parentMatcher, final int position) {
+
+        return new TypeSafeMatcher<View>() {
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("Child at position " + position + " in parent ");
+                parentMatcher.describeTo(description);
+            }
+
+            @Override
+            public boolean matchesSafely(View view) {
+                ViewParent parent = view.getParent();
+                return parent instanceof ViewGroup && parentMatcher.matches(parent)
+                        && view.equals(((ViewGroup) parent).getChildAt(position));
+            }
+        };
+    }
+
+    private static ViewAction veryLongTouch(final int duration_ms) {
+        return new ViewAction() {
+            @Override
+            public String getDescription() {
+                return "Perform long touch.";
+            }
+
+            @Override
+            public Matcher<View> getConstraints() {
+                return isDisplayed();
+            }
+
+            @Override
+            public void perform(UiController uiController, final View view) {
+                // Get view absolute position
+                int[] location = new int[2];
+                view.getLocationOnScreen(location);
+
+                // Offset coordinates by view position
+                float[] coordinates = new float[]{location[0] + 1, location[1] + 1};
+
+                // Send down event, pause, and send up
+                MotionEvent down = MotionEvents.sendDown(uiController, coordinates, new float[]{1f, 1f}).down;
+                uiController.loopMainThreadForAtLeast(duration_ms);
+                MotionEvents.sendUp(uiController, down, coordinates);
+            }
+        };
+    }
+}
@@ -143,7 +143,7 @@ public class EspressoDeleteTrackTest {
    private static Matcher<View> childAtPosition(
            final Matcher<View> parentMatcher, final int position) {

-        return new TypeSafeMatcher<View>() {
+        return new TypeSafeMatcher<>() {
            @Override
            public void describeTo(Description description) {
                description.appendText("Child at position " + position + " in parent ");
@@ -160,13 +160,15 @@ public class EspressoDeleteTrackTest {
    }

    public static Matcher<View> withListSize (final int size) {
-        return new TypeSafeMatcher<View> () {
-            @Override public boolean matchesSafely (final View view) {
-                return ((ListView) view).getCount () == size;
+        return new TypeSafeMatcher<>() {
+            @Override
+            public boolean matchesSafely(final View view) {
+                return ((ListView) view).getCount() == size;
            }

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

    public static TrackPoint createTrackPoint(int i) {
-        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT);
+        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochSecond(i + 1));
        trackPoint.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
        trackPoint.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
-        trackPoint.setAccuracy((float) i / 100.0f);
+        trackPoint.setHorizontalAccuracy(Distance.of(i / 100.0f));
        trackPoint.setAltitude(i * ALTITUDE_INTERVAL);
-        trackPoint.setTime(Instant.ofEpochSecond(i + 1));
        trackPoint.setSpeed(Speed.of(5f + (i / 10f)));

        trackPoint.setHeartRate_bpm(100f + i);
@@ -160,12 +159,13 @@ public class TestDataUtil {
    }

    public static List<TrackPoint> getTrackPoints(ContentProviderUtils contentProviderUtils, Track.Id trackId) {
-        TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null);
-        ArrayList<TrackPoint> trackPoints = new ArrayList<>();
-        while (trackPointIterator.hasNext()) {
-            trackPoints.add(trackPointIterator.next());
+        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) {
+            ArrayList<TrackPoint> trackPoints = new ArrayList<>();
+            while (trackPointIterator.hasNext()) {
+                trackPoints.add(trackPointIterator.next());
+            }
+            return trackPoints;
        }
-        return trackPoints;
    }

    public static Pair<Track.Id, TrackStatistics> buildTrackWithTrackPoints(ContentProviderUtils contentProviderUtils, int numberOfPoints) {
@@ -12,16 +12,15 @@ public class TestSensorDataUtil {

    public void add(Instant time, Float hr, Float cadence, Float power, TrackPoint.Type type) {
        sensorDataList.add(new TestSensorDataUtil.SensorData(time, hr, cadence, power, type));
-        TrackPoint tp = new TrackPoint(type);
+        TrackPoint tp = new TrackPoint(type, time);
        int i = trackPointList.size() + 1;
        tp.setLatitude(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0);
        tp.setLongitude(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0);
        tp.setHeartRate_bpm(hr);
        tp.setCyclingCadence_rpm(cadence);
        tp.setPower(power);
-        tp.setAccuracy(1f);
+        tp.setHorizontalAccuracy(Distance.of(1f));
        tp.setAltitude(1f);
-        tp.setTime(time);
        tp.setSpeed(Speed.of(5f + (i / 10f)));
        tp.setAltitudeGain(3f);
        tp.setAltitudeLoss(3f);
@@ -13,27 +13,25 @@ public class TrackPointTest {

    @Test
    public void isRecent_true() {
-        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL);
-        tp.setTime(Instant.now());
+        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.now());

        assertTrue(tp.isRecent());
    }

    @Test
    public void isRecent_false() {
-        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL);
-        tp.setTime(Instant.now().minus(2, ChronoUnit.MINUTES));
+        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.now().minus(2, ChronoUnit.MINUTES));

        assertFalse(tp.isRecent());
    }

    @Test
    public void distanceToPrevious() {
-        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.TRACKPOINT)
+        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0))
                .setLatitude(0)
                .setLongitude(0.0001);

-        TrackPoint tp2 = new TrackPoint(TrackPoint.Type.TRACKPOINT)
+        TrackPoint tp2 = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(1))
                .setLatitude(0)
                .setLongitude(0.0002);

@@ -135,10 +135,10 @@ public class CustomContentProviderUtilsTest {

        List<TrackPoint> trackPoints = new ArrayList<>(numPoints);
        for (int i = 0; i < numPoints; ++i) {
-            TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT)
+            TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(i))
                    .setLatitude(37.0 + (double) i / 10000.0)
                    .setLongitude(57.0 - (double) i / 10000.0)
-                    .setAccuracy((float) i / 100.0f)
+                    .setHorizontalAccuracy(Distance.of(i / 100.0f))
                    .setAltitude(i * 2.5);
            trackPoints.add(trackPoint);
        }
@@ -104,8 +104,8 @@ public class SensorDataCyclingTest {
        current.compute(previous, Distance.ofMM(2150));

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

    @Test
@@ -118,8 +118,8 @@ public class SensorDataCyclingTest {
        current.compute(previous, Distance.ofMM(2000));

        // then
-        assertEquals(2, current.getValue().distance.toM(), 0.01);
-        assertEquals(2, current.getValue().speed.toMPS(), 0.01);
+        assertEquals(2, current.getValue().getDistance().toM(), 0.01);
+        assertEquals(2, current.getValue().getSpeed().toMPS(), 0.01);
    }

    @Test
@@ -18,6 +18,7 @@ package de.dennisguse.opentracks.fragments;

 import java.time.Instant;

+import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TrackPoint;

@@ -32,7 +33,7 @@ public class TrackStubUtils {
    public static final long INITIAL_TIME = 1000L;
    private static final double INITIAL_LATITUDE = 22;
    private static final double INITIAL_LONGITUDE = 22;
-    private static final float INITIAL_ACCURACY = 5;
+    private static final Distance INITIAL_ACCURACY = Distance.of(5);
    private static final Speed INITIAL_SPEED = Speed.of(10);
    private static final float INITIAL_BEARING = 3.0f;

@@ -55,7 +56,7 @@ public class TrackStubUtils {
                .setLatitude(latitude)
                .setLongitude(longitude)
                .setAltitude(altitude)
-                .setAccuracy(INITIAL_ACCURACY)
+                .setHorizontalAccuracy(INITIAL_ACCURACY)
                .setSpeed(INITIAL_SPEED)
                .setBearing(INITIAL_BEARING);
    }
@@ -1,11 +1,17 @@
 package de.dennisguse.opentracks.io.file.importer;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.location.Location;
 import android.net.Uri;
 import android.os.Looper;

+import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -19,11 +25,15 @@ import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;

 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.Clock;
+import java.time.Duration;
 import java.time.Instant;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -31,7 +41,6 @@ import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Altitude;
 import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.content.data.Speed;
@@ -39,25 +48,24 @@ import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
+import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower;
+import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
 import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
+import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
+import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.stats.TrackStatistics;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 /**
 * Export a track to {@link TrackFileFormat} and verify that the import is identical.
- * <p>
 */
@RunWith(AndroidJUnit4.class)
 public class ExportImportTest {

-    private static final String TAG = ExportImportTest.class.getSimpleName();
-
    @Rule
    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);

@@ -81,7 +89,6 @@ public class ExportImportTest {
    private File tmpFile;
    private Uri tmpFileUri;

-    private Track track;
    private List<Marker> markers = new ArrayList<>();
    private List<TrackPoint> trackPoints = new ArrayList<>();

@@ -99,35 +106,50 @@ public class ExportImportTest {
    }

    @After
-    public void FileTearDown() {
+    public void FileTearDown() throws TimeoutException {
        tmpFile.deleteOnExit();
        tmpFileUri = null;
+
+        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
+                .getService();
+        service.getTrackPointCreator().setClock(Clock.systemUTC());
    }

    public void setUp(boolean hasSensorDistance) throws TimeoutException {
        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
                .getService();

+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();

+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
        trackId = service.startNewTrack();

        Distance sensorDistance = hasSensorDistance ? Distance.of(5) : null;

-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14, 10, 15, 10, 1, 66, 3, 50, sensorDistance), 0);
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:03Z"), 3, 14, 10, 15, 10, 1, 66, 3, 50, sensorDistance);
        service.insertMarker("Marker 1", "Marker 1 category", "Marker 1 desc", null);
-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance), 0);
-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14.002, 10, 15, 10, 0, 66, 3, 50, sensorDistance), 0);
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:04Z"), 3, 14.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:05Z"), 3, 14.002, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
        service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);
+
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:06Z"), ZoneId.of("CET")));
+        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
        service.pauseCurrentTrack();

+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:20Z"), ZoneId.of("CET")));
        service.resumeCurrentTrack();

-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14.003, 10, 15, 10, 0, 66, 3, 50, sensorDistance), 0);
-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 16, 10, 15, 10, 0, 66, 3, 50, sensorDistance), 0);
-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 16.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance), 0);
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:21Z"), ZoneId.of("CET")));
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:21Z"), 3, 14.003, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:22Z"), 3, 16, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:23Z"), 3, 16.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:24Z"), ZoneId.of("CET")));
+        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
        service.endCurrentTrack();

-        track = contentProviderUtils.getTrack(trackId);
+        Track track = contentProviderUtils.getTrack(trackId);
        track.setIcon(TRACK_ICON);
        track.setCategory(TRACK_CATEGORY);
        track.setDescription(TRACK_DESCRIPTION);
@@ -142,53 +164,14 @@ public class ExportImportTest {

    @After
    public void tearDown() {
-        contentProviderUtils.deleteTrack(context, trackId);
+        if (trackId != null) {
+            contentProviderUtils.deleteTrack(context, trackId);
+        }
        if (importTrackId != null) {
            contentProviderUtils.deleteTrack(context, importTrackId);
        }
    }

-    @LargeTest
-    @Test
-    public void kml_with_trackdetail_and_sensordata() throws TimeoutException, IOException {
-        setUp(true);
-
-        // given
-        Track track = contentProviderUtils.getTrack(trackId);
-
-        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
-
-        // when
-        // 1. export
-        trackExporter.writeTrack(track, context.getContentResolver().openOutputStream(tmpFileUri));
-        contentProviderUtils.deleteTrack(context, trackId);
-
-        // 2. import
-        InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri);
-        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
-        importTrackId = importer.importFile(inputStream).get(0);
-
-        // then
-        // 1. track
-        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
-        assertNotNull(importedTrack);
-        assertEquals(track.getCategory(), importedTrack.getCategory());
-        assertEquals(track.getDescription(), importedTrack.getDescription());
-        assertEquals(track.getName(), importedTrack.getName());
-        assertEquals(track.getIcon(), importedTrack.getIcon());
-
-        // 2. trackpoints
-        TrackPointAssert a = new TrackPointAssert()
-                .noAccuracy();
-        a.assertEquals(trackPoints, TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId));
-
-        // 2. trackstatistics
-        assertTrackStatistics(false, true);
-
-        // 4. markers
-        assertMarkers();
-    }
-
    //TODO Does not test images
    @LargeTest
    @Test
@@ -223,8 +206,30 @@ public class ExportImportTest {
                .noAccuracy();
        a.assertEquals(trackPoints, TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId));

-        // 2. trackstatistics
-        assertTrackStatistics(false, true);
+        // 3. trackstatistics
+        TrackStatistics importedTrackStatistics = importedTrack.getTrackStatistics();
+
+        // Time
+        assertEquals(Instant.parse("2020-02-02T02:02:02Z"), importedTrackStatistics.getStartTime());
+        assertEquals(Instant.parse("2020-02-02T02:02:24Z"), importedTrackStatistics.getStopTime());
+
+        assertEquals(track.getTrackStatistics().getTotalTime(), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(8), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(4), importedTrackStatistics.getMovingTime());
+
+        // Distance
+        assertEquals(Distance.of(30), importedTrackStatistics.getTotalDistance());
+
+        // Speed
+        assertEquals(Speed.of(15), importedTrackStatistics.getMaxSpeed());
+        assertEquals(Speed.of(3.75), importedTrackStatistics.getAverageSpeed());
+        assertEquals(Speed.of(7.5), importedTrackStatistics.getAverageMovingSpeed());
+
+        // Altitude
+        assertEquals(10, importedTrackStatistics.getMinAltitude(), 0.01);
+        assertEquals(10, importedTrackStatistics.getMaxAltitude(), 0.01);
+        assertEquals(1, importedTrackStatistics.getTotalAltitudeGain(), 0.01);
+        assertEquals(1, importedTrackStatistics.getTotalAltitudeLoss(), 0.01);

        // 4. markers
        assertMarkers();
@@ -278,14 +283,14 @@ public class ExportImportTest {

        // then
        // 1. track
-        Track trackImported = contentProviderUtils.getTrack(importTrackId);
-        assertNotNull(trackImported);
-        assertEquals(track.getCategory(), trackImported.getCategory());
-        assertEquals(track.getDescription(), trackImported.getDescription());
-        assertEquals(track.getName(), trackImported.getName());
+        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
+        assertNotNull(importedTrack);
+        assertEquals(track.getCategory(), importedTrack.getCategory());
+        assertEquals(track.getDescription(), importedTrack.getDescription());
+        assertEquals(track.getName(), importedTrack.getName());

        //TODO exporting and importing a track icon is not yet supported by GpxTrackWriter.
-        //assertEquals(track.getIcon(), trackImported.getIcon());
+        //assertEquals(track.getIcon(), importedTrack.getIcon());

        // 2. trackpoints
        // The GPX exporter does not support exporting TrackPoints without lat/lng.
@@ -300,7 +305,29 @@ public class ExportImportTest {
        a.assertEquals(trackPointsWithCoordinates, TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId));

        // 3. trackstatistics
-        assertTrackStatistics(true, false);
+        TrackStatistics trackStatistics = track.getTrackStatistics();
+        TrackStatistics importedTrackStatistics = importedTrack.getTrackStatistics();
+
+        // Time
+        assertEquals(Instant.parse("2020-02-02T02:02:03Z"), importedTrackStatistics.getStartTime());
+        assertEquals(Instant.parse("2020-02-02T02:02:23Z"), importedTrackStatistics.getStopTime());
+
+        assertEquals(Duration.ofSeconds(20), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(19), importedTrackStatistics.getMovingTime());
+
+        // Distance
+        assertEquals(Distance.of(30), importedTrackStatistics.getTotalDistance());
+
+        // Speed
+        assertEquals(Speed.of(15), importedTrackStatistics.getMaxSpeed());
+        assertEquals(Speed.of(1.5), importedTrackStatistics.getAverageSpeed());
+        assertEquals(Speed.of(1.5789473684210527), importedTrackStatistics.getAverageMovingSpeed());
+
+        // Altitude
+        assertEquals(10, importedTrackStatistics.getMinAltitude(), 0.01);
+        assertEquals(10, importedTrackStatistics.getMaxAltitude(), 0.01);
+        assertEquals(1, importedTrackStatistics.getTotalAltitudeGain(), 0.01);
+        assertEquals(1, importedTrackStatistics.getTotalAltitudeLoss(), 0.01);

        // 4. markers
        assertMarkers();
@@ -353,56 +380,49 @@ public class ExportImportTest {
        }
    }

-    private void assertTrackStatistics(boolean isGpx, boolean verifyDistance) {
-        double delta = isGpx ? 0.1 : 0.01;
-        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
+    private void sendLocation(TrackPointCreator trackPointCreator, Instant time, double latitude, double longitude, float accuracy, float speed, float altitude, float altitudeGain, float heartRate, float cyclingCadence, float power, Distance distance) {
+        Location location = new Location("mock");
+        location.setLatitude(latitude);
+        location.setLongitude(longitude);
+        location.setAccuracy(accuracy);
+        location.setSpeed(speed);
+        location.setAltitude(altitude);

-        assertNotNull(importedTrack.getTrackStatistics());
-
-        TrackStatistics trackStatistics = track.getTrackStatistics();
-        TrackStatistics importedTrackStatistics = importedTrack.getTrackStatistics();
-
-        // Time
-        assertTrue(trackStatistics.getStartTime().isBefore(trackStatistics.getStopTime())); //Just to be sure.
-        if (!isGpx) {
-            assertEquals(trackStatistics.getStartTime(), importedTrackStatistics.getStartTime());
-            assertEquals(trackStatistics.getStopTime(), importedTrackStatistics.getStopTime());
-
-            assertEquals(trackStatistics.getTotalTime(), importedTrackStatistics.getTotalTime());
-            assertEquals(trackStatistics.getMovingTime(), importedTrackStatistics.getMovingTime());
-
-            // Distance
-            if (verifyDistance) {
-                assertEquals(trackStatistics.getTotalDistance(), importedTrackStatistics.getTotalDistance());
+        trackPointCreator.setAltitudeSumManager(new AltitudeSumManager() {
+            @Override
+            public void fill(@NonNull TrackPoint trackPoint) {
+                trackPoint.setAltitudeGain(altitudeGain);
+                trackPoint.setAltitudeLoss(altitudeGain);
            }
+        });

-            // Speed
-            assertEquals(trackStatistics.getMaxSpeed(), importedTrackStatistics.getMaxSpeed());
-            assertEquals(trackStatistics.getAverageSpeed(), importedTrackStatistics.getAverageSpeed());
-            assertEquals(trackStatistics.getAverageMovingSpeed(), importedTrackStatistics.getAverageMovingSpeed());
-        }
+        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
+            @Override
+            public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
+                SensorDataSet sensorDataSet = new SensorDataSet();
+                sensorDataSet.set(new SensorDataCyclingPower("power", "power", power));
+                sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", heartRate));

-        // Altitude
-        assertEquals(trackStatistics.getMinAltitude(), importedTrackStatistics.getMinAltitude(), delta);
-        if (isGpx) {
-            assertEquals(trackStatistics.getMaxAltitude(), importedTrackStatistics.getMaxAltitude(), 2);
-        } else {
-            assertEquals(trackStatistics.getMaxAltitude(), importedTrackStatistics.getMaxAltitude(), delta);
-        }
-        assertEquals(trackStatistics.getTotalAltitudeGain(), importedTrackStatistics.getTotalAltitudeGain(), delta);
-        assertEquals(trackStatistics.getTotalAltitudeLoss(), importedTrackStatistics.getTotalAltitudeLoss(), delta);
-    }
+                SensorDataCycling.Cadence cadence = Mockito.mock(SensorDataCycling.Cadence.class);
+                Mockito.when(cadence.hasValue()).thenReturn(true);
+                Mockito.when(cadence.getValue()).thenReturn(cyclingCadence);
+                sensorDataSet.set(cadence);

-    private static TrackPoint createTrackPoint(long time, double latitude, double longitude, float accuracy, float speed, float altitude, float altitudeGain, float heartRate, float cyclingCadence, float power, Distance distance) {
-        TrackPoint tp = new TrackPoint(latitude, longitude, Altitude.WGS84.of(altitude), Instant.ofEpochMilli(time));
-        tp.setAccuracy(accuracy);
-        tp.setSpeed(Speed.of(speed));
-        tp.setHeartRate_bpm(heartRate);
-        tp.setCyclingCadence_rpm(cyclingCadence);
-        tp.setPower(power);
-        tp.setAltitudeGain(altitudeGain);
-        tp.setAltitudeLoss(altitudeGain); //TODO
-        tp.setSensorDistance(distance);
-        return tp;
+                SensorDataCycling.DistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCycling.DistanceSpeed.Data.class);
+                Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
+                Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
+                SensorDataCycling.DistanceSpeed distanceSpeed = Mockito.mock(SensorDataCycling.DistanceSpeed.class);
+                Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
+                Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
+
+                sensorDataSet.set(distanceSpeed);
+
+                sensorDataSet.fillTrackPoint(trackPoint);
+                return sensorDataSet;
+            }
+        });
+
+        trackPointCreator.setClock(Clock.fixed(time, ZoneId.of("CET")));
+        trackPointCreator.getLocationHandler().onLocationChanged(location);
    }
 }
@@ -50,12 +50,12 @@ public class TrackPointAssert {
        }

        if (assertAccuracy) {
-            Assert.assertEquals(expected.hasAccuracy(), actual.hasAccuracy());
-            if (expected.hasAccuracy()) {
-                Assert.assertEquals(expected.getAccuracy(), actual.getAccuracy(), delta);
+            Assert.assertEquals(expected.hasHorizontalAccuracy(), actual.hasHorizontalAccuracy());
+            if (expected.hasHorizontalAccuracy()) {
+                Assert.assertEquals(expected.getHorizontalAccuracy().toM(), actual.getHorizontalAccuracy().toM(), delta);
            }
        } else {
-            Assert.assertFalse(actual.hasAccuracy());
+            Assert.assertFalse(actual.hasHorizontalAccuracy());
        }

        Assert.assertEquals(expected.hasSensorDistance(), actual.hasSensorDistance());
@@ -80,6 +80,19 @@ public class TrackPointAssert {
    }

    public void assertEquals(List<TrackPoint> expected, List<TrackPoint> actual) {
+        try {
+            Assert.assertEquals(expected.size(), actual.size());
+        } catch (AssertionError e) {
+            throw new AssertionError("Expected: " + expected + " actual: " + actual);
+        }
+
+        for (int i = 0; i < expected.size(); i++) {
+            try {
+                assertEquals(expected.get(i), actual.get(i));
+            } catch (AssertionError e) {
+                throw new AssertionError("Expected: " + expected.get(i) + " actual: " + actual.get(i), e);
+            }
+        }
        Assert.assertEquals(expected.size(), actual.size());

        for (int i = 0; i < expected.size(); i++) {
@@ -1,83 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.dennisguse.opentracks.services;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.time.Duration;
-
-import de.dennisguse.opentracks.services.handlers.AdaptiveLocationListenerPolicy;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests the {@link AdaptiveLocationListenerPolicy}.
- *
- * @author youtaol
- */
-@RunWith(JUnit4.class)
-public class AdaptiveLocationListenerPolicyTest {
-
-    private static final Duration MIN = Duration.ofMillis(1000);
-    private static final Duration MAX = Duration.ofMillis(3000);
-    private static final int MIN_DISTANCE = 10;
-    private static final Duration NEW_IDLE_TIME_BIG = Duration.ofMillis(10000);
-    private static final Duration NEW_IDLE_TIME_NORMAL = Duration.ofMillis(5000);
-    private static final Duration NEW_IDLE_TIME_SMALL = Duration.ofMillis(2000);
-    private static final Duration NEW_IDLE_TIME_LESS_THAN_MIN = Duration.ofMillis(500);
-    private AdaptiveLocationListenerPolicy adaptiveLocationListenerPolicy;
-
-    @Before
-    public void setUp() {
-        adaptiveLocationListenerPolicy = new AdaptiveLocationListenerPolicy(MIN, MAX, MIN_DISTANCE);
-    }
-
-    /**
-     * Tests the {@link AdaptiveLocationListenerPolicy#getDesiredPollingInterval()} in four situations.
-     * <ul>
-     * <li>The newIdleTime is bigger than max interval.</li>
-     * <li>The newIdleTime is between min and max interval.</li>
-     * <li>The newIdleTime is smaller than max interval.</li>
-     * <li>The newIdleTime is smaller than the smallest interval unit.</li>
-     * </ul>
-     */
-    @Test
-    public void testGetDesiredPollingInterval() {
-        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_BIG);
-        assertEquals(MAX, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
-
-        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_NORMAL);
-        // First get the half of NEW_IDLE_TIME_NORMAL, and then round it to the nearest second.
-        assertEquals(NEW_IDLE_TIME_NORMAL.dividedBy(2).getSeconds(), adaptiveLocationListenerPolicy.getDesiredPollingInterval().getSeconds());
-
-        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_SMALL);
-        assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
-
-        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_LESS_THAN_MIN);
-        assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
-    }
-
-    /**
-     * Tests the method {@link AdaptiveLocationListenerPolicy#getMinDistance_m()}.
-     */
-    @Test
-    public void testGetMinDistance() {
-        assertEquals(MIN_DISTANCE, adaptiveLocationListenerPolicy.getMinDistance_m());
-    }
-}
@@ -40,20 +40,21 @@ public class TrackRecordingServiceNotificationManagerTest {

    @Test
    public void updateLocation_triggersAlertOnlyOnFirstInaccurateLocation() {
-        when(trackPointMock.hasAccuracy()).thenReturn(true);
-        when(trackPointMock.getAccuracy()).thenReturn(999f);
+        when(trackPointMock.hasHorizontalAccuracy()).thenReturn(true);
+        when(trackPointMock.getHorizontalAccuracy()).thenReturn(Distance.of(999f));
        when(trackPointMock.getSpeed()).thenReturn(Speed.of(0));
        when(trackStatisticsMock.getTotalDistance()).thenReturn(Distance.of(0));
-        when(notificationCompatBuilder.setOnlyAlertOnce(anyBoolean())).thenReturn(notificationCompatBuilder);
+        when(notificationCompatBuilder.setOnlyAlertOnce(anyBoolean()))
+                .thenReturn(notificationCompatBuilder);

        TrackRecordingServiceNotificationManager subject = new TrackRecordingServiceNotificationManager(notificationManager, notificationCompatBuilder);
        subject.setMetricUnits(true);

        // when
-        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, 100);
-        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, 100);
-        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, 1000);
-        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, 100);
+        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, Distance.of(100));
+        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, Distance.of(100));
+        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, Distance.of(1000));
+        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, Distance.of(100));

        // then
        verify(notificationCompatBuilder, times(6)).setOnlyAlertOnce(true);
@@ -15,6 +15,13 @@
 */
 package de.dennisguse.opentracks.services;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import android.content.ContentProvider;
 import android.content.Context;
 import android.content.Intent;
@@ -22,6 +29,7 @@ import android.content.SharedPreferences;
 import android.os.IBinder;
 import android.os.Looper;

+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
@@ -37,13 +45,16 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;

+import java.time.Clock;
 import java.time.Instant;
+import java.time.ZoneId;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
@@ -51,16 +62,12 @@ import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
+import de.dennisguse.opentracks.io.file.importer.TrackPointAssert;
+import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
+import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 /**
 * Tests for the track recording service.
 *
@@ -99,6 +106,14 @@ public class TrackRecordingServiceTest {
        return new Intent(context, TrackRecordingService.class);
    }

+    private final AltitudeSumManager altitudeSumManager = new AltitudeSumManager() {
+        @Override
+        public void fill(@NonNull TrackPoint trackPoint) {
+            trackPoint.setAltitudeGain(0f);
+            trackPoint.setAltitudeLoss(0f);
+        }
+    };
+
    @Before
    public void setUp() {
        // Set up the mock content resolver
@@ -123,6 +138,7 @@ public class TrackRecordingServiceTest {
        if (service.isRecording() || service.isPaused()) {
            service.endCurrentTrack();
        }
+        service.getTrackPointCreator().setClock(Clock.systemUTC());

        // Ensure that the database is empty after every test
        contentProviderUtils.deleteAllTracks(context);
@@ -189,40 +205,34 @@ public class TrackRecordingServiceTest {
        assertTrue(service.isRecording());
    }

-    @MediumTest
-    @Test
-    public void testRecording_start() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-
-        // when
-        Track.Id trackId = service.startNewTrack();
-
-        // then
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-
-        assertEquals(1, trackPoints.size());
-        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
-    }
-
    @MediumTest
    @Test
    public void testRecording_stop() throws TimeoutException {
        // given
        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                .getService();
+
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);

        // when
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
        service.endCurrentTrack();

        // then
        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);

-        assertEquals(2, trackPoints.size());
-        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
-        assertEquals(TrackPoint.Type.SEGMENT_END_MANUAL, trackPoints.get(1).getType());
+        TrackPointAssert a = new TrackPointAssert();
+        a.assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:02Z")),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:03Z"))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), trackPoints);
    }

    @MediumTest
@@ -231,52 +241,79 @@ public class TrackRecordingServiceTest {
        // given
        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                .getService();
+
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);

        // when
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
        service.pauseCurrentTrack();

        // then
        assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());

        //when
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
        service.resumeTrack(trackId);

        // then
        assertTrue(service.isRecording());

        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        assertEquals(3, trackPoints.size());
-        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
-        assertEquals(TrackPoint.Type.SEGMENT_END_MANUAL, trackPoints.get(1).getType());
-        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(2).getType());
+        TrackPointAssert a = new TrackPointAssert();
+        a.assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:02Z")),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:03Z"))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:04Z"))
+        ), trackPoints);
    }

    @MediumTest
    @Test
-    public void testRecording_resumeStoppedTrack() throws TimeoutException, InterruptedException {
+    public void testRecording_resumeStoppedTrack() throws TimeoutException {
        // given
        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                .getService();
+
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
        Track.Id trackId = service.startNewTrack();
-        assertTrue(service.isRecording());
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
        service.endCurrentTrack();

-        assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
-
        // when
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
        service.resumeTrack(trackId);
-        newTrackPoint(service);
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        trackPointCreator.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z")), Distance.of(50));

        // then
        assertTrue(service.isRecording());

        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        assertEquals(4, trackPoints.size());
-        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
-        assertEquals(TrackPoint.Type.SEGMENT_END_MANUAL, trackPoints.get(1).getType());
-        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(2).getType());
-        assertEquals(TrackPoint.Type.TRACKPOINT, trackPoints.get(3).getType());
+        TrackPointAssert a = new TrackPointAssert();
+        a.assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:02Z")),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:03Z"))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:04Z")),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z"))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), trackPoints);
    }

    @MediumTest
@@ -285,22 +322,32 @@ public class TrackRecordingServiceTest {
        // given
        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                .getService();
+
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
        Track.Id trackId = service.startNewTrack();
-        assertTrue(service.isRecording());
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
        service.pauseCurrentTrack();

-        assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
-
        // when
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
        service.endCurrentTrack();

        // then
        assertFalse(service.isRecording());

        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        assertEquals(2, trackPoints.size());
-        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
-        assertEquals(TrackPoint.Type.SEGMENT_END_MANUAL, trackPoints.get(1).getType());
+        TrackPointAssert a = new TrackPointAssert();
+        a.assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:02Z")),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:03Z"))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), trackPoints);
    }

    @MediumTest
@@ -353,13 +400,23 @@ public class TrackRecordingServiceTest {

    @MediumTest
    @Test
-    public void testInsertWaypointMarker_validWaypoint() throws TimeoutException, InterruptedException {
+    public void testInsertWaypointMarker_validWaypoint() throws TimeoutException {
        // given
        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
                .getService();
+
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.stopGPS();
+
+        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
        Track.Id trackId = service.startNewTrack();
+
        assertTrue(service.isRecording());
-        newTrackPoint(service);
+        trackPointCreator.onNewTrackPoint(
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z"))
+                        .setLatitude(10)
+                        .setLongitude(10)
+                , Distance.of(50));

        // when
        Marker.Id markerId = service.insertMarker(null, null, null, null);
@@ -395,11 +452,7 @@ public class TrackRecordingServiceTest {
        addTrack(dummyTrack);
    }

-    private static void newTrackPoint(TrackRecordingService trackRecordingService) throws InterruptedException {
-        newTrackPoint(trackRecordingService, 45.0f, 35f, 5, 10, System.currentTimeMillis());
-    }
-
-    static void newTrackPoint(TrackRecordingService trackRecordingService, double latitude, double longitude, float accuracy, long speed) throws InterruptedException {
+    static void newTrackPoint(TrackRecordingService trackRecordingService, double latitude, double longitude, float accuracy, long speed) {
        newTrackPoint(trackRecordingService, latitude, longitude, accuracy, speed, System.currentTimeMillis());
    }

@@ -410,9 +463,10 @@ public class TrackRecordingServiceTest {
        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(time))
                .setLongitude(longitude)
                .setLatitude(latitude)
-                .setAccuracy(accuracy)
+                .setHorizontalAccuracy(Distance.of(accuracy))
                .setSpeed(Speed.of(speed))
                .setBearing(3.0f);
-        trackRecordingService.newTrackPoint(trackPoint, 50);
+
+        trackRecordingService.getTrackPointCreator().onNewTrackPoint(trackPoint, Distance.of(50));
    }
 }
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

+import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.Track;
@@ -95,6 +96,7 @@ public class TrackRecordingServiceTestLocation {

        service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
                .getService();
+        service.getTrackPointCreator().stopGPS();
    }

    @After
@@ -105,10 +107,10 @@ public class TrackRecordingServiceTestLocation {

    @MediumTest
    @Test
-    public void testOnLocationChangedAsync_movingAccurate() throws Exception {
+    public void testOnLocationChangedAsync_movingAccurate() {
        // given
        Track.Id trackId = service.startNewTrack();
-        service.setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);

        // when
        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
@@ -127,50 +129,50 @@ public class TrackRecordingServiceTestLocation {
        TrackPointAssert a = new TrackPointAssert()
                .ignoreTime();
        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(1)
+                        .setHorizontalAccuracy(Distance.of(1))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45.0001)
                        .setLongitude(35)
-                        .setAccuracy(2)
+                        .setHorizontalAccuracy(Distance.of(2))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45.0001)
                        .setLongitude(35)
-                        .setAccuracy(3)
+                        .setHorizontalAccuracy(Distance.of(3))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45.0002)
                        .setLongitude(35)
-                        .setAccuracy(4)
+                        .setHorizontalAccuracy(Distance.of(4))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45.0003)
                        .setLongitude(35)
-                        .setAccuracy(5)
+                        .setHorizontalAccuracy(Distance.of(5))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45.0004)
                        .setLongitude(35)
-                        .setAccuracy(6)
+                        .setHorizontalAccuracy(Distance.of(6))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL)
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
        ), trackPoints);
@@ -178,10 +180,10 @@ public class TrackRecordingServiceTestLocation {

    @MediumTest
    @Test
-    public void testOnLocationChangedAsync_slowMovingAccurate() throws Exception {
+    public void testOnLocationChangedAsync_slowMovingAccurate() {
        // given
        Track.Id trackId = service.startNewTrack();
-        service.setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);

        // when
        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
@@ -200,22 +202,22 @@ public class TrackRecordingServiceTestLocation {
        TrackPointAssert a = new TrackPointAssert()
                .ignoreTime();
        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(1)
+                        .setHorizontalAccuracy(Distance.of(1))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45.0005)
                        .setLongitude(35)
-                        .setAccuracy(6)
+                        .setHorizontalAccuracy(Distance.of(6))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL)
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
        ), trackPoints);
@@ -223,10 +225,10 @@ public class TrackRecordingServiceTestLocation {

    @MediumTest
    @Test
-    public void testOnLocationChangedAsync_idle() throws Exception {
+    public void testOnLocationChangedAsync_idle() {
        // given
        Track.Id trackId = service.startNewTrack();
-        service.setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);

        // when
        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
@@ -245,29 +247,29 @@ public class TrackRecordingServiceTestLocation {
        TrackPointAssert a = new TrackPointAssert()
                .ignoreTime();
        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(1)
+                        .setHorizontalAccuracy(Distance.of(1))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT) //TODO Why is this added? Systems is idle and not moving at all.
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null) //TODO Why is this added? Systems is idle and not moving at all.
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(2)
+                        .setHorizontalAccuracy(Distance.of(2))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(6)
+                        .setHorizontalAccuracy(Distance.of(6))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL)
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
        ), trackPoints);
@@ -275,10 +277,11 @@ public class TrackRecordingServiceTestLocation {

    @MediumTest
    @Test
-    public void testOnLocationChangedAsync_idle_withMovement() throws Exception {
+    public void testOnLocationChangedAsync_idle_withMovement() {
        // given
        Track.Id trackId = service.startNewTrack();
-        service.setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().stopGPS();

        // when
        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
@@ -297,36 +300,36 @@ public class TrackRecordingServiceTestLocation {
        TrackPointAssert a = new TrackPointAssert()
                .ignoreTime();
        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(1)
+                        .setHorizontalAccuracy(Distance.of(1))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT) //TODO Check why this trackPoint is inserted.
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null) //TODO Check why this trackPoint is inserted.
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(2)
+                        .setHorizontalAccuracy(Distance.of(2))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT) //TODO Check why this trackPoint is inserted.
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null) //TODO Check why this trackPoint is inserted.
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(5)
+                        .setHorizontalAccuracy(Distance.of(5))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(6)
+                        .setHorizontalAccuracy(Distance.of(6))
                        .setSpeed(Speed.of(15))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL)
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
        ), trackPoints);
@@ -334,11 +337,11 @@ public class TrackRecordingServiceTestLocation {

    @MediumTest
    @Test
-    public void testOnLocationChangedAsync_idle_withSensorData() throws Exception {
+    public void testOnLocationChangedAsync_idle_withSensorData() {
        // given
        Track.Id trackId = service.startNewTrack();
-        service.setAltitudeSumManager(altitudeSumManager);
-        service.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {

            @Override
            public boolean isEnabled() {
@@ -346,10 +349,11 @@ public class TrackRecordingServiceTestLocation {
            }

            @Override
-            public void fill(@NonNull TrackPoint trackPoint) {
+            public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
                SensorDataSet sensorDataSet = new SensorDataSet();
                sensorDataSet.set(new SensorDataHeartRate("sensorName", "sensorAddress", 5f));
                sensorDataSet.fillTrackPoint(trackPoint);
+                return sensorDataSet;
            }
        });

@@ -370,56 +374,56 @@ public class TrackRecordingServiceTestLocation {
        TrackPointAssert a = new TrackPointAssert()
                .ignoreTime();
        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(1)
+                        .setHorizontalAccuracy(Distance.of(1))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
                        .setHeartRate_bpm(5f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(2)
+                        .setHorizontalAccuracy(Distance.of(2))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
                        .setHeartRate_bpm(5f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(3)
+                        .setHorizontalAccuracy(Distance.of(3))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
                        .setHeartRate_bpm(5f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(4)
+                        .setHorizontalAccuracy(Distance.of(4))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
                        .setHeartRate_bpm(5f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(5)
+                        .setHorizontalAccuracy(Distance.of(5))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
                        .setHeartRate_bpm(5f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(6)
+                        .setHorizontalAccuracy(Distance.of(6))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
                        .setHeartRate_bpm(5f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL)
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
                        .setHeartRate_bpm(5f)
@@ -428,10 +432,10 @@ public class TrackRecordingServiceTestLocation {

    @MediumTest
    @Test
-    public void testOnLocationChangedAsync_segment() throws Exception {
+    public void testOnLocationChangedAsync_segment() {
        // given
        Track.Id trackId = service.startNewTrack();
-        service.setAltitudeSumManager(altitudeSumManager);
+        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);

        // when
        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
@@ -450,45 +454,45 @@ public class TrackRecordingServiceTestLocation {
        TrackPointAssert a = new TrackPointAssert()
                .ignoreTime();
        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45)
                        .setLongitude(35)
-                        .setAccuracy(1)
+                        .setHorizontalAccuracy(Distance.of(1))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),

-                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC)
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, null)
                        .setLatitude(45.1)
                        .setLongitude(35)
-                        .setAccuracy(2)
+                        .setHorizontalAccuracy(Distance.of(2))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45.1)
                        .setLongitude(35)
-                        .setAccuracy(3)
+                        .setHorizontalAccuracy(Distance.of(3))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),

-                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC)
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, null)
                        .setLatitude(45.2)
                        .setLongitude(35)
-                        .setAccuracy(4)
+                        .setHorizontalAccuracy(Distance.of(4))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT)
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
                        .setLatitude(45.2)
                        .setLongitude(35)
-                        .setAccuracy(5)
+                        .setHorizontalAccuracy(Distance.of(5))
                        .setSpeed(Speed.of(0))
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL)
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                        .setAltitudeGain(0f)
                        .setAltitudeLoss(0f)
        ), trackPoints);
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
@@ -106,34 +107,6 @@ public class TrackRecordingServiceTestLooper {
        fullRecordingSession();
    }

-    @MediumTest
-    @Test
-    public void testWithProperties_voiceFrequencyDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.voice_frequency_key), Integer.parseInt(context.getResources().getString(R.string.voice_frequency_default)));
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_voiceFrequencyByDistance() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.voice_frequency_key), -1);
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_voiceFrequencyByTime() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.voice_frequency_key), 1);
-        editor.commit();
-        fullRecordingSession();
-    }
-
-
    @MediumTest
    @Test
    public void testWithProperties_maxRecordingDistanceDefault() throws TimeoutException {
@@ -234,15 +207,16 @@ public class TrackRecordingServiceTestLooper {

        // Insert a few points, markers and statistics.
        for (int i = 0; i < 30; i++) {
-            TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT)
+            //TODO Should send locations to LocationHandler instead of TrackPoints to TrackPointCreator?
+            TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, service.getTrackPointCreator().createNow())
                    .setLongitude(35.0f + i / 10.0f)
                    .setLatitude(45.0f - i / 5.0f)
-                    .setAccuracy(5)
+                    .setHorizontalAccuracy(Distance.of(5))
                    .setSpeed(Speed.of(10))
                    .setBearing(3.0f);

-            int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(sharedPreferences, context);
-            service.newTrackPoint(trackPoint, prefAccuracy);
+            Distance prefAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy(sharedPreferences, context);
+            service.getTrackPointCreator().onNewTrackPoint(trackPoint, prefAccuracy);

            if (i % 7 == 0) {
                service.insertMarker(null, null, null, null);
@@ -1,5 +1,9 @@
 package de.dennisguse.opentracks.services.handlers;

+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.location.Location;
@@ -13,16 +17,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;

-import de.dennisguse.opentracks.R;
+import java.time.Instant;
+
+import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.PreferencesUtils;

-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
@RunWith(MockitoJUnitRunner.class)
 public class LocationHandlerTest {

@@ -30,7 +33,7 @@ public class LocationHandlerTest {
    private final SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);

    @Mock
-    private HandlerServer handlerServer;
+    private TrackPointCreator trackPointCreator;

    @InjectMocks
    private LocationHandler locationHandler;
@@ -46,9 +49,13 @@ public class LocationHandlerTest {
        // Let's use default values.
        sharedPreferences.edit().clear().commit();

-        locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.recording_gps_accuracy_key));
-        locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.min_recording_interval_key));
-        locationHandler.onStart(context);
+        Mockito.when(trackPointCreator.createNow())
+                .thenReturn(Instant.now());
+
+        //TODO REMOVE
+//        locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.recording_gps_accuracy_key));
+//        locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.min_recording_interval_key));
+        locationHandler.onStart(context, sharedPreferences);
    }

    /**
@@ -60,7 +67,7 @@ public class LocationHandlerTest {
        locationHandler.onLocationChanged(createLocation(45f, 35f, 3, 5, System.currentTimeMillis()));

        // then
-        verify(handlerServer, times(1)).sendTrackPoint(any(TrackPoint.class), any(Integer.class));
+        verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
    }

    /**
@@ -76,7 +83,7 @@ public class LocationHandlerTest {
        locationHandler.onLocationChanged(createLocation(latitude, 35f, 3, 5, System.currentTimeMillis()));

        // then
-        verify(handlerServer, times(0)).sendTrackPoint(any(TrackPoint.class), any(Integer.class));
+        verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
    }

    /**
@@ -85,14 +92,14 @@ public class LocationHandlerTest {
    @Test
    public void testOnLocationChanged_poorAccuracy() {
        // given
-        int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(sharedPreferences, context);
+        Distance prefAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy(sharedPreferences, context);

        // when
-        locationHandler.onLocationChanged(createLocation(45f, 35f, prefAccuracy + 1, 5, System.currentTimeMillis()));
+        locationHandler.onLocationChanged(createLocation(45f, 35f, (float) (prefAccuracy.toM() + 1), 5, System.currentTimeMillis()));

        // then
        // no newTrackPoint called
-        verify(handlerServer, times(0)).sendTrackPoint(any(TrackPoint.class), any(Integer.class));
+        verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
    }

    @Test
@@ -105,7 +112,7 @@ public class LocationHandlerTest {
        locationHandler.onLocationChanged(createLocation(99.0, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis()));

        // then
-        verify(handlerServer, times(1)).sendTrackPoint(any(TrackPoint.class), any(Integer.class));
+        verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
    }

    /**
@@ -1,27 +1,29 @@
 package de.dennisguse.opentracks.services.handlers;

+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 import android.content.SharedPreferences;

 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;

+import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.TrackPoint;

-import static org.mockito.Mockito.verify;
-
@RunWith(MockitoJUnitRunner.class)
-public class HandlerServerTest {
+public class TrackPointCreatorTest {

    @Mock
    private Context context;

    @Mock
-    private HandlerServer.HandlerServerInterface server;
+    private TrackPointCreator.Callback server;

    @Mock
    private LocationHandler locationHandler;
@@ -29,39 +31,31 @@ public class HandlerServerTest {
    @Mock
    private SharedPreferences sharedPreferences;

-    private HandlerServer subject;
+    private TrackPointCreator subject;

    @Before
    public void setUp() {
-        subject = new HandlerServer(locationHandler, server);
+        subject = new TrackPointCreator(locationHandler, server);
        subject.start(context);
    }

    @After
    public void tearDown() {
-        subject.stop(context);
-    }
-
-    @Test
-    public void onSharedPreferenceChanged() {
-        // when
-        subject.onSharedPreferenceChanged(context, sharedPreferences, null);
-
-        // then
-        verify(locationHandler).onSharedPreferenceChanged(context, sharedPreferences, null);
+        subject.stop();
    }

+    @Ignore("ServiceExecutor disabled for #822")
    @Test
    public void sendTrackPoint() throws InterruptedException {
        // given
-        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT);
-        int accuracy = 50;
+        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, null);
+        Distance horizontalAccuracyThreshold = Distance.of(50);

        // when
-        subject.sendTrackPoint(trackPoint, accuracy);
+        subject.onNewTrackPoint(trackPoint, horizontalAccuracyThreshold);

        // then
        Thread.sleep(10); // Wait for executor service
-        verify(server).newTrackPoint(trackPoint, accuracy);
+        verify(server).newTrackPoint(trackPoint, horizontalAccuracyThreshold);
    }
 }
@@ -15,6 +15,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;

+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

@@ -25,7 +26,7 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
 import static org.junit.Assert.assertEquals;

@RunWith(AndroidJUnit4.class)
-public class PeriodicTaskExecutorTest {
+public class VoiceAnnouncementManagerTest {

    @Rule
    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
@@ -53,17 +54,38 @@ public class PeriodicTaskExecutorTest {
        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
                .getService();

-        PeriodicTaskExecutor periodicTaskExecutor = new PeriodicTaskExecutor(service, new AnnouncementPeriodicTask.Factory());
-        periodicTaskExecutor.setMetricUnits(true);
-        periodicTaskExecutor.setTaskFrequency(-5);
+        VoiceAnnouncementManager voiceAnnouncementManager = new VoiceAnnouncementManager(service);
+        voiceAnnouncementManager.setFrequency(Distance.ofKilometer(5));

        // when
        TrackStatistics statistics = new TrackStatistics();
-        statistics.setTotalDistance(Distance.of(13000));
-        assertEquals(Distance.of(15000), periodicTaskExecutor.calculateNextTaskDistance(statistics));
+        statistics.setTotalDistance(Distance.ofKilometer(13));
+        voiceAnnouncementManager.restore(statistics);
+        assertEquals(Distance.of(15000), voiceAnnouncementManager.getNextTotalDistance());

        statistics.setTotalDistance(Distance.of(15100));
-        assertEquals(Distance.of(20000), periodicTaskExecutor.calculateNextTaskDistance(statistics));
+        voiceAnnouncementManager.restore(statistics);
+        assertEquals(Distance.of(20000), voiceAnnouncementManager.getNextTotalDistance());
+    }
+
+    @Test
+    public void calculateNextTotalTime() throws TimeoutException {
+        // given
+        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
+                .getService();
+
+        VoiceAnnouncementManager voiceAnnouncementManager = new VoiceAnnouncementManager(service);
+        voiceAnnouncementManager.setFrequency(Duration.ofSeconds(5));
+
+        // when
+        TrackStatistics statistics = new TrackStatistics();
+        statistics.setTotalTime(Duration.ofSeconds(91));
+        voiceAnnouncementManager.restore(statistics);
+        assertEquals(Duration.ofSeconds(95), voiceAnnouncementManager.getNextTotalTime());
+
+        statistics.setTotalTime(Duration.ofSeconds(95));
+        voiceAnnouncementManager.restore(statistics);
+        assertEquals(Duration.ofSeconds(100), voiceAnnouncementManager.getNextTotalTime());
    }

 }
@@ -1,13 +1,16 @@
 package de.dennisguse.opentracks.util;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 import android.bluetooth.BluetoothGattCharacteristic;

 import org.junit.Test;

+import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import de.dennisguse.opentracks.content.sensor.SensorDataRunning;

 public class BluetoothUtilsTest {

@@ -87,4 +90,18 @@ public class BluetoothUtilsTest {
        // then
        assertEquals(40, power_w);
    }
+
+    @Test
+    public void parseRunningSpeedAndCadence_with_distance() {
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID, 0, 0);
+        characteristic.setValue(new byte[]{2, 0, 5, 80, 12, 1});
+
+        // when
+        SensorDataRunning sensor = BluetoothUtils.parseRunningSpeedAndCadence("address", "sensorName", characteristic);
+
+        // then
+        assertEquals(Speed.of(5), sensor.getSpeed());
+        assertEquals(80, sensor.getCadence(), 0.01);
+        assertEquals(Distance.of(26.8), sensor.getTotalDistance());
+    }
 }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Sporto sekimo priemonė, visiškai gerbianti jūsų privatumą.`
				`@@ -0,0 +1 @@`
				`En sportsregistrerer som respekterer ditt personvern.`