Release: v4.1.1

Translated using Weblate (Galician)
Currently translated at 100.0% (502 of 502 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/gl/
2022-09-29 20:23:21 +02:00 · 2022-09-28 21:39:42 +02:00 · 2022-09-28 21:39:42 +02:00 · 2022-09-28 21:39:42 +02:00 · 2022-09-28 21:39:42 +02:00 · 2022-09-28 21:39:33 +02:00
176 changed files with 2799 additions and 1570 deletions
@@ -2,4 +2,4 @@

 liberapay: OpenTracks
 github: [rgmf, pstorch, dennisguse]
-custom: [ https://liberapay.com/OpenTracks, https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore ]
+custom: https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore
@@ -0,0 +1,24 @@
+---
+name: Data not recorded 
+about: Somehow OpenTracks did not record GPS data 
+title: ''
+labels: potential bug 
+assignees: ''
+
+---
+
+**Please describe the problem and how to reproduce it:**
+
+...
+
+**Checklist**
+
+- [ ] Consulted [https://dontkillmyapp.com/]
+- [ ] Power management: battery optimization is disabled for OpenTracks
+
+**Technical information**
+
+- Device: [e.g. Nexus 7 (2013)]
+- OS: [e.g. LineageOS 15.1]
+- OpenTracks version: [e.g. v3.2.4]
+- OpenTracks commit id (only for nightly builds): [e.g. 4b333bb]
@@ -1,9 +1,10 @@
 #https://github.com/marketplace/actions/android-emulator-runner
-name: Build nightly
-on: [ push ]
+name: Build APK
+on:
+  push

 jobs:
-  nightly-build:
+  apk-build:
    runs-on: ubuntu-latest
    steps:
      - name: checkout
@@ -14,7 +15,7 @@ jobs:
          distribution: 'adopt'
          java-version: '11'

-      - name: Assemble nighlty APK
+      - name: Assemble APK
        shell: bash
        run: |
          echo ${NIGHTLY_STORE_FILE} | base64 -d > KEY_NIGHTLY.jks
@@ -28,7 +29,7 @@ jobs:
        if: always()
        uses: actions/upload-artifact@v3
        with:
-          name: OpenTracks-nightly.apk
+          name: OpenTracks-APK.apk
          path: ./build/outputs/apk/nightly/*.apk
          retention-days: 7

@@ -2,7 +2,7 @@ name: Linting

 on:
  push:
-  pull_request_target:
+  pull_request:

 jobs:
  analyse:
@@ -2,7 +2,7 @@
 name: Test
 on:
  push:
-  pull_request_target:
+  pull_request:

 jobs:
  test:
@@ -23,7 +23,7 @@ jobs:
          java-version: '11'

      - name: run tests
-        uses: reactivecircus/android-emulator-runner@v2.24.0
+        uses: reactivecircus/android-emulator-runner@v2.26.0
        with:
          api-level: ${{ matrix.api-level }}
          target: ${{ matrix.target }}
@@ -64,19 +64,19 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
 * __Voice announcements__
 * __Photos and Markers:__ mark interesting locations while tracking
 * __Export:__
-  * export tracks either as KMZ (incl. photos), KML, or GPX
-  * export automatically after each recording (e.g., to sync via [Nextcloud](https://nextcloud.com/))
-  * avoid duplication: each exported file contain a random unique identifier (i.e., `opentracks:trackid`)
+    * export tracks either as [KMZ 2.3](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html) (incl. photos), [KML 2.3](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html), or [GPX 1.1](https://www.topografix.com/GPX/1/1/)
+    * export automatically after each recording (e.g., to sync via [Nextcloud](https://nextcloud.com/))
+    * avoid duplication: each exported file contain a random unique identifier (i.e., `opentracks:trackid`)
 * __Altitude:__
-  * gain/loss via barometric sensor (if present)
-  * shown in EGM2008 (above mean sea level); exported as WGS84
+    * gain/loss via barometric sensor (if present)
+    * shown in EGM2008 (above mean sea level); exported as WGS84
 * __Bluetooth LE sensors:__
-  * heart rate
-  * cycling: speed and distance
-  * cycling: cadence
-  * cycling: power meter
-  * running: speed and cadence
-  * support for BLE sensor training only (i.e., without GPS) for indoor training
+    * heart rate
+    * cycling: speed and distance
+    * cycling: cadence
+    * cycling: power meter
+    * running: speed and cadence
+    * support for BLE sensor training only (i.e., without GPS) for indoor training

  An overview of tested sensors: [README_TESTED_SENSORS.md](README_TESTED_SENSORS.md)

@@ -95,7 +95,7 @@ OpenTracks can be used with [Gadgetbridge](https://www.gadgetbridge.org/):
 __Only required permission:__
 * _ACCESS_FINE_LOCATION_: required to use the GPS.

-### API
+### Public API

 OpenTracks includes an API for starting/stopping recording by another installed application (e.g., [Automate](https://llamalab.com/automate/), [Tasker](https://tasker.joaoapps.com), or [Easer](https://github.com/renyuneyun/Easer)).
 The API can be invoked by sending an explicit Intent to start an activity.
@@ -107,20 +107,42 @@ The API can be invoked by sending an explicit Intent to start an activity.
 * Nightly: `de.dennisguse.opentracks.nightly`

 `Class`:
+
 * **Start a recording:**  `de.dennisguse.opentracks.publicapi.StartRecording`
 * **Stop a recording:**  `de.dennisguse.opentracks.publicapi.StopRecording`

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

-The Start/Stop API is disabled by default to protect the user's privacy, but it can easily be enabled in the settings.
+`StartRecording` supports the following parameters:

-## Custom Dashboards (incl. map)
-As of v3.3.1, OpenTracks supports custom dashboards for displaying previously recorded and live tracks.
+* Set track data: `TRACK_NAME`, `TRACK_DESCRIPTION`, `TRACK_CATEGORY`, and `TRACK_ICON` (non-localized identifier see [/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38](/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38)). 
+  NOTE: if `TRACK_ICON` is not present, `TRACK_CATEGORY` will be used to determine the icon (localized).
+* Send recorded data to another application via _Dashboard API_: `STATS_TARGET_PACKAGE` and `STATS_TARGET_CLASS`

-The reference implementation is [OSMDashboard](https://github.com/OpenTracksApp/OSMDashboard), which presents an OpenStreetMap map (showing the current track, incl. updates). The Dashboard API is also used by [Gadgetbridge](https://codeberg.org/Freeyourgadget/Gadgetbridge/) for displaying live track statistics on supported wearables.
+The Public API is disabled by default to protect the user's privacy, but it can easily be enabled in the settings.

-Alternatively, recorded tracks can be shared as KMZ/GPX with installed applications (e.g., [OsmAnd](https://play.google.com/store/apps/details?id=net.osmand)).
-However, this is rather slow and does not provide updates while recording.
+## File formats compatibility with open-source software
+
+|                                                      | [GPX 1.1](https://www.topografix.com/GPX/1/1/) | [KML 2.3](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html) | [KMZ 2.3](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html) |
+|------------------------------------------------------|------------------------------------------------|----------------------------------------------------------------------|----------------------------------------------------------------------|
+| [OpenLayers 7.1.0](https://openlayers.org/)          | ?                                              | [no](https://github.com/openlayers/openlayers/issues/14104)          | [no](https://github.com/openlayers/openlayers/issues/14104)          |
+| [Golden Cheetah 3.5](https://www.goldencheetah.org/) | ?                                              | [no](https://github.com/GoldenCheetah/GoldenCheetah/issues/4271)     | [no](https://github.com/GoldenCheetah/GoldenCheetah/issues/4271)     |
+| [GpxPod](https://apps.nextcloud.com/apps/gpxpod)     | ?                                              | ?                                                                    | ?                                                                    |
+| [OsmAnd](https://github.com/osmandapp/OsmAnd)        | ?                                              | [no](https://github.com/osmandapp/OsmAnd/issues/15271)               | [no](https://github.com/osmandapp/OsmAnd/issues/15271)               |
+
+## Dashboard API (incl. map)
+
+As of v3.3.1, OpenTracks supports custom dashboards for displaying previously recorded and live
+tracks.
+
+The reference implementation is [OSMDashboard](https://github.com/OpenTracksApp/OSMDashboard), which
+presents an OpenStreetMap map (showing the current track, incl. updates). The Dashboard API is also
+used by [Gadgetbridge](https://codeberg.org/Freeyourgadget/Gadgetbridge/) for displaying live track
+statistics on supported wearables.
+
+Alternatively, recorded tracks can be shared as KMZ/GPX with installed applications (
+e.g., [OsmAnd](https://play.google.com/store/apps/details?id=net.osmand)). However, this is rather
+slow and does not provide updates while recording.

 The developer documentation is in [README_API.md](README_API.md).

@@ -2,7 +2,7 @@

 ## 0x180D: Heartrate Service

-* Decathlon|Geonaute|Kalenji Dual HRM Belt
+* Decathlon/Geonaute/Kalenji Dual HRM Belt
 * moofit heart rate monitor
 * Polar H7
 * Polar H10
@@ -38,17 +38,13 @@ However, often only one value is provided.

 We only support _Instantaneous Power_.

-_WARNING_: we only support physically movements with valid GPS coordinates.
-Using a device indoors (no GPS available) will only show the current power values, but won't store anything.
-Also the distance is not computed.
-
-For cycling:
+For cycling (incl. cadence):
 * Assioma Duo Powermeter
 * Elite drivo II
 * QUARQ Red DZero Powermeter
 * Tacx Satori Smart
 * Wahoo Kickr v4.0
-* Rotor 2INpower DM Road (only supports power measurement, cadence measurement is propietary @ firmware v1.061)
+* Rotor 2INpower DM Road (only supports power measurement, cadence measurement is proprietary @ firmware v1.061)

 For running:
 * Stryd
@@ -67,12 +63,12 @@ There are smartphones that have a barometric sensor that OpenTracks uses to comp

 In our tests there are smartphones whose barometric sensor works well and others don't. Here is a list of the smartphones tested:

-|Brand|Model|Android Version|Tests|
-|-----|-----|---------------|-----------|
-|Google|Pixel|LineageOS 17.1|Ok|
-|Google|Pixel 2 XL|LineageOS 17.1|Ok on the bike handlebars but it fails when I carry it in a pocket or backpack|
-|Google|Pixel 3|Android 11|Failure|
-|Google|Pixel 3a|Android 11|Ok|
-|Google|Pixel 3a|Lineage 18.1|Ok|
-|Google|Pixel 4a|Android 11|Ok|
-|Sony|Xperia XZ1 Compact|LineageOS 16.1|Failure|
+| Brand  | Model              | Android Version | Tests                                                                          |
+|--------|--------------------|-----------------|--------------------------------------------------------------------------------|
+| Google | Pixel              | LineageOS 17.1  | Ok                                                                             |
+| Google | Pixel 2 XL         | LineageOS 17.1  | Ok on the bike handlebars but it fails when I carry it in a pocket or backpack |
+| Google | Pixel 3            | Android 11      | Failure                                                                        |
+| Google | Pixel 3a           | Android 11      | Ok                                                                             |
+| Google | Pixel 3a           | Lineage 18.1    | Ok                                                                             |
+| Google | Pixel 4a           | Android 11      | Ok                                                                             |
+| Sony   | Xperia XZ1 Compact | LineageOS 16.1  | Failure                                                                        |
@@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.3.0'
    }
 }

@@ -51,7 +51,7 @@ android {
        targetCompatibility JavaVersion.VERSION_11
    }

-    compileSdkVersion 32
+    compileSdk 33

    buildFeatures {
        viewBinding true
@@ -59,13 +59,13 @@ android {

    defaultConfig {
        applicationId "de.dennisguse.opentracks"
-        versionCode 4938
-        versionName "v4.0.2"
+        versionCode 5051
+        versionName "v4.1.1"

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

-        minSdkVersion 21
-        targetSdkVersion 32
+        minSdk 21
+        targetSdk 33

        testInstrumentationRunner "de.dennisguse.opentracks.TestRunner"
        testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -81,6 +81,8 @@ android {
        }
    }

+    namespace 'de.dennisguse.opentracks'
+
    buildTypes {
        debug {
            applicationIdSuffix ".debug"
@@ -100,6 +102,7 @@ android {
        releasePlayStore {
            applicationIdSuffix ".playstore"
            versionNameSuffix "-PlayStore"
+            signingConfig signingConfigs.debug
        }
    }

@@ -117,20 +120,23 @@ android {
 }

 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'

-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
    implementation 'androidx.preference:preference:1.2.0'
    implementation 'androidx.documentfile:documentfile:1.0.1'
    implementation 'com.google.android.material:material:1.6.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-splashscreen:1.0.0'

    androidTestImplementation 'androidx.test:core:1.4.0'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
    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:4.6.1'
+    androidTestImplementation 'org.mockito:mockito-android:4.8.0'

    androidTestUtil 'androidx.test:orchestrator:1.4.1'
 }
@@ -7,4 +7,4 @@ Funktionen & Features:
 * zeichnet deine Herzfrequenz auf (Bluetooth LE)
 * nutze beim Radfahren deine Trittfrequenz- und Geschwindigkeitssensoren sowie Leistungsmesser (Bluetooth LE)
 * exportiert deine Daten als KML oder GPX
-* funktioniert ganz ohne Internet
+* funktioniert ganz ohne Internet
@@ -1 +1 @@
-OpenTracks – ein GPS-Tracker, der deine Daten für sich behält.
+OpenTracks – ein GPS-Tracker, der deine Daten für sich behält.
@@ -0,0 +1,8 @@
+v4.0.3: OpenTracks
+
+Changes:
+- Max. speed as reported by sensor (GPS or BLE)
+
+Bugfix:
+- Prevent crash if OSM Dashboard is not installed
+- GPX track export: do not export empty track segments
@@ -0,0 +1,13 @@
+v4.0.4: OpenTracks
+
+Changes:
+- Store BLE sensor data even without distance (every 10s)
+- Public API: allows setting name, category, and description
+
+Bugfix:
+- Crash when taking a picture and rotating the phone
+- 
+
+Developer:
+- Target SDK 33
+- Barometer uses interval of 5s
@@ -0,0 +1,8 @@
+v4.0.5: OpenTracks
+
+Changes:
+- PlayStore relase get's another logo
+
+Bugfix:
+- Interval list shows "-" if gain/loss is not present
+
@@ -0,0 +1,6 @@
+v4.0.6: OpenTracks
+
+Bugfix:
+- EGM2008 offset computed wrong for negative longitudes
+- PublicAPI crashed if OpenTracks was in background (API26+)
+
@@ -0,0 +1,11 @@
+v4.0.7: OpenTracks
+
+Changes:
+- GPS signal lost timeout: 30s
+- Android13: request permission to show notifications
+- Faster deletion of tracks (vacuum database only if needed)
+
+Bugfix:
+- PublicAPI stop command resulted in crash (introduced in v4.0.6)
+- Permissions: request all permissions during on startup
+
@@ -0,0 +1,11 @@
+v4.0.8: OpenTracks
+
+Changes:
+- Altitude always shown in m/ft
+- Show track timezone if different than device timezone
+- PublicAPI: support setting the track icon explicitly
+
+Developer:
+- Introduced DistanceFormatter
+- Upgrade to AGP 7.3/desugar for Duration.class
+- Android12+: do splashscreen via Androidx
@@ -0,0 +1,8 @@
+v4.1.0: OpenTracks
+
+Changes:
+- Export KML/KMZ version 2.3 only (was 2.2)
+- For crank-based powermeters: fetch cadence
+
+Bugfix:
+- Workaround for crash on "import all"
@@ -0,0 +1,7 @@
+v4.1.1: OpenTracks
+
+Changes:
+- Add introduction screen (show once)
+
+Bugfix:
+- Do not crash if no GPS device is present
@@ -0,0 +1,16 @@
+v3.18.6: OpenTracks
+
+Thay đổi:
+- Tính năng "Hiện trên bản đồ" thông qua KML thay vì KMZ
+- Thông báo bằng giọng nói không bao gồm tên ứng dụng
+- Trong lúc ghi: Tăng/ giảm độ cao được cập nhật mỗi giây
+- Thông tin cửa hàng được cập nhật
+
+Sửa lỗi:
+- Sửa lỗi các bản dịch Thông báo giọng nói không hợp lệ
+
+Phát triển:
+- Quyền Android 12 (BLUETOOTH_SCAN)
+- Quyền Android 12 (ACCESS_COARSE_LOCATION)
+- Khẳng định cho TrackPoints (thử nghiệm)
+- Loại bỏ các bản dịch thừa
@@ -1,11 +1,22 @@
-OpenTracks là một môn thể thao theo dõi ứng dụng hoàn toàn tôn trọng sự riêng tư.
+OpenTracks là một ứng dụng theo dõi thể theo tôn trọng sự riêng tư của bạn.

-Tính năng:
-* Thể theo dõi theo dõi thể thao và hoạt động ngoài trời
-* Ảnh và đánh dấu: đánh dấu địa điểm thú vị trong khi theo dõi
-* Độ cao được và mất: thông qua khí quyển cảm biến
-* Độ cao thể hiện trong EGM2008 (trên mực nước biển); xuất khẩu như WGS84
-* Tiếng nói thông báo
-* Hỗ trợ Bluetooth LE cảm biến: tim, tốc độ và khoảng cách (đi xe đạp), nhịp (đi xe đạp), và đồng hồ điện (đi xe đạp)
-* Xuất dữ liệu: xuất bài hát hoặc là BIỂU (bao gồm. ảnh) DÕI hay C
-* Không có Internet: Internet là không được sử dụng
+Thể thao và các hoạt động ngoài trời cho bạn niềm vui, kĩ năng và sự tự tin.
+
+Quý trọng sức khỏe của bạn bằng cách theo dõi tập luyện của bạn.
+Ghi lại quá trình khi bạn chạy bộ hoặc đi bộ, và cho bạn một màn hình xe đạp khi đạp xe.
+Đánh dấu những địa điểm thú vị trong lúc bạn di chuyển bằng hình ảnh.
+Giữ các thống kê chi tiết để phân tích kĩ càng.
+Chỉ chia sẻ những dữ liệu bạn muốn chia sẻ.
+
+* Thông báo bằng giọng nói.
+* Hỗ trợ Bluetooth LE cảm biến: nhịp tim, tốc độ và khoảng cách (đi xe đạp), nhịp (đi xe đạp), và đồng hồ sức mạnh (đi xe đạp)
+* Tăng hoặc giảm độ cao: thông qua cảm biến khí áp.
+* Độ cao được hiển thị dưới EGM2009 (trên nghĩa là trên mực nước biển), KML hoặc GPX.
+* Xuất dữ liệu được lại dưới KMZ (gồm hình ảnh), KML hoặc GPX.
+* Không cần Internet hoặc các quyền không cần thiết.
+* Chế độ tối hoặc sáng, theo cài đặt hệ thống.
+* Không quảng cáo.
+
+Phần mềm Libre / Free Software / Mã nguồn mở
+có nghĩa là bạn có thể dùng, học tập, thay đổi và chia sẻ mã nguồn.
+Licensed Apache 2.0
@@ -1 +1 @@
-Một môn thể thao theo dõi mà hoàn toàn tôn trọng sự riêng tư.
+Một người bạn theo dõi mà tôn trọng sự riêng tư của bạn.
@@ -1,11 +1,22 @@
-OpenTracks是一个完全尊重你的隐私的运动跟踪应用程序。
+一款尊重您的隐私的运动追踪应用。
+
+健康幸福的生活总少不了各种运动和户外活动。
+
+使用本应用，您可以保持对您的训练数据的有效追踪，为您的健康助力。
+本应用可以在您跑步或散步时记录数据，也可以在您骑车时作为一个大屏幕自行车电脑。
+您可以为路上的有趣位置创建标记，还可以用图片作为标记。
+您的数据会被详尽地记录下来，供您查阅分析。
+您的数据只会分享给您想要分享给的人。

-特点。
-* 运动追踪：追踪你的运动和户外活动
-* 照片和标记：在跟踪时标记有趣的地点
-* 海拔增减：通过气压传感器
-* 高度显示为EGM2008（平均海平面以上）；导出为WGS84
 * 语音播报
-* 支持蓝牙LE传感器：心率、速度和距离（骑车）、节奏（骑车）和功率计（骑车）。
-* 导出数据：以KMZ（包括照片）、KML或GPX形式导出轨迹
-* 没有互联网接入。不使用互联网
+* 支持蓝牙LE传感器：心率、速度和距离（骑车）、踏频（骑车）和功率计（骑车）。
+* 海拔增减：通过气压传感器。
+* EGM2008 海拔显示（平均海平面以上）；导出为 WGS84。
+* 导出路线数据，支持 KMZ（包括照片）、KML 和 GPX 格式。
+* 不需要联网，不需要额外权限。
+* 深色和浅色主题，跟随系统设置。
+* 没有广告。
+
+本应用是开源软件
+意味着您可以使用、学习、修改和分发本应用的源代码。
+本应用使用 Apache 2.0 协议发布。
@@ -1 +1 @@
-一个完全尊重你隐私的运动追踪器。
+一款尊重您的隐私的运动追踪应用。
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -3,48 +3,25 @@ package de.dennisguse.opentracks;

 import static androidx.test.espresso.Espresso.onData;
 import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.Espresso.pressBack;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.longClick;
-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.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 de.dennisguse.opentracks.util.EspressoUtils.childAtPosition;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
-import static de.dennisguse.opentracks.util.EspressoUtils.withListSize;

-import android.app.ActivityManager;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.view.View;
-import android.widget.ListView;
-
-import androidx.test.espresso.IdlingRegistry;
-import androidx.test.espresso.IdlingResource;
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.espresso.assertion.ViewAssertions;
 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.TypeSafeMatcher;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import de.dennisguse.opentracks.services.TrackDeleteService;
-
@LargeTest
@RunWith(AndroidJUnit4.class)
 public class EspressoDeleteTrackTest {
@@ -4,7 +4,6 @@ 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.longClick;
-import static androidx.test.espresso.action.ViewActions.scrollTo;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
@@ -15,6 +15,10 @@
 */
 package de.dennisguse.opentracks.chart;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -25,10 +29,6 @@ import org.junit.runner.RunWith;

 import de.dennisguse.opentracks.R;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /**
 * Tests {@link ChartValueSeries}.
 *
@@ -7,7 +7,6 @@ import android.util.Pair;

 import org.junit.Test;

-import java.util.HashSet;
 import java.util.Set;

 import de.dennisguse.opentracks.data.models.Track;
@@ -24,10 +23,7 @@ public class ShareContentProviderTest {

    @Test
    public void testCreateAndParseURI_valid() {
-        Set<Track.Id> trackIds = new HashSet<>();
-        trackIds.add(new Track.Id(1));
-        trackIds.add(new Track.Id(3));
-        trackIds.add(new Track.Id(5));
+        Set<Track.Id> trackIds = Set.of(new Track.Id(1), new Track.Id(3), new Track.Id(5));

        Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(trackIds, "filename.suffix", TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA);

@@ -36,9 +32,7 @@ public class ShareContentProviderTest {

    @Test
    public void testCreateURIescapeFilename() {
-        Set<Track.Id> trackIds = new HashSet<>();
-        trackIds.add(new Track.Id(1));
-        Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(trackIds, "../../&1=1", TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA);
+        Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(Set.of(new Track.Id(1)), "../../&1=1", TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA);

        assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/KML_WITH_TRACKDETAIL_AND_SENSORDATA/1/..%2F..%2F%261%3D1"), shareURIandMIME.first);
    }
@@ -7,6 +7,7 @@ import junit.framework.TestCase;
 import org.junit.Test;
 import org.junit.runner.RunWith;

+import java.time.Duration;
 import java.time.Instant;

 import de.dennisguse.opentracks.data.models.Track;
@@ -105,7 +106,7 @@ public class TrackSelectionTest extends TestCase {
        long oneDay = 24 * 60 * 60 * 1000;
        TrackSelection filterWrong1 = new TrackSelection().addDateRange(instant, null);
        TrackSelection filterWrong2 = new TrackSelection().addDateRange(null, instant);
-        TrackSelection filterOk = new TrackSelection().addDateRange(instant, instant.plusMillis(oneDay));
+        TrackSelection filterOk = new TrackSelection().addDateRange(instant, instant.plus(Duration.ofDays(1)));

        // when
        SelectionData selectionWrong1 = filterWrong1.buildSelection();
@@ -28,14 +28,14 @@ public class KmlTrackExporterTest {
    @Test
    public void writeCloseSegment_only_write_sensordata_if_present() {
        String expected = "<when>1970-01-01T00:00:00Z</when>\n" +
-                "<gx:coord/>\n" +
+                "<coord/>\n" +
                "<when>1970-01-01T01:00:00+01:00</when>\n" +
-                "<gx:coord/>\n" +
+                "<coord/>\n" +
                "<ExtendedData>\n" +
                "<SchemaData schemaUrl=\"#schema\">\n" +
                "</SchemaData>\n" +
                "</ExtendedData>\n" +
-                "</gx:Track>\n";
+                "</Track>\n";

        // given
        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(0));
@@ -61,7 +61,8 @@ import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
 import de.dennisguse.opentracks.sensors.AltitudeSumManager;
 import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
-import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadence;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataHeartRate;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
@@ -155,26 +156,31 @@ public class ExportImportTest {
        mockAltitudeChange(trackPointCreator, 1);
        mockBLESensorData(trackPointCreator, 15f, sensorDistance, 66f, 3f, 50f);

-        trackPointCreator.setClock("2020-02-02T02:02:05Z");
+        trackPointCreator.setClock("2020-02-02T02:02:14Z");
+        mockBLESensorData(trackPointCreator, 15f, null, 66f, 3f, 50f);
+        trackPointCreator.setClock("2020-02-02T02:02:15Z");
+        mockBLESensorData(trackPointCreator, null, null, 66f, 3f, 50f);
+
+        trackPointCreator.setClock("2020-02-02T02:02:16Z");
        mockBLESensorData(trackPointCreator, 5f, Distance.of(2), 66f, 3f, 50f); // Distance will be added to next TrackPoint

-        sendLocation(trackPointCreator, "2020-02-02T02:02:05Z", 3, 14.001, 10, 13, 15, 10, 0);
+        sendLocation(trackPointCreator, "2020-02-02T02:02:17Z", 3, 14.001, 10, 13, 15, 10, 0);
        service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);

-        trackPointCreator.setClock("2020-02-02T02:02:06Z");
+        trackPointCreator.setClock("2020-02-02T02:02:18Z");
        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, null, trackPointCreator));
        service.endCurrentTrack();

-        trackPointCreator.setClock("2020-02-02T02:02:20Z");
+        trackPointCreator.setClock("2020-02-02T02:03:20Z");
        service.resumeTrack(trackId);

-        sendLocation(trackPointCreator, "2020-02-02T02:02:21Z", 3, 14.002, 10, 13, 15, 10, 0);
+        sendLocation(trackPointCreator, "2020-02-02T02:03:21Z", 3, 14.002, 10, 13, 15, 10, 0);

-        sendLocation(trackPointCreator, "2020-02-02T02:02:22Z", 3, 16, 10, 13, 15, 10, 0);
+        sendLocation(trackPointCreator, "2020-02-02T02:03:22Z", 3, 16, 10, 13, 15, 10, 0);

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

-        trackPointCreator.setClock("2020-02-02T02:02:24Z");
+        trackPointCreator.setClock("2020-02-02T02:03:24Z");
        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, null, trackPointCreator));
        service.endCurrentTrack();

@@ -187,7 +193,7 @@ public class ExportImportTest {
        track = contentProviderUtils.getTrack(trackId);
        trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
        markers = contentProviderUtils.getMarkers(trackId);
-        assertEquals(10, trackPoints.size());
+        assertEquals(12, trackPoints.size());
        assertEquals(2, markers.size());
    }

@@ -231,29 +237,29 @@ public class ExportImportTest {
        // Time
        assertEquals(track.getZoneOffset(), importedTrack.getZoneOffset());
        assertEquals(Instant.parse("2020-02-02T02:02:02Z"), importedTrackStatistics.getStartTime());
-        assertEquals(Instant.parse("2020-02-02T02:02:24Z"), importedTrackStatistics.getStopTime());
+        assertEquals(Instant.parse("2020-02-02T02:03:24Z"), importedTrackStatistics.getStopTime());

        TrackStatistics originalTrackStatistics = track.getTrackStatistics();

        assertEquals(originalTrackStatistics.getTotalTime(), importedTrackStatistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(7), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(19), importedTrackStatistics.getTotalTime());

        assertEquals(originalTrackStatistics.getMovingTime(), importedTrackStatistics.getMovingTime());
        assertEquals(Duration.ofSeconds(3), importedTrackStatistics.getMovingTime());

        // Distance
        assertEquals(originalTrackStatistics.getTotalDistance(), importedTrackStatistics.getTotalDistance());
-        assertEquals(123.16, importedTrackStatistics.getTotalDistance().toM(), 0.01);
+        assertEquals(125.16, importedTrackStatistics.getTotalDistance().toM(), 0.01);

        // Speed
        assertEquals(originalTrackStatistics.getMaxSpeed(), importedTrackStatistics.getMaxSpeed());
-        assertEquals(41.05, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(41.72, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);

        assertEquals(originalTrackStatistics.getAverageSpeed(), importedTrackStatistics.getAverageSpeed());
-        assertEquals(17.59, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
+        assertEquals(6.58, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);

        assertEquals(originalTrackStatistics.getAverageMovingSpeed(), importedTrackStatistics.getAverageMovingSpeed());
-        assertEquals(41.05, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(41.72, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);

        // Altitude
        assertEquals(originalTrackStatistics.getMinAltitude(), importedTrackStatistics.getMinAltitude(), 0.01);
@@ -345,19 +351,19 @@ public class ExportImportTest {
                        .setAltitudeLoss(1f)
                        .setAltitudeGain(1f)
                        .setHorizontalAccuracy(Distance.of(10)),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z"))
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:17Z"))
                        .setLatitude(3)
                        .setLongitude(14.001)
                        .setAltitude(10)
                        .setSpeed(Speed.of(5))
                        .setAltitudeLoss(1f)
                        .setAltitudeGain(1f)
-                        .setSensorDistance(Distance.of(12))
+                        .setSensorDistance(Distance.of(14))
                        .setHeartRate(66f)
                        .setPower(50f)
                        .setCadence(3f)
                        .setHorizontalAccuracy(Distance.of(10)),
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, Instant.parse("2020-02-02T02:02:21Z"))
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, Instant.parse("2020-02-02T02:03:21Z"))
                        .setLatitude(3)
                        .setLongitude(14.002)
                        .setAltitude(10)
@@ -365,7 +371,7 @@ public class ExportImportTest {
                        .setAltitudeGain(0f)
                        .setSpeed(Speed.of(15))
                        .setHorizontalAccuracy(Distance.of(10)),
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, Instant.parse("2020-02-02T02:02:22Z"))
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, Instant.parse("2020-02-02T02:03:22Z"))
                        .setLatitude(3)
                        .setLongitude(16)
                        .setAltitude(10)
@@ -373,7 +379,7 @@ public class ExportImportTest {
                        .setAltitudeGain(0f)
                        .setSpeed(Speed.of(15))
                        .setHorizontalAccuracy(Distance.of(10)),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:23Z"))
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:03:23Z"))
                        .setLatitude(3)
                        .setLongitude(16.001)
                        .setAltitude(10)
@@ -390,18 +396,18 @@ public class ExportImportTest {
        // Time
        assertEquals(track.getZoneOffset(), importedTrack.getZoneOffset());
        assertEquals(Instant.parse("2020-02-02T02:02:03Z"), importedTrackStatistics.getStartTime());
-        assertEquals(Instant.parse("2020-02-02T02:02:23Z"), importedTrackStatistics.getStopTime());
+        assertEquals(Instant.parse("2020-02-02T02:03:23Z"), importedTrackStatistics.getStopTime());

-        assertEquals(Duration.ofSeconds(3), importedTrackStatistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(3), importedTrackStatistics.getMovingTime());
+        assertEquals(Duration.ofSeconds(15), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(15), importedTrackStatistics.getMovingTime());

        // Distance
-        assertEquals(123.16, importedTrackStatistics.getTotalDistance().toM(), 0.01);
+        assertEquals(125.16, importedTrackStatistics.getTotalDistance().toM(), 0.01);

        // Speed
-        assertEquals(41.05, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
-        assertEquals(41.05, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
-        assertEquals(41.05, importedTrackStatistics.getAverageMovingSpeed().toMPS(), 0.01);
+        assertEquals(8.34, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(8.34, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
+        assertEquals(8.34, importedTrackStatistics.getAverageMovingSpeed().toMPS(), 0.01);

        // Altitude
        assertEquals(10, importedTrackStatistics.getMinAltitude(), 0.01);
@@ -458,7 +464,7 @@ public class ExportImportTest {
        contentProviderUtils.deleteTrack(context, trackId);

        // then
-        InputStream expected = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.csv_export);
+        InputStream expected = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.csv_export);
        String expectedText = new BufferedReader(new InputStreamReader(expected, StandardCharsets.UTF_8))
                .lines()
                .collect(Collectors.joining("\n"));
@@ -499,16 +505,16 @@ public class ExportImportTest {
                sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
                sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));

-                SensorDataCycling.CyclingCadence cyclingCadence = Mockito.mock(SensorDataCycling.CyclingCadence.class);
+                SensorDataCyclingCadence cyclingCadence = Mockito.mock(SensorDataCyclingCadence.class);
                Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
                Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
                sensorDataSet.set(cyclingCadence);

                if (distance != null && speed != null) {
-                    SensorDataCycling.DistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCycling.DistanceSpeed.Data.class);
+                    SensorDataCyclingDistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCyclingDistanceSpeed.Data.class);
                    Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
                    Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
-                    SensorDataCycling.DistanceSpeed distanceSpeed = Mockito.mock(SensorDataCycling.DistanceSpeed.class);
+                    SensorDataCyclingDistanceSpeed distanceSpeed = Mockito.mock(SensorDataCyclingDistanceSpeed.class);
                    Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
                    Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
                    sensorDataSet.set(distanceSpeed);
@@ -15,11 +15,16 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;

+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.stream.Collectors;

 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -27,6 +32,8 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
 import de.dennisguse.opentracks.stats.TrackStatistics;

 /**
@@ -62,7 +69,7 @@ public class GPXTrackImporterTest {
    public void gpx_with_pause_resume() throws IOException {
        // given
        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
-        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.legacy_gpx_pause_resume);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.legacy_gpx_pause_resume);

        // when
        // 1. import
@@ -116,7 +123,7 @@ public class GPXTrackImporterTest {
    public void gpx_without_speed() throws IOException {
        // given
        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
-        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.gpx11_without_speed);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx11_without_speed);

        // when
        // 1. import
@@ -164,7 +171,7 @@ public class GPXTrackImporterTest {
    public void gpx_speed_no_namespace() throws IOException {
        // given
        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
-        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.gpx11_with_speed_no_namespace);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx11_with_speed_no_namespace);

        // when
        // 1. import
@@ -181,7 +188,7 @@ public class GPXTrackImporterTest {

        // 3. trackstatistics
        TrackStatistics trackStatistics = importedTrack.getTrackStatistics();
-        assertEquals(4, trackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(4.0, trackStatistics.getMaxSpeed().toMPS(), 0.01);
        assertEquals(Duration.ofSeconds(101), trackStatistics.getMovingTime());

        // 4. trackpoints
@@ -208,4 +215,31 @@ public class GPXTrackImporterTest {
                        .setSpeed(Speed.of(3))
        ), importedTrackPoints);
    }
+
+    @LargeTest
+    @Test
+    public void importExportTest_timezone() throws IOException {
+        // given
+        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx_timezone);
+        InputStream inputStreamExpected = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx_timezone);
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        // when
+        // 1. import
+        importTrackId = importer.importFile(inputStream).get(0);
+        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
+
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
+        trackExporter.writeTrack(importedTrack, outputStream);
+
+        // then
+        String expected = new BufferedReader(
+                new InputStreamReader(inputStreamExpected, StandardCharsets.UTF_8))
+                .lines()
+                .collect(Collectors.joining("\n")) + "\n";
+
+        assertEquals(expected, outputStream.toString()); //TODO inputStream.readAllBytes() ?
+    }
 }
@@ -60,7 +60,7 @@ public class KMLTrackImporterTest {
    public void kml22_order_location_and_when() throws IOException {
        // given
        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
-        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.kml22_order_location_and_when);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.kml22_order_location_and_when);

        // when
        // 1. import
@@ -109,7 +109,7 @@ public class KMLTrackImporterTest {
    public void kml22_time_decreases() throws IOException {
        // given
        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
-        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.kml22_time_decreases);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.kml22_time_decreases);

        // when
        // 1. import
@@ -149,7 +149,7 @@ public class KMLTrackImporterTest {
    public void kml22_with_statistics_marker() throws IOException {
        // given
        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
-        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.legacy_kml22_statistics_marker);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.legacy_kml22_statistics_marker);

        // when
        // 1. import
@@ -223,7 +223,7 @@ public class KMLTrackImporterTest {
    public void kml_without_locations() throws IOException {
        // given
        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
-        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.kml22_without_locations);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.kml22_without_locations);

        // when
        importTrackId = importer.importFile(inputStream).get(0);
@@ -234,7 +234,7 @@ public class KMLTrackImporterTest {
    public void kml_when_locations_different() throws IOException {
        // given
        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
-        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.kml22_when_locations_different);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.kml22_when_locations_different);

        // when
        importTrackId = importer.importFile(inputStream).get(0);
@@ -10,7 +10,8 @@ import org.junit.Test;
 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;

 public class BluetoothUtilsTest {
@@ -18,7 +19,7 @@ public class BluetoothUtilsTest {
    @Test
    public void parseHeartRate_uint8() {
        // given
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEART_RATE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEARTRATE.getServiceUUID(), 0, 0);
        characteristic.setValue(new byte[]{0x02, 0x3C});

        // when
@@ -31,7 +32,7 @@ public class BluetoothUtilsTest {
    @Test
    public void parseHeartRate_uint16() {
        // given
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEART_RATE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEARTRATE.getServiceUUID(), 0, 0);
        characteristic.setValue(new byte[]{0x01, 0x01, 0x01});

        // when
@@ -43,11 +44,11 @@ public class BluetoothUtilsTest {

    @Test
    public void parseCyclingSpeedCadence_crankOnly() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.getServiceUUID(), 0, 0);
        characteristic.setValue(new byte[]{0x02, (byte) 0xC8, 0x00, 0x00, 0x00, 0x06, (byte) 0x99});

        // when
-        SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
+        SensorDataCyclingCadenceAndDistanceSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);

        // then
        assertNull(sensor.getDistanceSpeed());
@@ -56,11 +57,11 @@ public class BluetoothUtilsTest {

    @Test
    public void parseCyclingSpeedCadence_wheelOnly() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.getServiceUUID(), 0, 0);
        characteristic.setValue(new byte[]{0x01, (byte) 0xFF, (byte) 0xFF, 0, 1, 0x45, (byte) 0x99});

        // when
-        SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
+        SensorDataCyclingCadenceAndDistanceSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);

        // then
        assertEquals(65535 + 16777216, sensor.getDistanceSpeed().getWheelRevolutionsCount());
@@ -69,11 +70,11 @@ public class BluetoothUtilsTest {

    @Test
    public void parseCyclingSpeedCadence_crankWheel() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.getServiceUUID(), 0, 0);
        characteristic.setValue(new byte[]{0x03, (byte) 0xC8, 0x00, 0x00, 0x01, 0x06, (byte) 0x99, (byte) 0xE1, 0x00, 0x45, (byte) 0x99});

        // when
-        SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
+        SensorDataCyclingCadenceAndDistanceSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);

        // then
        assertEquals(200 + 16777216, sensor.getDistanceSpeed().getWheelRevolutionsCount());
@@ -82,19 +83,34 @@ public class BluetoothUtilsTest {

    @Test
    public void parseCyclingPower_power() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER_MEASUREMENT_CHAR_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER.getServiceUUID(), 0, 0);
        characteristic.setValue(new byte[]{0, 0, 40, 0});

        // when
-        int power_w = BluetoothUtils.parseCyclingPower(characteristic);
+        SensorDataCyclingPower.Data powerCadence = BluetoothUtils.parseCyclingPower("", "", characteristic);

        // then
-        assertEquals(40, power_w);
+        assertEquals(40, powerCadence.getPower().getValue().getW(), 0.01);
+    }
+
+    @Test
+    public void parseCyclingPower_power_with_cadence() {
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER.getServiceUUID(), 0, 0);
+        characteristic.setValue(new byte[]{0x2C, 0x00, 0x00, 0x00, (byte) 0x9F, 0x00, 0x0C, 0x00, (byte) 0xE5, 0x42});
+
+        // when
+        SensorDataCyclingPower.Data powerCadence = BluetoothUtils.parseCyclingPower("", "", characteristic);
+
+        // then
+        assertEquals(0, powerCadence.getPower().getValue().getW(), 0.01);
+
+        assertEquals(12, powerCadence.getCadence().getCrankRevolutionsCount());
+        assertEquals(17125, powerCadence.getCadence().getCrankRevolutionsTime());
    }

    @Test
    public void parseRunningSpeedAndCadence_with_distance() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.RUNNING_RUNNING_SPEED_CADENCE_CHAR_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.RUNNING_SPEED_CADENCE.getServiceUUID(), 0, 0);
        characteristic.setValue(new byte[]{2, 0, 5, 80, (byte) 0xFF, (byte) 0xFF, 0, 1});

        // when
@@ -21,8 +21,8 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_cadence_1() {
        // given
-        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 1024); // 1s
-        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 2, 2048); // 2s
+        SensorDataCyclingCadence previous = new SensorDataCyclingCadence("sensorAddress", "sensorName", 1, 1024); // 1s
+        SensorDataCyclingCadence current = new SensorDataCyclingCadence("sensorAddress", "sensorName", 2, 2048); // 2s

        // when
        current.compute(previous);
@@ -34,8 +34,8 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_cadence_2() {
        // given
-        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 6184);
-        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 2, 8016);
+        SensorDataCyclingCadence previous = new SensorDataCyclingCadence("sensorAddress", "sensorName", 1, 6184);
+        SensorDataCyclingCadence current = new SensorDataCyclingCadence("sensorAddress", "sensorName", 2, 8016);

        // when
        current.compute(previous);
@@ -47,8 +47,8 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_cadence_sameCount() {
        // given
-        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 1024);
-        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 2048);
+        SensorDataCyclingCadence previous = new SensorDataCyclingCadence("sensorAddress", "sensorName", 1, 1024);
+        SensorDataCyclingCadence current = new SensorDataCyclingCadence("sensorAddress", "sensorName", 1, 2048);

        // when
        current.compute(previous);
@@ -61,8 +61,8 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_cadence_sameTime() {
        // given
-        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 1024);
-        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 2, 1024);
+        SensorDataCyclingCadence previous = new SensorDataCyclingCadence("sensorAddress", "sensorName", 1, 1024);
+        SensorDataCyclingCadence current = new SensorDataCyclingCadence("sensorAddress", "sensorName", 2, 1024);

        // when
        current.compute(previous);
@@ -74,8 +74,8 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_cadence_rollOverTime() {
        // given
-        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, UintUtils.UINT16_MAX - 1024);
-        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 2, 0);
+        SensorDataCyclingCadence previous = new SensorDataCyclingCadence("sensorAddress", "sensorName", 1, UintUtils.UINT16_MAX - 1024);
+        SensorDataCyclingCadence current = new SensorDataCyclingCadence("sensorAddress", "sensorName", 2, 0);

        // when
        current.compute(previous);
@@ -89,8 +89,8 @@ public class SensorDataCyclingTest {
    @Deprecated
    public void compute_cadence_rollOverCount() {
        // given
-        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
-        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCyclingCadence previous = new SensorDataCyclingCadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
+        SensorDataCyclingCadence current = new SensorDataCyclingCadence("sensorAddress", "sensorName", 0, 2048);

        // when
        current.compute(previous);
@@ -102,8 +102,8 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_cadence_overflow() {
        // given
-        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
-        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCyclingCadence previous = new SensorDataCyclingCadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
+        SensorDataCyclingCadence current = new SensorDataCyclingCadence("sensorAddress", "sensorName", 0, 2048);

        // when
        current.compute(previous);
@@ -115,8 +115,8 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_speed() {
        // given
-        SensorDataCycling.DistanceSpeed previous = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", 1, 6184);
-        SensorDataCycling.DistanceSpeed current = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", 2, 8016);
+        SensorDataCyclingDistanceSpeed previous = new SensorDataCyclingDistanceSpeed("sensorAddress", "sensorName", 1, 6184);
+        SensorDataCyclingDistanceSpeed current = new SensorDataCyclingDistanceSpeed("sensorAddress", "sensorName", 2, 8016);

        // when
        current.compute(previous, Distance.ofMM(2150));
@@ -131,8 +131,8 @@ public class SensorDataCyclingTest {
    @Deprecated
    public void compute_speed_rollOverCount() {
        // given
-        SensorDataCycling.DistanceSpeed previous = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
-        SensorDataCycling.DistanceSpeed current = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCyclingDistanceSpeed previous = new SensorDataCyclingDistanceSpeed("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
+        SensorDataCyclingDistanceSpeed current = new SensorDataCyclingDistanceSpeed("sensorAddress", "sensorName", 0, 2048);

        // when
        current.compute(previous, Distance.ofMM(2000));
@@ -145,8 +145,8 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_speed_overflow() {
        // given
-        SensorDataCycling.DistanceSpeed previous = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
-        SensorDataCycling.DistanceSpeed current = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCyclingDistanceSpeed previous = new SensorDataCyclingDistanceSpeed("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
+        SensorDataCyclingDistanceSpeed current = new SensorDataCyclingDistanceSpeed("sensorAddress", "sensorName", 0, 2048);

        // when
        current.compute(previous, Distance.ofMM(2000));
@@ -158,8 +158,8 @@ public class SensorDataCyclingTest {
    @Test
    public void equals_speed_with_no_data() {
        // given
-        SensorDataCycling.DistanceSpeed previous = new SensorDataCycling.DistanceSpeed("sensorAddress");
-        SensorDataCycling.DistanceSpeed current = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCyclingDistanceSpeed previous = new SensorDataCyclingDistanceSpeed("sensorAddress");
+        SensorDataCyclingDistanceSpeed current = new SensorDataCyclingDistanceSpeed("sensorAddress", "sensorName", 0, 2048);

        // when
        previous.toString();
@@ -172,8 +172,8 @@ public class SensorDataCyclingTest {
    @Test
    public void equals_cadence_with_no_data() {
        // given
-        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress");
-        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCyclingCadence previous = new SensorDataCyclingCadence("sensorAddress");
+        SensorDataCyclingCadence current = new SensorDataCyclingCadence("sensorAddress", "sensorName", 0, 2048);

        // when
        previous.toString();
@@ -31,12 +31,14 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.io.file.importer.TrackPointAssert;
 import de.dennisguse.opentracks.sensors.AltitudeSumManager;
 import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataHeartRate;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
@@ -257,6 +259,47 @@ public class TrackRecordingServiceTestRecording {
        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
    }

+    @MediumTest
+    @Test
+    public void testRecording_blesensor_only_no_distance() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getRemoteSensorManager();
+
+        // when
+        String sensor1 = "2020-02-02T02:02:03Z";
+        trackPointCreator.setClock(sensor1);
+        remoteSensorManager.onChanged(new SensorDataHeartRate("", "", HeartRate.of(5))); //Should be ignored
+
+        String sensor3 = "2020-02-02T02:02:13Z";
+        trackPointCreator.setClock(sensor3);
+        remoteSensorManager.onChanged(new SensorDataHeartRate("", "", HeartRate.of(7)));
+
+        String stopTime = "2020-02-02T02:02:15Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // then
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.SENSORPOINT, Instant.parse(sensor3))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+                        .setHeartRate(HeartRate.of(7)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+                        .setHeartRate(HeartRate.of(7))
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+
    @MediumTest
    @Test
    public void testRecording_gpsOnly_recordingDistance_above() {
@@ -64,7 +64,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour 5 minutes 10 seconds. Speed 18.4 kilometers per hour.", announcement);
+        assertEquals("Total distance 20.00 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement);
    }

    @Test
@@ -80,7 +80,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();

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

    @Test
@@ -96,7 +96,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour. Speed 20.0 kilometers per hour.", announcement);
+        assertEquals("Total distance 20.00 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
    }

    @Test
@@ -112,7 +112,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 19.99 kilometers. 1 hour. Speed 20.0 kilometers per hour.", announcement);
+        assertEquals("Total distance 19.99 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
    }

    @Test
@@ -134,7 +134,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, null).toString();

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

    @Test
@@ -188,7 +188,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, true, null, null).toString();

        // then
-        assertEquals("Total distance 12.43 miles. 1 hour 5 minutes 10 seconds. Speed 11.4 miles per hour.", announcement);
+        assertEquals("Total distance 12.43 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement);
    }

    @Test
@@ -210,7 +210,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, true, lastInterval, null).toString();

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

    @Test
@@ -274,7 +274,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();

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

    @Test
@@ -99,7 +99,7 @@ public class DescriptionGeneratorTest {
                        + "Min elevation: -500 m (-1640 ft)<br>"
                        + "Elevation gain: 6000 m (19685 ft)<br>"
                        + "Elevation loss: 6000 m (19685 ft)<br>"
-                        + "Recorded: " + StringUtils.formatDateTime(OffsetDateTime.ofInstant(START_TIME, ZoneId.systemDefault())) + "<br>";
+                        + "Recorded: " + StringUtils.formatDateTimeWithOffset(OffsetDateTime.ofInstant(START_TIME, ZoneId.systemDefault())) + "<br>";

        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
    }
@@ -135,7 +135,7 @@ public class DescriptionGeneratorTest {
                        + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
                        + "Elevation gain: 6000 m (19685 ft)<br>"
                        + "Elevation loss: 6000 m (19685 ft)<br>"
-                        + "Recorded: " + StringUtils.formatDateTime(OffsetDateTime.ofInstant(START_TIME, ZoneId.systemDefault())) + "<br>";
+                        + "Recorded: " + StringUtils.formatDateTimeWithOffset(OffsetDateTime.ofInstant(START_TIME, ZoneId.systemDefault())) + "<br>";

        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
    }
@@ -11,6 +11,7 @@ import org.junit.runner.RunWith;

 import java.time.Duration;
 import java.time.Instant;
+import java.util.List;

 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.data.models.Altitude;
@@ -245,6 +246,70 @@ public class TrackStatisticsUpdaterTest {
    public void addTrackPoint_speed_from_GPS_moving_and_sensor_speed() {
    }

+    @Test
+    public void addTrackPoint_maxSpeed_ignore_above_acceleration() {
+        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
+        assertEquals(Speed.of(0f), subject.getTrackStatistics().getMaxSpeed());
+
+        subject.addTrackPoint(new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(0)));
+        assertEquals(Speed.of(0f), subject.getTrackStatistics().getMaxSpeed());
+
+        // Ignore as we set max speed if two consecutive trackpoints were considered moving
+        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(1))
+                .setSpeed(Speed.of(1f)));
+        assertEquals(Speed.of(0f), subject.getTrackStatistics().getMaxSpeed());
+
+        // Update max speed
+        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(2))
+                .setSpeed(Speed.of(1f)));
+        assertEquals(Speed.of(1f), subject.getTrackStatistics().getMaxSpeed());
+
+        // Update max speed
+        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(12))
+                .setSpeed(Speed.of(50f)));
+        assertEquals(Speed.of(50f), subject.getTrackStatistics().getMaxSpeed());
+
+        // Ignore; we were getting slower
+        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(13))
+                .setSpeed(Speed.of(5f)));
+        assertEquals(Speed.of(50f), subject.getTrackStatistics().getMaxSpeed());
+
+        // Ignore acceleration above 2g
+        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(14))
+                .setSpeed(Speed.of(500f)));
+        assertEquals(Speed.of(50f), subject.getTrackStatistics().getMaxSpeed());
+
+    }
+
+    @Test
+    public void addTrackPoint_maxSpeed_multiple_segments() {
+        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
+        assertEquals(Speed.of(0f), subject.getTrackStatistics().getMaxSpeed());
+
+        subject.addTrackPoints(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(0)),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(1))
+                        .setSpeed(Speed.of(2f)),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(2))
+                        .setSpeed(Speed.of(2f)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochSecond(4))
+        ));
+        assertEquals(Speed.of(2f), subject.getTrackStatistics().getMaxSpeed());
+
+        // when
+        subject.addTrackPoints(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(5)),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(6))
+                        .setSpeed(Speed.of(1f)),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(7))
+                        .setSpeed(Speed.of(1f)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochSecond(8))
+        ));
+
+        // then
+        assertEquals(Speed.of(2f), subject.getTrackStatistics().getMaxSpeed());
+    }
+
    @Test
    public void copy_constructor() {
        // given
@@ -21,7 +21,6 @@ import de.dennisguse.opentracks.data.TrackPointIterator;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.data.models.UnitConversions;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;

@@ -180,7 +179,7 @@ public class IntervalStatisticsTest {

        // then
        assertEquals(trackStatistics.getTotalDistance().toM(), totalDistance.toM(), 0.01);
-        assertEquals(trackStatistics.getTotalTime().toMillis(), totalTime * UnitConversions.S_TO_MS, 1);
+        assertEquals(trackStatistics.getTotalTime().toSeconds(), totalTime, 0.01);
        assertEquals(intervalList.size(), (int) Math.ceil(trackStatistics.getTotalDistance().toM() / distanceInterval));
        if (totalGain != null) {
            assertEquals(totalGain, numberOfPoints * TestDataUtil.ALTITUDE_GAIN, 0.1);
@@ -142,7 +142,7 @@ public class EGM2008UtilsTest {
    }

    @Test
-    public void data_Berlin() throws IOException {
+    public void data_Berlin_Germany_() throws IOException {
        // given
        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
        trackPoint.setLatitude(52.530644);
@@ -157,7 +157,7 @@ public class EGM2008UtilsTest {
    }

    @Test
-    public void data_Berlin_Caching() throws IOException {
+    public void data_Berlin_Germany_Caching() throws IOException {
        // given
        TrackPoint trackPoint1 = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
        trackPoint1.setLatitude(52.530644);
@@ -176,6 +176,22 @@ public class EGM2008UtilsTest {
        assertNotEquals(altitude_egm2008.correctAltitude(trackPoint1.getLocation()), altitude_egm2008.correctAltitude(trackPoint2.getLocation()), 0.0001);
    }

+    @Test
+    public void data_Seattle_USA() throws IOException {
+        // given
+        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
+
+        trackPoint.setLatitude(47.63153);
+        trackPoint.setLongitude(-122.30938);
+        trackPoint.setAltitude(0);
+
+        // when
+        EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
+
+        // then
+        assertEquals(22.99, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
+    }
+
    @Test
    public void data_MaxUndulation() throws IOException {
        // given
@@ -191,6 +207,7 @@ public class EGM2008UtilsTest {
        assertEquals(-85.824, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
    }

+
    @Test
    public void getIndices() {
        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
@@ -208,7 +225,7 @@ public class EGM2008UtilsTest {

        trackPoint.setLatitude(-90);
        trackPoint.setLongitude(-180);
-        assertEquals(new EGM2008Utils.Indices(2160, 0), EGM2008Utils.getIndices(trackPoint.getLocation()));
+        assertEquals(new EGM2008Utils.Indices(2160, 2160), EGM2008Utils.getIndices(trackPoint.getLocation()));
    }

    @Test
@@ -41,12 +41,12 @@ import java.time.format.TextStyle;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.stream.Collectors;

 import de.dennisguse.opentracks.LocaleRule;
+import de.dennisguse.opentracks.TimezoneRule;

 /**
 * Tests for {@link StringUtils}.
@@ -59,6 +59,9 @@ public class StringUtilsTest {
    @Rule
    public final LocaleRule mLocaleRule = new LocaleRule(Locale.ENGLISH);

+    @Rule
+    public TimezoneRule timezoneRule = new TimezoneRule(TimeZone.getTimeZone("Europe/Berlin"));
+
    private final Context context = ApplicationProvider.getApplicationContext();

    /**
@@ -99,51 +102,13 @@ public class StringUtilsTest {
    }

    @Test
-    public void testGetTime_fractional() {
-        assertGetTime("2010-05-04T03:02:01.352Z", 2010, 5, 4, 3, 2, 1, 352);
-        assertGetTime("2010-05-04T03:02:01.3529Z", 2010, 5, 4, 3, 2, 1, 352);
-    }
+    public void testParseTime() {
+        assertEquals(Instant.ofEpochMilli(352), StringUtils.parseTime("1970-01-01T00:00:00.352").toInstant());
+        assertEquals(Instant.ofEpochMilli(352), StringUtils.parseTime("1970-01-01T00:00:00.352Z").toInstant());
+        assertEquals(Instant.ofEpochMilli(352), StringUtils.parseTime("1970-01-01T00:00:00.352+00:00").toInstant());

-    @Test
-    public void testGetTime_timezone() {
-        assertGetTime("2010-05-04T03:02:01", 2010, 5, 4, 3, 2, 1, 0);
-        assertGetTime("2010-05-04T03:02:01Z", 2010, 5, 4, 3, 2, 1, 0);
-        assertGetTime("2010-05-04T03:02:01+00:00", 2010, 5, 4, 3, 2, 1, 0);
-        assertGetTime("2010-05-04T03:02:01-00:00", 2010, 5, 4, 3, 2, 1, 0);
-        assertGetTime("2010-05-04T03:02:01+01:00", 2010, 5, 4, 2, 2, 1, 0);
-        assertGetTime("2010-05-04T03:02:01+10:30", 2010, 5, 3, 16, 32, 1, 0);
-        assertGetTime("2010-05-04T03:02:01-09:30", 2010, 5, 4, 12, 32, 1, 0);
-        assertGetTime("2010-05-04T03:02:01-05:00", 2010, 5, 4, 8, 2, 1, 0);
-    }
-
-    @Test
-    public void testGetTime_fractionalAndTimezone() {
-        assertGetTime("2010-05-04T03:02:01.352Z", 2010, 5, 4, 3, 2, 1, 352);
-        assertGetTime("2010-05-04T03:02:01.47+00:00", 2010, 5, 4, 3, 2, 1, 470);
-        assertGetTime("2010-05-04T03:02:01.5791+03:00", 2010, 5, 4, 0, 2, 1, 579);
-        assertGetTime("2010-05-04T03:02:01.8-05:30", 2010, 5, 4, 8, 32, 1, 800);
-    }
-
-    /**
-     * Asserts the {@link StringUtils#parseTime(String)} returns the expected values.
-     *
-     * @param xmlDateTime the xml date time string
-     * @param year        the expected year
-     * @param month       the expected month
-     * @param day         the expected day
-     * @param hour        the expected hour
-     * @param minute      the expected minute
-     * @param second      the expected second
-     * @param millisecond the expected milliseconds
-     */
-    private void assertGetTime(String xmlDateTime, int year, int month, int day, int hour, int minute, int second, int millisecond) {
-        GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-        calendar.set(year, month - 1, day, hour, minute, second);
-        calendar.set(GregorianCalendar.MILLISECOND, millisecond);
-
-        // This comparision tends to be flaky (difference of 1ms)
-        // Assert.assertEquals(calendar.getTimeInMillis(), StringUtils.parseTime(xmlDateTime));
-        assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime).toInstant().toEpochMilli()) <= 1);
+        assertEquals(Instant.ofEpochMilli(352), StringUtils.parseTime("1970-01-01T01:00:00.352+01:00").toInstant());
+        assertEquals(Instant.ofEpochMilli(352).plus(Duration.ofHours(1)), StringUtils.parseTime("1970-01-01T00:00:00.352-01:00").toInstant());
    }

    @Test
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx
+version="1.1"
+creator="OpenTracks (Debug)"
+xmlns="http://www.topografix.com/GPX/1/1"
+xmlns:topografix="http://www.topografix.com/GPX/Private/TopoGrafix/0/1"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:opentracks="http://opentracksapp.com/xmlschemas/v1"
+xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v2"
+xmlns:gpxtrkx="http://www.garmin.com/xmlschemas/TrackStatsExtension/v1"
+xmlns:cluetrust="http://www.cluetrust.com/Schemas/"
+xmlns:pwr="http://www.garmin.com/xmlschemas/PowerExtension/v1"
+xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.topografix.com/GPX/Private/TopoGrafix/0/1 http://www.topografix.com/GPX/Private/TopoGrafix/0/1/topografix.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v2 https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd http://www.garmin.com/xmlschemas/PowerExtension/v1 https://www8.garmin.com/xmlschemas/PowerExtensionv1.xsd http://www.garmin.com/xmlschemas/TrackStatsExtension/v1 http://www.cluetrust.com/Schemas http://www.cluetrust.com/Schemas/gpxdata10.xsd http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd">
+<wpt lat="3" lon="14">
+<ele>10</ele>
+<time>2021-01-07T21:51:59.179+01:15</time>
+<name><![CDATA[Marker 1]]></name>
+<desc><![CDATA[Marker 1 desc]]></desc>
+<type><![CDATA[Marker 1 category]]></type>
+</wpt>
+<trk>
+<name><![CDATA[2021-01-07 22:51]]></name>
+<desc><![CDATA[the description]]></desc>
+<type><![CDATA[the category]]></type>
+<extensions>
+<topografix:color>c0c0c0</topografix:color>
+<opentracks:trackid>7002101e-4198-4613-8c24-544e01ca3981</opentracks:trackid>
+<gpxtrkx:TrackStatsExtension>
+<gpxtrkx:Distance>0.0</gpxtrkx:Distance>
+<gpxtrkx:TimerTime>0</gpxtrkx:TimerTime>
+<gpxtrkx:MovingTime>0</gpxtrkx:MovingTime>
+<gpxtrkx:StoppedTime>0</gpxtrkx:StoppedTime>
+<gpxtrkx:MaxSpeed>0.0</gpxtrkx:MaxSpeed>
+<gpxtrkx:Ascent>null</gpxtrkx:Ascent>
+<gpxtrkx:Descent>null</gpxtrkx:Descent>
+</gpxtrkx:TrackStatsExtension>
+</extensions>
+<trkseg>
+<trkpt lat="3" lon="14">
+<ele>10</ele>
+<time>2021-01-07T21:51:59.179+01:15</time>
+</trkpt>
+</trkseg>
+</trk>
+</gpx>
@@ -15,7 +15,6 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    package="de.dennisguse.opentracks"
    android:installLocation="auto">

    <supports-screens
@@ -59,6 +58,8 @@ limitations under the License.
        tools:targetApi="s" />
    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />

+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
    <application
        android:name=".Startup"
        android:allowBackup="false"
@@ -86,6 +87,17 @@ limitations under the License.
            </intent-filter>
        </activity>

+        <activity
+            android:name=".introduction.IntroductionActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
        <activity android:name=".AboutActivity" />

        <activity
@@ -309,13 +321,8 @@ limitations under the License.

        <activity
            android:name=".TrackListActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/SplashTheme">
+            android:exported="true">
            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-
                <action android:name="android.intent.action.SEARCH" />
            </intent-filter>
            <meta-data
@@ -353,7 +360,7 @@ limitations under the License.
            android:exported="false"
            android:finishOnTaskLaunch="true"
            android:launchMode="singleInstance"
-            android:process=":crash"/>
+            android:process=":crash" />

        <provider
            android:name=".data.ShareContentProvider"
@@ -33,4 +33,10 @@ public class AboutActivity extends AbstractActivity {
        viewBinding = AboutBinding.inflate(getLayoutInflater());
        return viewBinding.getRoot();
    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        viewBinding = null;
+    }
 }
@@ -84,8 +84,8 @@ public abstract class AbstractTrackDeleteActivity extends AbstractActivity imple
    /**
     * Called every time a track is deleted.
     */
-    protected void onTrackDeleteStatus(TrackDeleteService.DeleteStatus deleteStatus) {
-        if (deleteStatus.isFinished() && trackDeleteServiceConnection != null) {
+    protected void onTrackDeleteStatus(TrackDeleteService.DeletionFinishedStatus deletionFinishedStatus) {
+        if (trackDeleteServiceConnection != null) {
            trackDeleteServiceConnection.unbind(this);
            trackDeleteServiceConnection = null;
            onDeleteFinished();
@@ -3,19 +3,15 @@ package de.dennisguse.opentracks;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

-import androidx.appcompat.app.AppCompatActivity;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;

 import de.dennisguse.opentracks.databinding.ActivityShowErrorBinding;
-import de.dennisguse.opentracks.databinding.TrackListBinding;

 public class ShowErrorActivity extends AbstractActivity {

@@ -38,6 +38,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.content.ContextCompat;
+import androidx.core.splashscreen.SplashScreen;
 import androidx.cursoradapter.widget.ResourceCursorAdapter;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.CursorLoader;
@@ -70,7 +71,7 @@ import de.dennisguse.opentracks.ui.util.ActivityUtils;
 import de.dennisguse.opentracks.ui.util.ListItemUtils;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.PermissionUtils;
+import de.dennisguse.opentracks.util.PermissionRequester;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;

@@ -158,9 +159,6 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co

    @Override
    protected void onCreate(Bundle savedInstanceState) {
-        // Reset theme after splash
-        setTheme(R.style.ThemeCustom);
-
        super.onCreate(savedInstanceState);
        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);

@@ -241,7 +239,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
                startActivity(newIntent);

                connection.unbind(this);
-            }).startAndBind(this);
+            }).startAndBind(this, true);
        });
        viewBinding.trackListFabAction.setOnLongClickListener((view) -> {
            if (!recordingStatus.isRecording()) {
@@ -263,13 +261,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
    }

    private void requestRequiredPermissions() {
-        if (!PermissionUtils.hasGPSPermission(this)) {
-            PermissionUtils.requestGPSPermission(this, null, () -> Toast.makeText(this, R.string.permission_gps_failed, Toast.LENGTH_SHORT).show());
-        }
-
-        if (!PermissionUtils.hasBluetoothPermissions(this)) {
-            PermissionUtils.requestBluetoothPermission(this, null, null);
-        }
+        PermissionRequester.ALL.requestPermissionsIfNeeded(this, this, null, (requester) -> Toast.makeText(this, R.string.permission_gps_failed, Toast.LENGTH_SHORT).show());
    }

    @Override
@@ -323,8 +315,8 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
        searchView.findViewById(R.id.search_edit_frame).setPadding(0, 0, 48, 0);

        SearchView.SearchAutoComplete searchAutoComplete = searchView.findViewById(R.id.search_src_text);
-        searchAutoComplete.setHintTextColor(getResources().getColor(android.R.color.white));
-        searchAutoComplete.setTextColor(getResources().getColor(android.R.color.white));
+        searchAutoComplete.setHintTextColor(ContextCompat.getColor(this, android.R.color.white));
+        searchAutoComplete.setTextColor(ContextCompat.getColor(this, android.R.color.white));

        searchView.setOnCloseListener(() -> {
            searchView.clearFocus();
@@ -213,7 +213,7 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement

                connection.unbind(this);
                finish();
-            }).startAndBind(this);
+            }).startAndBind(this, true);
            return true;
        }

@@ -232,9 +232,9 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
    }

    @Override
-    protected void onTrackDeleteStatus(TrackDeleteService.DeleteStatus deleteStatus) {
-        super.onTrackDeleteStatus(deleteStatus);
-        if (deleteStatus.isDeleted(trackId)) {
+    protected void onTrackDeleteStatus(TrackDeleteService.DeletionFinishedStatus deletionFinishedStatus) {
+        super.onTrackDeleteStatus(deletionFinishedStatus);
+        if (deletionFinishedStatus.isDeleted(trackId)) {
            runOnUiThread(this::finish);
        }
    }
@@ -11,8 +11,6 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowInsets;
-import android.view.WindowInsetsController;
 import android.view.WindowManager;
 import android.widget.Toast;

@@ -49,7 +47,6 @@ import de.dennisguse.opentracks.ui.markers.MarkerEditActivity;
 import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.PermissionUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackUtils;

@@ -138,7 +135,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc

        viewBinding.trackRecordingFabAction.setImageResource(R.drawable.ic_baseline_stop_24);
        viewBinding.trackRecordingFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.opentracks_secondary_color));
-        viewBinding.trackRecordingFabAction.setBackgroundColor(getResources().getColor(R.color.opentracks_secondary_color));
+        viewBinding.trackRecordingFabAction.setBackgroundColor(ContextCompat.getColor(this, R.color.opentracks_secondary_color));
        viewBinding.trackRecordingFabAction.setOnLongClickListener((view) -> {
            ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(1000);
            trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this);
@@ -90,18 +90,25 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements
        }

        viewBinding.finishButton.setOnClickListener(v -> {
-            TrackUtils.updateTrack(TrackStoppedActivity.this, track, viewBinding.trackEditName.getText().toString(),
-                    viewBinding.trackEditActivityType.getText().toString(), viewBinding.trackEditDescription.getText().toString(),
-                    contentProviderUtils);
+            storeTrackMetaData(contentProviderUtils, track);
            ExportUtils.postWorkoutExport(this, trackId);
            finish();
        });

-        viewBinding.resumeButton.setOnClickListener(v -> resumeTrackAndFinish());
+        viewBinding.resumeButton.setOnClickListener(v -> {
+            storeTrackMetaData(contentProviderUtils, track);
+            resumeTrackAndFinish();
+        });

        viewBinding.discardButton.setOnClickListener(v -> ConfirmDeleteDialogFragment.showDialog(getSupportFragmentManager(), trackId));
    }

+    private void storeTrackMetaData(ContentProviderUtils contentProviderUtils, Track track) {
+        TrackUtils.updateTrack(TrackStoppedActivity.this, track, viewBinding.trackEditName.getText().toString(),
+                viewBinding.trackEditActivityType.getText().toString(), viewBinding.trackEditDescription.getText().toString(),
+                contentProviderUtils);
+    }
+
    @Override
    public void onBackPressed() {
        if (isDiscarding) {
@@ -138,7 +145,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements

            connection.unbind(this);
            finish();
-        }).startAndBind(this);
+        }).startAndBind(this, true);
    }

    @Override
@@ -32,9 +32,7 @@ import java.util.List;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.TrackDataHub;
-import de.dennisguse.opentracks.data.models.Altitude;
 import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.databinding.ChartBinding;
@@ -188,9 +186,9 @@ public class ChartFragment extends Fragment implements TrackDataHub.Listener {
        }
    }

-    public void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics, Speed smoothedSpeed) {
+    public void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) {
        if (isResumed()) {
-            ChartPoint point = new ChartPoint(trackStatistics, trackPoint, smoothedSpeed, chartByDistance, viewBinding.chartView.getUnitSystem());
+            ChartPoint point = new ChartPoint(trackStatistics, trackPoint, trackPoint.getSpeed(), chartByDistance, viewBinding.chartView.getUnitSystem());
            pendingPoints.add(point);
        }
    }
@@ -3,11 +3,9 @@ package de.dennisguse.opentracks.chart;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;

-import de.dennisguse.opentracks.data.models.Altitude;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.data.models.UnitConversions;
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.stats.TrackStatistics;

@@ -42,7 +40,7 @@ public class ChartPoint {

        if (smoothedSpeed != null) {
            speed = smoothedSpeed.to(unitSystem);
-            pace = smoothedSpeed.toPace(unitSystem).toMillis() * UnitConversions.MS_TO_S * UnitConversions.S_TO_MIN;
+            pace = smoothedSpeed.toPace(unitSystem).toSeconds() / 60d;
        }
        if (trackPoint.hasHeartRate()) {
            heartRate = (double) trackPoint.getHeartRate().getBPM();
@@ -24,6 +24,7 @@ import android.graphics.Paint.Style;
 import android.graphics.Path;

 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;

 import java.text.NumberFormat;

@@ -68,12 +69,12 @@ abstract class ChartValueSeries {

        fillPaint = new Paint();
        fillPaint.setStyle(Style.FILL);
-        fillPaint.setColor(context.getResources().getColor(fillColor));
+        fillPaint.setColor(ContextCompat.getColor(context, fillColor));
        fillPaint.setAntiAlias(true);

        strokePaint = new Paint();
        strokePaint.setStyle(Style.STROKE);
-        strokePaint.setColor(context.getResources().getColor(strokeColor));
+        strokePaint.setColor(ContextCompat.getColor(context, strokeColor));
        strokePaint.setAntiAlias(true);

        // Make copies of the stroke paint with the default thickness
@@ -187,7 +187,6 @@ public class ContentProviderUtils {
            FileUtils.deleteDirectoryRecurse(FileUtils.getPhotoDir(context, trackId));
        }

-        // Delete track last since it triggers a database vacuum call
        String whereClause = String.format(TracksColumns._ID + " IN (%s)", TextUtils.join(",", Collections.nCopies(trackIds.size(), "?")));
        contentResolver.delete(TracksColumns.CONTENT_URI, whereClause, trackIds.stream().map(id -> Long.toString(id.getId())).toArray(String[]::new));
    }
@@ -195,8 +194,6 @@ public class ContentProviderUtils {
    public void deleteTrack(Context context, @NonNull Track.Id trackId) {
        // Delete track folder resources.
        FileUtils.deleteDirectoryRecurse(FileUtils.getPhotoDir(context, trackId));
-
-        // Delete track last since it triggers a database vacuum call
        contentResolver.delete(TracksColumns.CONTENT_URI, TracksColumns._ID + "=?", new String[]{Long.toString(trackId.getId())});
    }

@@ -27,6 +27,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;

@@ -39,6 +40,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.data.tables.MarkerColumns;
 import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
 import de.dennisguse.opentracks.data.tables.TracksColumns;
+import de.dennisguse.opentracks.settings.PreferencesUtils;

 /**
 * A {@link ContentProvider} that handles access to track points, tracks, and markers tables.
@@ -53,6 +55,8 @@ public class CustomContentProvider extends ContentProvider {

    private static final String SQL_LIST_DELIMITER = ",";

+    private static final int TOTAL_DELETED_ROWS_VACUUM_THRESHOLD = 10000;
+
    private final UriMatcher uriMatcher;

    private SQLiteDatabase db;
@@ -131,14 +135,12 @@ public class CustomContentProvider extends ContentProvider {
    @Override
    public int delete(@NonNull Uri url, String where, String[] selectionArgs) {
        String table;
-        boolean shouldVacuum = false;
        switch (getUrlType(url)) {
            case TRACKPOINTS:
                table = TrackPointsColumns.TABLE_NAME;
                break;
            case TRACKS:
                table = TracksColumns.TABLE_NAME;
-                shouldVacuum = true;
                break;
            case MARKERS:
                table = MarkerColumns.TABLE_NAME;
@@ -147,23 +149,40 @@ public class CustomContentProvider extends ContentProvider {
                throw new IllegalArgumentException("Unknown URL " + url);
        }

-        Log.w(TAG, "Deleting table " + table);
-        int count;
+        Log.w(TAG, "Deleting from table " + table);
+        int totalChangesBefore = getTotalChanges();
+        int deletedRowsFromTable;
        try {
            db.beginTransaction();
-            count = db.delete(table, where, selectionArgs);
+            deletedRowsFromTable = db.delete(table, where, selectionArgs);
+            Log.i(TAG, "Deleted " + deletedRowsFromTable + " rows of table " + table);
            db.setTransactionSuccessful();
        } finally {
            db.endTransaction();
        }
        getContext().getContentResolver().notifyChange(url, null, false);

-        if (shouldVacuum) {
-            // If a potentially large amount of data was deleted, reclaim its space.
-            Log.i(TAG, "Vacuuming the database.");
+        int totalChanges = getTotalChanges() - totalChangesBefore;
+        Log.i(TAG, "Deleted " + totalChanges + " total rows from database");
+
+        PreferencesUtils.addTotalRowsDeleted(totalChanges);
+        int totalRowsDeleted = PreferencesUtils.getTotalRowsDeleted();
+        if (totalRowsDeleted > TOTAL_DELETED_ROWS_VACUUM_THRESHOLD) {
+            Log.i(TAG, "TotalRowsDeleted " + totalRowsDeleted + ", starting to vacuum the database.");
            db.execSQL("VACUUM");
+            PreferencesUtils.resetTotalRowsDeleted();
        }
-        return count;
+
+        return deletedRowsFromTable;
+    }
+
+    private int getTotalChanges() {
+        int totalCount;
+        try (Cursor cursor = db.rawQuery("SELECT total_changes()", null)) {
+            cursor.moveToNext();
+            totalCount = cursor.getInt(0);
+        }
+        return totalCount;
    }

    @Override
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;

 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.tables.TracksColumns;
@@ -72,9 +73,7 @@ public class ShareContentProvider extends CustomContentProvider {
     * @return An URI for one file containing this tracks.
     */
    public static Pair<Uri, String> createURI(Track.Id trackId, String trackName, @NonNull TrackFileFormat trackFileFormat) {
-        Set<Track.Id> trackIds = new HashSet<>(1);
-        trackIds.add(trackId);
-        return createURI(trackIds, trackName, trackFileFormat);
+        return createURI(Set.of(trackId), trackName, trackFileFormat);
    }

    /**
@@ -108,11 +107,7 @@ public class ShareContentProvider extends CustomContentProvider {

        String[] uriTrackIds = uriPaths.get(2).split(TRACKID_DELIMITER);

-        Set<Track.Id> trackIds = new HashSet<>();
-        for (String uriTrackId : uriTrackIds) {
-            trackIds.add(new Track.Id(Long.parseLong(uriTrackId)));
-        }
-        return trackIds;
+        return Arrays.stream(uriTrackIds).map(uriTrackId -> new Track.Id(Long.parseLong(uriTrackId))).collect(Collectors.toSet());
    }

    /**
@@ -25,16 +25,13 @@ import android.os.HandlerThread;
 import android.util.Log;

 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;

 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;

-import de.dennisguse.opentracks.data.models.Altitude;
 import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.data.tables.MarkerColumns;
@@ -367,7 +364,7 @@ public class TrackDataHub {
                // Also include the last point if the selected track is not recording.
                if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) {
                    for (Listener trackDataListener : listeners) {
-                        trackDataListener.onSampledInTrackPoint(trackPoint, currentUpdater.getTrackStatistics(), currentUpdater.getSmoothedSpeed());
+                        trackDataListener.onSampledInTrackPoint(trackPoint, currentUpdater.getTrackStatistics());
                    }
                } else {
                    for (Listener trackDataListener : listeners) {
@@ -432,7 +429,7 @@ public class TrackDataHub {
         *
         * @param trackPoint the trackPoint
         */
-        default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics, Speed smoothedSpeed) {
+        default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) {
        }

        /**
@@ -2,22 +2,35 @@ package de.dennisguse.opentracks.data.models;

 import androidx.annotation.NonNull;

+import java.time.Duration;
 import java.util.Objects;

 public class Cadence {

-    public static Cadence of(float value) {
-        return new Cadence(value);
+    public static Cadence of(float value, Duration duration) {
+        if (duration.isZero()) {
+            return zero();
+        }
+
+        return new Cadence(value / (duration.toMillis() / (float) Duration.ofMinutes(1).toMillis()));
    }

-    private final float value;
+    public static Cadence of(float value_rpm) {
+        return new Cadence(value_rpm);
+    }
+
+    public static Cadence zero() {
+        return of(0.0f);
+    }
+
+    private final float value_rpm;

    private Cadence(float value) {
-        this.value = value;
+        this.value_rpm = value;
    }

    public float getRPM() {
-        return value;
+        return value_rpm;
    }

    @Override
@@ -25,19 +38,19 @@ public class Cadence {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        Cadence cadence = (Cadence) o;
-        return Float.compare(cadence.value, value) == 0;
+        return Float.compare(cadence.value_rpm, value_rpm) == 0;
    }

    @Override
    public int hashCode() {
-        return Objects.hash(value);
+        return Objects.hash(value_rpm);
    }

    @NonNull
    @Override
    public String toString() {
        return "Cadence{" +
-                "value=" + value + " rpm" +
+                "value=" + value_rpm + " rpm" +
                '}';
    }
 }
@@ -13,6 +13,14 @@ public class Distance {
        return new Distance(distance_m);
    }

+    public static Distance of(Double distance_m) {
+        if (distance_m == null) {
+            return Distance.of(Double.NaN);
+        } else {
+            return Distance.of((double) distance_m);
+        }
+    }
+
    public static Distance of(String distance_m) {
        return of(Float.parseFloat(distance_m));
    }
@@ -26,15 +34,15 @@ public class Distance {
    }

    public static Distance ofMile(double distance_mile) {
-        return of(distance_mile * UnitConversions.MI_TO_M);
+        return of(distance_mile * MI_TO_M);
    }

    public static Distance ofNauticalMile(double distance_mile) {
-        return of(distance_mile * UnitConversions.NAUTICAL_MILE_TO_M);
+        return of(distance_mile * NAUTICAL_MILE_TO_M);
    }

    public static Distance ofKilometer(double distance_km) {
-        return of(distance_km * UnitConversions.KM_TO_M);
+        return of(distance_km * KM_TO_M);
    }

    public static Distance ofMM(double distance_mm) {
@@ -109,19 +117,19 @@ public class Distance {
    }

    public double toKM() {
-        return distance_m * UnitConversions.M_TO_KM;
+        return distance_m * M_TO_KM;
    }

    public double toFT() {
-        return distance_m * UnitConversions.M_TO_FT;
+        return distance_m * M_TO_FT;
    }

    public double toMI() {
-        return toKM() * UnitConversions.KM_TO_MI;
+        return distance_m * M_TO_MI;
    }

    public double toNauticalMiles() {
-        return toKM() * UnitConversions.KM_TO_NAUTICAL_MILE;
+        return distance_m * M_TO_NAUTICAL_MILE;
    }

    public double toKM_Miles(UnitSystem unitSystem) {
@@ -169,4 +177,17 @@ public class Distance {
                "distance_m=" + distance_m +
                '}';
    }
+
+    // multiplication factors for conversion
+    private static final double KM_TO_M = 1000.0;
+    private static final double M_TO_KM = 1 / KM_TO_M;
+
+    public static final double MI_TO_M = 1609.344;
+    public static final double M_TO_MI = 1 / MI_TO_M;
+
+    private static final double MI_TO_FT = 5280.0;
+    public static final double M_TO_FT = M_TO_MI * MI_TO_FT;
+
+    private static final double NAUTICAL_MILE_TO_M = 1852.0;
+    private static final double M_TO_NAUTICAL_MILE = 1 / NAUTICAL_MILE_TO_M;
 }
@@ -16,11 +16,14 @@ public class DistanceFormatter {

    private final int decimalCount;

+    private final double threshold;
+
    private final UnitSystem unitSystem;

-    private DistanceFormatter(Resources resources, int decimalCount, UnitSystem unitSystem) {
+    private DistanceFormatter(Resources resources, int decimalCount, double threshold, UnitSystem unitSystem) {
        this.resources = resources;
        this.decimalCount = decimalCount;
+        this.threshold = threshold;
        this.unitSystem = unitSystem;
        assert unitSystem != null;
    }
@@ -42,12 +45,13 @@ public class DistanceFormatter {
     */
    public Pair<String, String> getDistanceParts(Distance distance) {
        if (distance.isInvalid()) {
+            String valueUnknown = resources.getString(R.string.value_unknown);
            switch (unitSystem) {
                case METRIC:
-                    return new Pair<>(null, resources.getString(R.string.unit_meter));
+                    return new Pair<>(valueUnknown, resources.getString(R.string.unit_meter));
                case IMPERIAL:
                case NAUTICAL_IMPERIAL:
-                    return new Pair<>(null, resources.getString(R.string.unit_feet));
+                    return new Pair<>(valueUnknown, resources.getString(R.string.unit_feet));
                default:
                    throw new RuntimeException("Not implemented");
            }
@@ -55,19 +59,19 @@ public class DistanceFormatter {

        switch (unitSystem) {
            case METRIC:
-                if (distance.greaterThan(Distance.of(500))) {
+                if (distance.greaterThan(Distance.ofKilometer(threshold))) {
                    return new Pair<>(StringUtils.formatDecimal(distance.toKM(), decimalCount), resources.getString(R.string.unit_kilometer));
                } else {
                    return new Pair<>(StringUtils.formatDecimal(distance.toM(), decimalCount), resources.getString(R.string.unit_meter));
                }
            case IMPERIAL:
-                if (distance.greaterThan(Distance.ofMile(0.5))) {
+                if (distance.greaterThan(Distance.ofMile(threshold))) {
                    return new Pair<>(StringUtils.formatDecimal(distance.toMI(), decimalCount), resources.getString(R.string.unit_mile));
                } else {
                    return new Pair<>(StringUtils.formatDecimal(distance.toFT(), decimalCount), resources.getString(R.string.unit_feet));
                }
            case NAUTICAL_IMPERIAL:
-                if (distance.greaterThan(Distance.ofNauticalMile(0.5))) {
+                if (distance.greaterThan(Distance.ofNauticalMile(threshold))) {
                    return new Pair<>(StringUtils.formatDecimal(distance.toNauticalMiles(), decimalCount), resources.getString(R.string.unit_nautical_mile));
                } else {
                    return new Pair<>(StringUtils.formatDecimal(distance.toFT(), decimalCount), resources.getString(R.string.unit_feet));
@@ -87,8 +91,11 @@ public class DistanceFormatter {

        private UnitSystem unitSystem;

+        private double threshold;
+
        public Builder() {
            decimalCount = 2;
+            threshold = 0.5;
        }

        public Builder setDecimalCount(int decimalCount) {
@@ -101,8 +108,13 @@ public class DistanceFormatter {
            return this;
        }

+        public Builder setThreshold(double threshold) {
+            this.threshold = threshold;
+            return this;
+        }
+
        public DistanceFormatter build(Resources resource) {
-            return new DistanceFormatter(resource, decimalCount, unitSystem);
+            return new DistanceFormatter(resource, decimalCount, threshold, unitSystem);
        }

        public DistanceFormatter build(Context context) {
@@ -15,7 +15,7 @@ public class Speed {
            return zero();
        }

-        return new Speed(distance.toM() / (duration.toMillis() * UnitConversions.MS_TO_S));
+        return new Speed(distance.toM() / (duration.toMillis() / (double) Duration.ofSeconds(1).toMillis()));
    }

    public static Speed of(double speed_mps) {
@@ -85,16 +85,23 @@ public class Speed {
        return speed_mps;
    }

+    /**
+     * We interpret {@link Speed} here as a {@link Distance} over 1h.
+     */
+    private Distance toH() {
+        return Distance.of(speed_mps * Duration.ofHours(1).toSeconds());
+    }
+
    public double toKMH() {
-        return speed_mps * UnitConversions.MPS_TO_KMH;
+        return toH().toKM();
    }

    public double toMPH() {
-        return toKMH() * UnitConversions.KM_TO_MI;
+        return toH().toMI();
    }

    public double toKnots() {
-        return toKMH() * UnitConversions.KM_TO_NAUTICAL_MILE;
+        return toH().toNauticalMiles();
    }

    public Duration toPace(UnitSystem unitSystem) {
@@ -102,20 +109,7 @@ public class Speed {
            return Duration.ofSeconds(0);
        }

-        double distance = speed_mps;
-        switch (unitSystem) { //TODO Can we use to(UnitSystem)?
-            case METRIC:
-                distance *= UnitConversions.M_TO_KM;
-                break;
-            case IMPERIAL:
-                distance *= UnitConversions.M_TO_MI;
-                break;
-            case NAUTICAL_IMPERIAL:
-                distance *= UnitConversions.M_TO_NAUTICAL_MILE;
-                break;
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        double distance = Distance.of(speed_mps).toKM_Miles(unitSystem);

        return Duration.ofSeconds(Math.round(1 / distance));
    }
@@ -56,7 +56,7 @@ public class TrackPoint {

        SEGMENT_START_AUTOMATIC(-1), //Start of a segment due to too much distance from previous TrackPoint
        TRACKPOINT(0), //Just GPS data and may contain BLE sensor data
-        SENSORPOINT(2), //Just BLE sensor data; required to have speed and sensorDistance
+        SENSORPOINT(2), //Just BLE sensor data; may have speed and sensorDistance

        SEGMENT_END_MANUAL(1); //End of a segment

@@ -1,68 +0,0 @@
-/*
- * Copyright 2008 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.data.models;
-
-/**
- * Unit conversion constants.
- *
- * @author Sandor Dornbush
- */
-public class UnitConversions {
-
-    // Time //TODO Use Duration
-    // multiplication factor to convert seconds to milliseconds
-    public static final long S_TO_MS = 1000;
-
-    // multiplication factor to convert milliseconds to seconds
-    @Deprecated
-    public static final double MS_TO_S = 1d / S_TO_MS;
-    // multiplication factor to convert minutes to seconds
-    @Deprecated
-    public static final double MIN_TO_S = 60.0;
-    // multiplication factor to convert seconds to minutes
-    @Deprecated
-    public static final double S_TO_MIN = 1 / MIN_TO_S;
-    // multiplication factor to convert minutes to hours
-    @Deprecated
-    public static final double MIN_TO_HR = 1 / 60.0;
-
-    // multiplication factor to convert kilometers to miles
-    public static final double KM_TO_MI = 0.621371192;
-
-    // Distance //TODO Make private to Distance class!
-    // multiplication factor to convert miles to feet
-    private static final double MI_TO_FT = 5280.0;
-    // multiplication factor to covert kilometers to meters
-    public static final double KM_TO_M = 1000.0;
-    // multiplication factor to convert meters to kilometers
-    public static final double M_TO_KM = 1 / KM_TO_M;
-    // multiplication factor to convert meters to miles
-    public static final double M_TO_MI = M_TO_KM * KM_TO_MI;
-    // multiplication factor to convert meters to feet
-    public static final double M_TO_FT = M_TO_MI * MI_TO_FT;
-    public static final double NAUTICAL_MILE_TO_M = 1852.0;
-    public static final double M_TO_NAUTICAL_MILE = 1 / NAUTICAL_MILE_TO_M;
-    public static final double KM_TO_NAUTICAL_MILE = 1000 * M_TO_NAUTICAL_MILE;
-    // multiplication factor to convert meters per second to kilometers per hour
-    public static final double MPS_TO_KMH = M_TO_KM / (S_TO_MIN * MIN_TO_HR);
-    // multiplication factor to convert miles to km
-    public static final double MI_TO_KM = 1 / KM_TO_MI;
-    // multiplication factor to convert miles to m
-    public static final double MI_TO_M = MI_TO_KM * KM_TO_M;
-
-    private UnitConversions() {
-    }
-}
@@ -182,7 +182,7 @@ public class StatisticsRecordedFragment extends Fragment {
    private void loadTrackDescription(@NonNull Track track) {
        viewBinding.statsNameValue.setText(track.getName());
        viewBinding.statsDescriptionValue.setText(track.getDescription());
-        viewBinding.statsStartDatetimeValue.setText(StringUtils.formatDateTime(track.getStartTime()));
+        viewBinding.statsStartDatetimeValue.setText(StringUtils.formatDateTimeWithOffsetIfDifferent(track.getStartTime()));
    }

    private void updateUI() {
@@ -0,0 +1,93 @@
+package de.dennisguse.opentracks.introduction;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.core.splashscreen.SplashScreen;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+
+import java.util.List;
+
+import de.dennisguse.opentracks.AbstractActivity;
+import de.dennisguse.opentracks.TrackListActivity;
+import de.dennisguse.opentracks.databinding.IntroductionBinding;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.util.IntentUtils;
+
+public class IntroductionActivity extends AbstractActivity {
+
+    private IntroductionBinding viewBinding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        SplashScreen.installSplashScreen(this);
+
+        super.onCreate(savedInstanceState);
+
+        if (!PreferencesUtils.shouldShowIntroduction()) {
+            startActivity(new Intent(this, TrackListActivity.class));
+            finish();
+        }
+
+        viewBinding.nextButton.setOnClickListener(v -> {
+            int nextItemId = viewBinding.introductionViewPager.getCurrentItem() + 1;
+            if (nextItemId < viewBinding.introductionViewPager.getAdapter().getItemCount()) {
+                viewBinding.introductionViewPager.setCurrentItem(nextItemId);
+            } else {
+                PreferencesUtils.setShowIntroduction(false);
+                startActivity(IntentUtils.newIntent(this, TrackListActivity.class));
+                finish();
+            }
+        });
+        viewBinding.introductionViewPager.setAdapter(new CustomFragmentPagerAdapter(this));
+        viewBinding.introductionViewPager.setUserInputEnabled(false);
+    }
+
+    @Override
+    protected View getRootView() {
+        viewBinding = IntroductionBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        viewBinding = null;
+    }
+
+    private static class CustomFragmentPagerAdapter extends FragmentStateAdapter {
+
+        private static final List<FragmentCreator> fragmentCreators = List.of(
+                (FragmentCreator) WelcomeFragment::newInstance,
+                (FragmentCreator) OSMDashboardFragment::newInstance
+        );
+
+        public CustomFragmentPagerAdapter(@NonNull FragmentActivity fa) {
+            super(fa);
+        }
+
+        @NonNull
+        @Override
+        public Fragment createFragment(int position) {
+            FragmentCreator fc = fragmentCreators.get(position);
+            if (fc != null) {
+                return fc.newInstance();
+            }
+
+            throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+        }
+
+        @Override
+        public int getItemCount() {
+            return fragmentCreators.size();
+        }
+    }
+
+    private interface FragmentCreator {
+        Fragment newInstance();
+    }
+}
@@ -0,0 +1,32 @@
+package de.dennisguse.opentracks.introduction;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import de.dennisguse.opentracks.databinding.OsmDashboardBinding;
+
+public class OSMDashboardFragment extends Fragment {
+
+    public static OSMDashboardFragment newInstance() {
+        return new OSMDashboardFragment();
+    }
+
+    private OsmDashboardBinding viewBinding;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        viewBinding = OsmDashboardBinding.inflate(inflater, container, false);
+        return viewBinding.getRoot();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        viewBinding = null;
+    }
+}
@@ -0,0 +1,37 @@
+package de.dennisguse.opentracks.introduction;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import de.dennisguse.opentracks.databinding.WelcomeBinding;
+
+public class WelcomeFragment extends Fragment {
+
+    public static WelcomeFragment newInstance() {
+        return new WelcomeFragment();
+    }
+
+    private WelcomeBinding viewBinding;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        viewBinding = WelcomeBinding.inflate(inflater, container, false);
+        return viewBinding.getRoot();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        viewBinding = null;
+    }
+}
@@ -146,13 +146,10 @@ public class GPXTrackExporter implements TrackExporter {

                switch (trackPoint.getType()) {
                    case SEGMENT_START_MANUAL:
-                        if (wroteSegment) writeCloseSegment();
-                        writeOpenSegment();
-                        wroteSegment = true;
                        Log.i(TAG, "Exporting " + TrackPoint.Type.SEGMENT_START_MANUAL.name() + " is not supported.");
                        break;
                    case SEGMENT_END_MANUAL:
-                        writeCloseSegment();
+                        if (wroteSegment) writeCloseSegment();
                        wroteSegment = false;
                        Log.i(TAG, "Exporting " + TrackPoint.Type.SEGMENT_END_MANUAL.name() + " is not supported.");
                        break;
@@ -44,7 +44,8 @@ import de.dennisguse.opentracks.ui.markers.MarkerUtils;
 import de.dennisguse.opentracks.util.StringUtils;

 /**
- * Convert {@link Track} incl. {@link Marker} and {@link TrackPoint} to KML.
+ * Convert {@link Track} incl. {@link Marker} and {@link TrackPoint} to KML version 2.3.
+ * https://docs.opengeospatial.org/is/12-007r2/12-007r2.html
 *
 * @author Sandor Dornbush
 * @author Rodrigo Damazio
@@ -58,6 +59,8 @@ public class KMLTrackExporter implements TrackExporter {
    private static final String TRACK_STYLE = "track";
    private static final String SCHEMA_ID = "schema";

+    public static final String EXTENDED_DATA_TYPE_CATEGORY = "type";
+
    public static final String EXTENDED_DATA_TYPE_SPEED = "speed";
    public static final String EXTENDED_DATA_TYPE_DISTANCE = "distance";
    public static final String EXTENDED_DATA_TYPE_CADENCE = "cadence";
@@ -224,11 +227,13 @@ public class KMLTrackExporter implements TrackExporter {
    private void writeHeader(Track[] tracks) {
        if (printWriter != null) {
            printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            printWriter.println("<kml xmlns=\"http://www.opengis.net/kml/2.2\"");
-            printWriter.println("xmlns:gx=\"http://www.google.com/kml/ext/2.2\"");
+            printWriter.println("<kml xmlns=\"http://www.opengis.net/kml/2.3\"");
            printWriter.println("xmlns:atom=\"http://www.w3.org/2005/Atom\"");
            printWriter.println("xmlns:opentracks=\"http://opentracksapp.com/xmlschemas/v1\">");
-            //TODO ADD xsi:schemaLocation here!
+            //TODO ADD xsi:schemaLocation for atom
+            printWriter.println("xsi:schemaLocation=" +
+                    "\"http://www.opengis.net/kml/2.3 http://schemas.opengis.net/kml/2.3/ogckml23.xsd"
+                    + " http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd\">");

            printWriter.println("<Document>");
            printWriter.println("<open>1</open>");
@@ -309,16 +314,16 @@ public class KMLTrackExporter implements TrackExporter {

            printWriter.println("<styleUrl>#" + TRACK_STYLE + "</styleUrl>");
            writeCategory(track.getCategory());
-            printWriter.println("<gx:MultiTrack>");
+            printWriter.println("<MultiTrack>");
            printWriter.println("<altitudeMode>absolute</altitudeMode>");
-            printWriter.println("<gx:interpolate>1</gx:interpolate>");
+            printWriter.println("<interpolate>1</interpolate>");
        }
    }


    private void writeEndTrack() {
        if (printWriter != null) {
-            printWriter.println("</gx:MultiTrack>");
+            printWriter.println("</MultiTrack>");
            printWriter.println("</Placemark>");
        }
    }
@@ -326,7 +331,7 @@ public class KMLTrackExporter implements TrackExporter {
    @VisibleForTesting
    void writeOpenSegment() {
        if (printWriter != null) {
-            printWriter.println("<gx:Track>");
+            printWriter.println("<Track>");
            speedList.clear();
            distanceList.clear();
            powerList.clear();
@@ -373,7 +378,7 @@ public class KMLTrackExporter implements TrackExporter {
            }
            printWriter.println("</SchemaData>");
            printWriter.println("</ExtendedData>");
-            printWriter.println("</gx:Track>");
+            printWriter.println("</Track>");
        }
    }

@@ -383,9 +388,9 @@ public class KMLTrackExporter implements TrackExporter {
            printWriter.println("<when>" + getTime(zoneOffset, trackPoint.getLocation()) + "</when>");

            if (trackPoint.hasLocation()) {
-                printWriter.println("<gx:coord>" + getCoordinates(trackPoint.getLocation(), " ") + "</gx:coord>");
+                printWriter.println("<coord>" + getCoordinates(trackPoint.getLocation(), " ") + "</coord>");
            } else {
-                printWriter.println("<gx:coord/>");
+                printWriter.println("<coord/>");
            }
            speedList.add(trackPoint.hasSpeed() ? (float) trackPoint.getSpeed().toMPS() : null);

@@ -408,16 +413,16 @@ public class KMLTrackExporter implements TrackExporter {
     * @param name the name of the simple array data
     */
    private void writeSimpleArrayData(List<Float> list, String name) {
-        printWriter.println("<gx:SimpleArrayData name=\"" + name + "\">");
+        printWriter.println("<SimpleArrayData name=\"" + name + "\">");
        for (int i = 0; i < list.size(); i++) {
            Float value = list.get(i);
            if (value == null) {
-                printWriter.println("<gx:value />");
+                printWriter.println("<value />");
            } else {
-                printWriter.println("<gx:value>" + SENSOR_DATA_FORMAT.format(value) + "</gx:value>");
+                printWriter.println("<value>" + SENSOR_DATA_FORMAT.format(value) + "</value>");
            }
        }
-        printWriter.println("</gx:SimpleArrayData>");
+        printWriter.println("</SimpleArrayData>");
    }

    /**
@@ -521,7 +526,7 @@ public class KMLTrackExporter implements TrackExporter {
            return;
        }
        printWriter.println("<ExtendedData>");
-        printWriter.println("<Data name=\"type\"><value>" + StringUtils.formatCData(category) + "</value></Data>");
+        printWriter.println("<Data name=\"" + EXTENDED_DATA_TYPE_CATEGORY + "\"><value>" + StringUtils.formatCData(category) + "</value></Data>");
        printWriter.println("</ExtendedData>");
    }

@@ -554,8 +559,8 @@ public class KMLTrackExporter implements TrackExporter {
     * @param extendedDataType the extended data display name
     */
    private void writeSimpleArrayStyle(String name, String extendedDataType) {
-        printWriter.println("<gx:SimpleArrayField name=\"" + name + "\" type=\"float\">");
+        printWriter.println("<SimpleArrayField name=\"" + name + "\" type=\"float\">");
        printWriter.println("<displayName>" + StringUtils.formatCData(extendedDataType) + "</displayName>");
-        printWriter.println("</gx:SimpleArrayField>");
+        printWriter.println("</SimpleArrayField>");
    }
 }
@@ -17,8 +17,8 @@ import androidx.documentfile.provider.DocumentFile;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.io.file.exporter.ExportActivity;
-import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.util.IntentUtils;

 public abstract class DirectoryChooserActivity extends AppCompatActivity {

@@ -11,7 +11,6 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;

 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;

@@ -48,7 +47,14 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe
    }

    private void loadData(List<DocumentFile> documentFiles) {
-        List<DocumentFile> fileList = documentFiles.stream().map(FileUtils::getFiles).flatMap(Collection::stream).collect(Collectors.toList());
+        List<ArrayList<DocumentFile>> nestedFileList = documentFiles.stream()
+                .map(FileUtils::getFiles)
+                // TODO flatMap(Collection::stream) fails with ClassCastException; try in the future again
+                .collect(Collectors.toList());
+
+        List<DocumentFile> fileList = new ArrayList<>();
+        nestedFileList.forEach(fileList::addAll);
+
        summary.totalCount = fileList.size();
        filesToImport.addAll(fileList);
        importNextFile();
@@ -41,7 +41,7 @@ import de.dennisguse.opentracks.io.file.exporter.KMLTrackExporter;
 import de.dennisguse.opentracks.util.StringUtils;

 /**
- * Imports a KML file.
+ * Imports a KML file; preferred version: KML2.3, but also supports KML2.2.
 *
 * @author Jimmy Shih
 */
@@ -54,18 +54,31 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
    private static final String TAG_COORDINATES = "coordinates";
    private static final String TAG_DESCRIPTION = "description";
    private static final String TAG_ICON = "icon";
-    private static final String TAG_GX_COORD = "gx:coord";
-    private static final String TAG_GX_MULTI_TRACK = "gx:MultiTrack";
-    private static final String TAG_GX_SIMPLE_ARRAY_DATA = "gx:SimpleArrayData";
-    private static final String TAG_GX_TRACK = "gx:Track";
-    private static final String TAG_GX_VALUE = "gx:value";
+
+    private static final String TAG_COORD = "coord";
+    private static final String TAG_KML22_COORD = "gx:coord";
+
+    private static final String TAG_MULTI_TRACK = "MultiTrack";
+    private static final String TAG_KML22_MULTI_TRACK = "gx:MultiTrack";
+
+    private static final String TAG_DATA_CATEGORY = "Data"; //used for Track.category
+
+    private static final String TAG_SIMPLE_ARRAY_DATA = "SimpleArrayData";
+    private static final String TAG_KML22_SIMPLE_ARRAY_DATA = "gx:SimpleArrayData";
+
+    private static final String TAG_TRACK = "Track";
+    private static final String TAG_KML22_TRACK = "gx:Track";
+
+    private static final String TAG_VALUE = "value";
+    private static final String TAG_KML22_VALUE = "gx:value";
+
    private static final String TAG_HREF = "href";
    private static final String TAG_KML = "kml";
    private static final String TAG_NAME = "name";
    private static final String TAG_PHOTO_OVERLAY = "PhotoOverlay";
    private static final String TAG_PLACEMARK = "Placemark";
    private static final String TAG_STYLE_URL = "styleUrl";
-    private static final String TAG_VALUE = "value";
+    //    private static final String TAG_VALUE = "value"; TODO
    private static final String TAG_WHEN = "when";
    private static final String TAG_UUID = "opentracks:trackid";

@@ -81,7 +94,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
    private final ArrayList<Instant> whenList = new ArrayList<>();
    private final ArrayList<Location> locationList = new ArrayList<>();

-    private String extendedDataType;
+    private String dataType;
    private final ArrayList<Float> sensorSpeedList = new ArrayList<>();
    private final ArrayList<Float> sensorDistanceList = new ArrayList<>();
    private final ArrayList<Float> sensorCadenceList = new ArrayList<>();
@@ -128,17 +141,21 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                // Note that a track is contained in a Placemark, calling onMarkerStart will clear various track variables like name, category, and description.
                onMarkerStart();
                break;
-            case TAG_GX_MULTI_TRACK:
+            case TAG_MULTI_TRACK:
+            case TAG_KML22_MULTI_TRACK:
                trackImporter.newTrack();
                break;
-            case TAG_GX_TRACK:
+            case TAG_TRACK:
+            case TAG_KML22_TRACK:
                if (trackImporter == null) {
-                    throw new SAXException("No " + TAG_GX_MULTI_TRACK);
+                    throw new SAXException("Missing " + TAG_MULTI_TRACK);
                }
                onTrackSegmentStart();
                break;
-            case TAG_GX_SIMPLE_ARRAY_DATA:
-                onExtendedDataStart(attributes);
+            case TAG_DATA_CATEGORY:
+            case TAG_SIMPLE_ARRAY_DATA:
+            case TAG_KML22_SIMPLE_ARRAY_DATA:
+                dataType = attributes.getValue(ATTRIBUTE_NAME);
                break;
        }
    }
@@ -162,18 +179,28 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
            case TAG_COORDINATES:
                onMarkerLocationEnd();
                break;
-            case TAG_GX_MULTI_TRACK:
+            case TAG_MULTI_TRACK:
+            case TAG_KML22_MULTI_TRACK:
                trackImporter.setTrack(context, name, uuid, description, category, icon, zoneOffset);
                zoneOffset = null;
                break;
-            case TAG_GX_TRACK:
+            case TAG_TRACK:
+            case TAG_KML22_TRACK:
                onTrackSegmentEnd();
                break;
-            case TAG_GX_COORD:
+            case TAG_COORD:
+            case TAG_KML22_COORD:
                onCoordEnded();
                break;
-            case TAG_GX_VALUE:
-                onExtendedDataValueEnd();
+            case TAG_VALUE:
+            case TAG_KML22_VALUE:
+                if (KMLTrackExporter.EXTENDED_DATA_TYPE_CATEGORY.equals(dataType)) {
+                    if (content != null) {
+                        category = content.trim();
+                    }
+                } else {
+                    onExtendedDataValueEnd();
+                }
                break;
            case TAG_NAME:
                if (content != null) {
@@ -195,11 +222,6 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                    icon = content.trim();
                }
                break;
-            case TAG_VALUE:
-                if (content != null) {
-                    category = content.trim();
-                }
-                break;
            case TAG_WHEN:
                if (content != null) {
                    try {
@@ -401,11 +423,6 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
        return location;
    }

-
-    private void onExtendedDataStart(Attributes attributes) {
-        extendedDataType = attributes.getValue(ATTRIBUTE_NAME);
-    }
-
    private void onExtendedDataValueEnd() throws SAXException {
        Float value = null;
        if (content != null) {
@@ -414,11 +431,11 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                try {
                    value = Float.parseFloat(content);
                } catch (NumberFormatException e) {
-                    throw new SAXException(createErrorMessage("Unable to parse gx:value:" + content), e);
+                    throw new SAXException(createErrorMessage("Unable to parse value:" + content), e);
                }
            }
        }
-        switch (extendedDataType) {
+        switch (dataType) {
            case KMLTrackExporter.EXTENDED_DATA_TYPE_SPEED:
                sensorSpeedList.add(value);
                break;
@@ -447,7 +464,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                accuracyVertical.add(value);
                break;
            default:
-                Log.w(TAG, "Data from extended data " + extendedDataType + " is not (yet) supported.");
+                Log.w(TAG, "Data from extended data " + dataType + " is not (yet) supported.");
        }
    }

@@ -25,6 +25,7 @@ import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 import de.dennisguse.opentracks.ui.markers.MarkerUtils;
@@ -290,4 +291,5 @@ public class TrackImporter {
    public void cleanImport() {
        contentProviderUtils.deleteTracks(context, trackIds);
    }
+
 }
@@ -6,6 +6,7 @@ import android.widget.Toast;

 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.splashscreen.SplashScreen;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.services.TrackRecordingService;
@@ -30,11 +31,14 @@ public abstract class AbstractAPIActivity extends AppCompatActivity {

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
        super.onCreate(savedInstanceState);
+        splashScreen.setKeepOnScreenCondition(() -> true );
+
        if (PreferencesUtils.isPublicAPIenabled()) {
            Log.i(TAG, "Received and trying to execute requested action.");
            new TrackRecordingServiceConnection(serviceConnectedCallback)
-                    .startAndBind(this);
+                    .startAndBind(this, isStartServiceForeground());
        } else {
            Toast.makeText(this, getString(R.string.settings_public_api_disabled_toast), Toast.LENGTH_LONG).show();
            Log.w(TAG, "Public API is disabled; ignoring request.");
@@ -42,6 +46,10 @@ public abstract class AbstractAPIActivity extends AppCompatActivity {
        }
    }

+    protected boolean isStartServiceForeground() {
+        return false;
+    }
+
    protected abstract void execute(TrackRecordingService service);

    protected abstract boolean isPostExecuteStopService();
@@ -2,28 +2,68 @@ package de.dennisguse.opentracks.publicapi;

 import android.os.Bundle;

+import androidx.annotation.NonNull;
+
+import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
+import de.dennisguse.opentracks.util.TrackUtils;

 public class StartRecording extends AbstractAPIActivity {
+
+    public static final String EXTRA_TRACK_NAME = "TRACK_NAME";
+    public static final String EXTRA_TRACK_CATEGORY = "TRACK_CATEGORY";
+    public static final String EXTRA_TRACK_ICON = "TRACK_ICON";
+    public static final String EXTRA_TRACK_DESCRIPTION = "TRACK_DESCRIPTION";
+
+    public static final String EXTRA_STATS_TARGET_PACKAGE = "STATS_TARGET_PACKAGE";
+    public static final String EXTRA_STATS_TARGET_CLASS = "STATS_TARGET_CLASS";
+
    private static final String TAG = StartRecording.class.getSimpleName();

    protected void execute(TrackRecordingService service) {
        Track.Id trackId = service.startNewTrack();
-        if ((trackId != null) && (PreferencesUtils.isPublicAPIDashboardEnabled())) {
+        if (trackId != null) {
            Bundle bundle = getIntent().getExtras();
            if (bundle != null) {
-                String targetPackage = bundle.getString("STATS_TARGET_PACKAGE", null);
-                String targetClass = bundle.getString("STATS_TARGET_CLASS", null);
-                IntentDashboardUtils.startDashboard(this, true, targetPackage, targetClass, trackId);
+                updateTrackMetadata(trackId, bundle);
+
+                if (PreferencesUtils.isPublicAPIDashboardEnabled()) {
+                    startDashboardAPI(trackId, bundle);
+                }
            }
        }
    }

+    private void updateTrackMetadata(@NonNull Track.Id trackId, @NonNull Bundle bundle) {
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(this);
+        Track track = contentProviderUtils.getTrack(trackId);
+
+        TrackUtils.updateTrack(this, track,
+                bundle.getString(EXTRA_TRACK_NAME, null),
+                bundle.getString(EXTRA_TRACK_CATEGORY, null),
+                bundle.getString(EXTRA_TRACK_ICON, null),
+                bundle.getString(EXTRA_TRACK_DESCRIPTION, null),
+                contentProviderUtils);
+    }
+
+    private void startDashboardAPI(@NonNull Track.Id trackId, @NonNull Bundle bundle) {
+        String targetPackage = bundle.getString(EXTRA_STATS_TARGET_PACKAGE, null);
+        String targetClass = bundle.getString(EXTRA_STATS_TARGET_CLASS, null);
+        if (targetClass != null && targetPackage != null) {
+            IntentDashboardUtils.startDashboard(this, true, targetPackage, targetClass, trackId);
+        }
+    }
+
    @Override
    protected boolean isPostExecuteStopService() {
        return false;
    }
+
+    @Override
+    protected boolean isStartServiceForeground() {
+        return true;
+    }
 }
@@ -5,12 +5,15 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.os.Handler;
 import android.util.Log;

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

+import java.util.concurrent.TimeUnit;
+
 import de.dennisguse.opentracks.data.models.TrackPoint;

 /**
@@ -29,7 +32,7 @@ public class AltitudeSumManager implements SensorEventListener {
    private Float altitudeGain_m;
    private Float altitudeLoss_m;

-    public void start(Context context) {
+    public void start(Context context, Handler handler) {
        SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);

        Sensor pressureSensor = sensorManager.getDefaultSensor(Sensor.TYPE_PRESSURE);
@@ -37,7 +40,7 @@ public class AltitudeSumManager implements SensorEventListener {
            Log.w(TAG, "No pressure sensor available.");
            isConnected = false;
        } else {
-            isConnected = sensorManager.registerListener(this, pressureSensor, SensorManager.SENSOR_DELAY_FASTEST);
+            isConnected = sensorManager.registerListener(this, pressureSensor, (int) TimeUnit.SECONDS.toMicros(5), handler);
        }

        lastAcceptedPressureValue_hPa = Float.NaN;
@@ -30,16 +30,11 @@ import android.util.Log;

 import androidx.annotation.NonNull;

+import java.util.List;
+import java.util.Optional;
 import java.util.UUID;

-import de.dennisguse.opentracks.data.models.Cadence;
-import de.dennisguse.opentracks.data.models.HeartRate;
-import de.dennisguse.opentracks.data.models.Power;
 import de.dennisguse.opentracks.sensors.sensorData.SensorData;
-import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling;
-import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
-import de.dennisguse.opentracks.sensors.sensorData.SensorDataHeartRate;
-import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;

 /**
 * Manages connection to a Bluetooth LE sensor and subscribes for onChange-notifications.
@@ -51,8 +46,7 @@ public abstract class BluetoothConnectionManager<DataType> {

    private final SensorDataObserver observer;

-    private final UUID serviceUUUID;
-    private final UUID measurementUUID;
+    private final List<ServiceMeasurementUUID> serviceMeasurementUUIDs;
    private BluetoothGatt bluetoothGatt;

    private final BluetoothGattCallback connectCallback = new BluetoothGattCallback() {
@@ -81,15 +75,24 @@ public abstract class BluetoothConnectionManager<DataType> {

        @Override
        public void onServicesDiscovered(@NonNull BluetoothGatt gatt, int status) {
-            BluetoothGattService service = gatt.getService(serviceUUUID);
-            if (service == null) {
-                Log.e(TAG, "Could not get service for address=" + gatt.getDevice().getAddress() + " serviceUUID=" + serviceUUUID);
+            BluetoothGattService gattService = null;
+            ServiceMeasurementUUID serviceMeasurement = null;
+            for (ServiceMeasurementUUID s : serviceMeasurementUUIDs) {
+                gattService = gatt.getService(s.getServiceUUID());
+                if (gattService != null) {
+                    serviceMeasurement = s;
+                    break;
+                }
+            }
+
+            if (gattService == null) {
+                Log.e(TAG, "Could not get gattService for address=" + gatt.getDevice().getAddress() + " serviceUUID=" + serviceMeasurement);
                return;
            }

-            BluetoothGattCharacteristic characteristic = service.getCharacteristic(measurementUUID);
+            BluetoothGattCharacteristic characteristic = gattService.getCharacteristic(serviceMeasurement.getMeasurementUUID());
            if (characteristic == null) {
-                Log.e(TAG, "Could not get BluetoothCharacteristic for address=" + gatt.getDevice().getAddress() + " serviceUUID=" + serviceUUUID + " characteristicUUID=" + measurementUUID);
+                Log.e(TAG, "Could not get BluetoothCharacteristic for address=" + gatt.getDevice().getAddress() + " serviceUUID=" + serviceMeasurement.getServiceUUID() + " characteristicUUID=" + serviceMeasurement.getMeasurementUUID());
                return;
            }
            gatt.setCharacteristicNotification(characteristic, true);
@@ -108,8 +111,16 @@ public abstract class BluetoothConnectionManager<DataType> {

        @Override
        public void onCharacteristicChanged(BluetoothGatt gatt, @NonNull BluetoothGattCharacteristic characteristic) {
-            Log.d(TAG, "Received data from " + gatt.getDevice().getAddress());
-            SensorData<DataType> sensorData = parsePayload(gatt.getDevice().getName(), gatt.getDevice().getAddress(), characteristic);
+            UUID serviceUUID = characteristic.getService().getUuid();
+            Log.d(TAG, "Received data from " + gatt.getDevice().getAddress() + " with service " + serviceUUID + " and characteristics " + characteristic.getUuid());
+            Optional<ServiceMeasurementUUID> serviceMeasurementUUID = serviceMeasurementUUIDs.stream()
+                    .filter(s -> s.getServiceUUID().equals(characteristic.getService().getUuid())).findFirst();
+            if (serviceMeasurementUUID.isEmpty()) {
+                Log.e(TAG, "Unknown service UUID; not supported?");
+                return;
+            }
+
+            SensorData<DataType> sensorData = parsePayload(serviceMeasurementUUID.get(), gatt.getDevice().getName(), gatt.getDevice().getAddress(), characteristic);
            if (sensorData != null) {
                Log.d(TAG, "Decoded data from " + gatt.getDevice().getAddress() + ": " + sensorData);
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -122,15 +133,20 @@ public abstract class BluetoothConnectionManager<DataType> {
        }
    };

-    BluetoothConnectionManager(UUID serviceUUUID, UUID measurementUUID, SensorDataObserver observer) {
-        this.serviceUUUID = serviceUUUID;
-        this.measurementUUID = measurementUUID;
+    BluetoothConnectionManager(ServiceMeasurementUUID serviceUUUID, SensorDataObserver observer) {
+        this.serviceMeasurementUUIDs = List.of(serviceUUUID);
+        this.observer = observer;
+    }
+
+    BluetoothConnectionManager(List<ServiceMeasurementUUID> serviceUUUID, SensorDataObserver observer) {
+        this.serviceMeasurementUUIDs = serviceUUUID;
        this.observer = observer;
    }

    synchronized void connect(Context context, @NonNull BluetoothDevice device) {
        if (bluetoothGatt != null) {
            Log.w(TAG, "Already connected; ignoring.");
+            return;
        }

        Log.d(TAG, "Connecting to: " + device);
@@ -172,114 +188,7 @@ public abstract class BluetoothConnectionManager<DataType> {
    /**
     * @return null if data could not be parsed.
     */
-    protected abstract SensorData<DataType> parsePayload(String sensorName, String address, BluetoothGattCharacteristic characteristic);
-
-    public static class HeartRateConnectionManager extends BluetoothConnectionManager<HeartRate> {
-
-        HeartRateConnectionManager(@NonNull SensorDataObserver observer) {
-            super(BluetoothUtils.HEART_RATE_SERVICE_UUID, BluetoothUtils.HEART_RATE_MEASUREMENT_CHAR_UUID, observer);
-        }
-
-        @Override
-        protected SensorDataHeartRate createEmptySensorData(String address) {
-            return new SensorDataHeartRate(address);
-        }
-
-        @Override
-        protected SensorDataHeartRate parsePayload(String sensorName, String address, BluetoothGattCharacteristic characteristic) {
-            Integer heartRate = BluetoothUtils.parseHeartRate(characteristic);
-
-            return heartRate != null ? new SensorDataHeartRate(address, sensorName, HeartRate.of(heartRate)) : null;
-        }
-    }
-
-    public static class CyclingCadence extends BluetoothConnectionManager<Cadence> {
-
-        CyclingCadence(SensorDataObserver observer) {
-            super(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, BluetoothUtils.CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID, observer);
-        }
-
-        @Override
-        protected SensorDataCycling.CyclingCadence createEmptySensorData(String address) {
-            return new SensorDataCycling.CyclingCadence(address);
-        }
-
-        @Override
-        protected SensorDataCycling.CyclingCadence parsePayload(String sensorName, String address, BluetoothGattCharacteristic characteristic) {
-            SensorDataCycling.CadenceAndSpeed cadenceAndSpeed = BluetoothUtils.parseCyclingCrankAndWheel(address, sensorName, characteristic);
-            if (cadenceAndSpeed == null) {
-                return null;
-            }
-
-            if (cadenceAndSpeed.getCadence() != null) {
-                return cadenceAndSpeed.getCadence();
-            }
-
-            return null;
-        }
-    }
-
-    public static class CyclingDistanceSpeed extends BluetoothConnectionManager<SensorDataCycling.DistanceSpeed.Data> {
-
-        CyclingDistanceSpeed(SensorDataObserver observer) {
-            super(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, BluetoothUtils.CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID, observer);
-        }
-
-        @Override
-        protected SensorDataCycling.DistanceSpeed createEmptySensorData(String address) {
-            return new SensorDataCycling.DistanceSpeed(address);
-        }
-
-        @Override
-        protected SensorDataCycling.DistanceSpeed parsePayload(String sensorName, String address, BluetoothGattCharacteristic characteristic) {
-            SensorDataCycling.CadenceAndSpeed cadenceAndSpeed = BluetoothUtils.parseCyclingCrankAndWheel(address, sensorName, characteristic);
-            if (cadenceAndSpeed == null) {
-                return null;
-            }
-
-            if (cadenceAndSpeed.getDistanceSpeed() != null) {
-                return cadenceAndSpeed.getDistanceSpeed();
-            }
-
-            return null;
-        }
-    }
-
-    public static class CyclingPower extends BluetoothConnectionManager<Power> {
-
-        CyclingPower(@NonNull SensorDataObserver observer) {
-            super(BluetoothUtils.CYCLING_POWER_UUID, BluetoothUtils.CYCLING_POWER_MEASUREMENT_CHAR_UUID, observer);
-        }
-
-        @Override
-        protected SensorDataCyclingPower createEmptySensorData(String address) {
-            return new SensorDataCyclingPower(address);
-        }
-
-        @Override
-        protected SensorDataCyclingPower parsePayload(String sensorName, String address, BluetoothGattCharacteristic characteristic) {
-            Integer cyclingPower = BluetoothUtils.parseCyclingPower(characteristic);
-
-            return cyclingPower != null ? new SensorDataCyclingPower(address, sensorName, Power.of(cyclingPower)) : null;
-        }
-    }
-
-    public static class RunningSpeedAndCadence extends BluetoothConnectionManager<SensorDataRunning.Data> {
-
-        RunningSpeedAndCadence(@NonNull SensorDataObserver observer) {
-            super(BluetoothUtils.RUNNING_RUNNING_SPEED_CADENCE_UUID, BluetoothUtils.RUNNING_RUNNING_SPEED_CADENCE_CHAR_UUID, observer);
-        }
-
-        @Override
-        protected SensorDataRunning createEmptySensorData(String address) {
-            return new SensorDataRunning(address);
-        }
-
-        @Override
-        protected SensorDataRunning parsePayload(String sensorName, String address, BluetoothGattCharacteristic characteristic) {
-            return BluetoothUtils.parseRunningSpeedAndCadence(address, sensorName, characteristic);
-        }
-    }
+    protected abstract SensorData<DataType> parsePayload(@NonNull ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, @NonNull BluetoothGattCharacteristic characteristic);

    interface SensorDataObserver {

@@ -31,11 +31,12 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.SensorData;
-import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadence;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.util.PermissionUtils;
+import de.dennisguse.opentracks.util.PermissionRequester;

 /**
 * Bluetooth LE sensor manager: manages connections to Bluetooth LE sensors.
@@ -64,11 +65,11 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.

    private Distance preferenceWheelCircumference;

-    private final BluetoothConnectionManager.HeartRateConnectionManager heartRate = new BluetoothConnectionManager.HeartRateConnectionManager(this);
-    private final BluetoothConnectionManager.CyclingCadence cyclingCadence = new BluetoothConnectionManager.CyclingCadence(this);
-    private final BluetoothConnectionManager.CyclingDistanceSpeed cyclingSpeed = new BluetoothConnectionManager.CyclingDistanceSpeed(this);
-    private final BluetoothConnectionManager.CyclingPower cyclingPower = new BluetoothConnectionManager.CyclingPower(this);
-    private final BluetoothConnectionManager.RunningSpeedAndCadence runningSpeedAndCadence = new BluetoothConnectionManager.RunningSpeedAndCadence(this);
+    private final BluetoothRemoteSensorManagerHeartRate heartRate = new BluetoothRemoteSensorManagerHeartRate(this);
+    private final BluetoothRemoteSensorManagerCyclingCadence cyclingCadence = new BluetoothRemoteSensorManagerCyclingCadence(this);
+    private final BluetoothRemoteSensorManagerCyclingDistanceSpeed cyclingSpeed = new BluetoothRemoteSensorManagerCyclingDistanceSpeed(this);
+    private final BluetoothRemoteSensorManagerCyclingPower cyclingPower = new BluetoothRemoteSensorManagerCyclingPower(this);
+    private final BluetoothRemoteSensorManagerRunningSpeedAndCadence runningSpeedAndCadence = new BluetoothRemoteSensorManagerRunningSpeedAndCadence(this);

    private final SensorDataSet sensorDataSet = new SensorDataSet();

@@ -162,7 +163,7 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
        } else {
            connectionManager.disconnect();
        }
-        if (!PermissionUtils.hasBluetoothPermissions(context)) {
+        if (!PermissionRequester.BLUETOOTH.hasPermission(context)) {
            Log.w(TAG, "BLUETOOTH_SCAN and/or BLUETOOTH_CONNECT not granted; not connecting.");
        }

@@ -186,24 +187,24 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.

    @Override
    public synchronized void onChanged(SensorData<?> sensorData) {
-        if (sensorData instanceof SensorDataCycling.CyclingCadence) {
-            SensorDataCycling.CyclingCadence previous = sensorDataSet.getCyclingCadence();
+        if (sensorData instanceof SensorDataCyclingCadence) {
+            SensorDataCyclingCadence previous = sensorDataSet.getCyclingCadence();
            Log.d(TAG, "Previous: " + previous + "; current: " + sensorData);

            if (sensorData.equals(previous)) {
                Log.d(TAG, "onChanged: cadence data repeated.");
                return;
            }
-            ((SensorDataCycling.CyclingCadence) sensorData).compute(previous);
+            ((SensorDataCyclingCadence) sensorData).compute(previous);
        }
-        if (sensorData instanceof SensorDataCycling.DistanceSpeed) {
-            SensorDataCycling.DistanceSpeed previous = sensorDataSet.getCyclingDistanceSpeed();
+        if (sensorData instanceof SensorDataCyclingDistanceSpeed) {
+            SensorDataCyclingDistanceSpeed previous = sensorDataSet.getCyclingDistanceSpeed();
            Log.d(TAG, "Previous: " + previous + "; Current" + sensorData);
            if (sensorData.equals(previous)) {
                Log.d(TAG, "onChanged: cycling speed data repeated.");
                return;
            }
-            ((SensorDataCycling.DistanceSpeed) sensorData).compute(previous, preferenceWheelCircumference);
+            ((SensorDataCyclingDistanceSpeed) sensorData).compute(previous, preferenceWheelCircumference);
        }
        if (sensorData instanceof SensorDataRunning) {
            SensorDataRunning previous = sensorDataSet.getRunningDistanceSpeedCadence();
@@ -0,0 +1,47 @@
+package de.dennisguse.opentracks.sensors;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.util.Log;
+
+import de.dennisguse.opentracks.data.models.Cadence;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadence;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
+
+public class BluetoothRemoteSensorManagerCyclingCadence extends BluetoothConnectionManager<Cadence> {
+
+    private static final String TAG = BluetoothRemoteSensorManagerCyclingCadence.class.getSimpleName();
+
+    BluetoothRemoteSensorManagerCyclingCadence(SensorDataObserver observer) {
+        super(BluetoothUtils.CYCLING_CADENCE, observer);
+    }
+
+    @Override
+    protected SensorDataCyclingCadence createEmptySensorData(String address) {
+        return new SensorDataCyclingCadence(address);
+    }
+
+    @Override
+    protected SensorDataCyclingCadence parsePayload(ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic) {
+
+        //TODO Implement to ServiceMeasurement.parse()?
+        if (serviceMeasurementUUID.equals(BluetoothUtils.CYCLING_POWER)) {
+            SensorDataCyclingPower.Data data = BluetoothUtils.parseCyclingPower(address, sensorName, characteristic);
+            if (data!= null) {
+                return data.getCadence();
+            }
+        } else if (serviceMeasurementUUID.equals(BluetoothUtils.CYCLING_SPEED_CADENCE)) {
+            SensorDataCyclingCadenceAndDistanceSpeed cadenceAndSpeed = BluetoothUtils.parseCyclingCrankAndWheel(address, sensorName, characteristic);
+            if (cadenceAndSpeed == null) {
+                return null;
+            }
+
+            if (cadenceAndSpeed.getCadence() != null) {
+                return cadenceAndSpeed.getCadence();
+            }
+        }
+
+        Log.e(TAG, "Don't know how to decode this payload.");
+        return null;
+    }
+}
@@ -0,0 +1,32 @@
+package de.dennisguse.opentracks.sensors;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingDistanceSpeed;
+
+public class BluetoothRemoteSensorManagerCyclingDistanceSpeed extends BluetoothConnectionManager<SensorDataCyclingDistanceSpeed.Data> {
+
+    BluetoothRemoteSensorManagerCyclingDistanceSpeed(SensorDataObserver observer) {
+        super(BluetoothUtils.CYCLING_SPEED_CADENCE, observer);
+    }
+
+    @Override
+    protected SensorDataCyclingDistanceSpeed createEmptySensorData(String address) {
+        return new SensorDataCyclingDistanceSpeed(address);
+    }
+
+    @Override
+    protected SensorDataCyclingDistanceSpeed parsePayload(ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic) {
+        SensorDataCyclingCadenceAndDistanceSpeed cadenceAndSpeed = BluetoothUtils.parseCyclingCrankAndWheel(address, sensorName, characteristic);
+        if (cadenceAndSpeed == null) {
+            return null;
+        }
+
+        if (cadenceAndSpeed.getDistanceSpeed() != null) {
+            return cadenceAndSpeed.getDistanceSpeed();
+        }
+
+        return null;
+    }
+}
@@ -0,0 +1,27 @@
+package de.dennisguse.opentracks.sensors;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+
+import androidx.annotation.NonNull;
+
+import de.dennisguse.opentracks.data.models.Power;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
+
+public class BluetoothRemoteSensorManagerCyclingPower extends BluetoothConnectionManager<Power> {
+
+    BluetoothRemoteSensorManagerCyclingPower(@NonNull SensorDataObserver observer) {
+        super(BluetoothUtils.CYCLING_POWER, observer);
+    }
+
+    @Override
+    protected SensorDataCyclingPower createEmptySensorData(String address) {
+        return new SensorDataCyclingPower(address);
+    }
+
+    @Override
+    protected SensorDataCyclingPower parsePayload(@NonNull ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic) {
+        SensorDataCyclingPower.Data cyclingPower = BluetoothUtils.parseCyclingPower(address, sensorName, characteristic);
+
+        return cyclingPower != null ? cyclingPower.getPower() : null;
+    }
+}
@@ -0,0 +1,27 @@
+package de.dennisguse.opentracks.sensors;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+
+import androidx.annotation.NonNull;
+
+import de.dennisguse.opentracks.data.models.HeartRate;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataHeartRate;
+
+public class BluetoothRemoteSensorManagerHeartRate extends BluetoothConnectionManager<HeartRate> {
+
+    BluetoothRemoteSensorManagerHeartRate(@NonNull SensorDataObserver observer) {
+        super(BluetoothUtils.HEARTRATE, observer);
+    }
+
+    @Override
+    protected SensorDataHeartRate createEmptySensorData(String address) {
+        return new SensorDataHeartRate(address);
+    }
+
+    @Override
+    protected SensorDataHeartRate parsePayload(@NonNull ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic) {
+        Integer heartRate = BluetoothUtils.parseHeartRate(characteristic);
+
+        return heartRate != null ? new SensorDataHeartRate(address, sensorName, HeartRate.of(heartRate)) : null;
+    }
+}
@@ -0,0 +1,24 @@
+package de.dennisguse.opentracks.sensors;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+
+import androidx.annotation.NonNull;
+
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;
+
+public class BluetoothRemoteSensorManagerRunningSpeedAndCadence extends BluetoothConnectionManager<SensorDataRunning.Data> {
+
+    BluetoothRemoteSensorManagerRunningSpeedAndCadence(@NonNull SensorDataObserver observer) {
+        super(BluetoothUtils.RUNNING_SPEED_CADENCE, observer);
+    }
+
+    @Override
+    protected SensorDataRunning createEmptySensorData(String address) {
+        return new SensorDataRunning(address);
+    }
+
+    @Override
+    protected SensorDataRunning parsePayload(@NonNull ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic) {
+        return BluetoothUtils.parseRunningSpeedAndCadence(address, sensorName, characteristic);
+    }
+}
@@ -30,8 +30,12 @@ import java.util.UUID;

 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Power;
 import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadence;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingDistanceSpeed;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;

 /**
@@ -43,23 +47,40 @@ public class BluetoothUtils {

    public static final UUID CLIENT_CHARACTERISTIC_CONFIG_UUID = new UUID(0x290200001000L, 0x800000805f9b34fbL);

-    public static final UUID HEART_RATE_SERVICE_UUID = new UUID(0x180D00001000L, 0x800000805f9b34fbL);
-    public static final UUID HEART_RATE_MEASUREMENT_CHAR_UUID = new UUID(0x2A3700001000L, 0x800000805f9b34fbL);
+    public static final ServiceMeasurementUUID HEARTRATE = new ServiceMeasurementUUID(
+            new UUID(0x180D00001000L, 0x800000805f9b34fbL),
+            new UUID(0x2A3700001000L, 0x800000805f9b34fbL)
+    );

-    public static final List<UUID> HEART_RATE_SUPPORTING_DEVICES = Collections.unmodifiableList(Arrays.asList(
-            BluetoothUtils.HEART_RATE_SERVICE_UUID,
+    // Used for device discovery in preferences
+    public static final List<ServiceMeasurementUUID> HEART_RATE_SUPPORTING_DEVICES = Collections.unmodifiableList(Arrays.asList(
+            HEARTRATE,
            //Devices that support HEART_RATE_SERVICE_UUID, but do not announce HEART_RATE_SERVICE_UUID in there BLE announcement messages (during device discovery).
-            UUID.fromString("0000fee0-0000-1000-8000-00805f9b34fb") //Miband3
-    ));
+            new ServiceMeasurementUUID(
+                    UUID.fromString("0000fee0-0000-1000-8000-00805f9b34fb"), //Miband3
+                    HEARTRATE.getMeasurementUUID()
+            ))
+    );

-    public static final UUID CYCLING_POWER_UUID = new UUID(0x181800001000L, 0x800000805f9b34fbL);
-    public static final UUID CYCLING_POWER_MEASUREMENT_CHAR_UUID = new UUID(0x2A6300001000L, 0x800000805f9b34fbL);
+    public static final ServiceMeasurementUUID CYCLING_POWER = new ServiceMeasurementUUID(
+            new UUID(0x181800001000L, 0x800000805f9b34fbL),
+            new UUID(0x2A6300001000L, 0x800000805f9b34fbL)
+    );

-    public static final UUID CYCLING_SPEED_CADENCE_SERVICE_UUID = new UUID(0x181600001000L, 0x800000805f9b34fbL);
-    public static final UUID CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID = new UUID(0x2A5B00001000L, 0x800000805f9b34fbL);
+    public static final ServiceMeasurementUUID CYCLING_SPEED_CADENCE = new ServiceMeasurementUUID(
+            new UUID(0x181600001000L, 0x800000805f9b34fbL),
+            new UUID(0x2A5B00001000L, 0x800000805f9b34fbL)
+    );

-    public static final UUID RUNNING_RUNNING_SPEED_CADENCE_UUID = new UUID(0x181400001000L, 0x800000805f9b34fbL);
-    public static final UUID RUNNING_RUNNING_SPEED_CADENCE_CHAR_UUID = new UUID(0x2A5300001000L, 0x800000805f9b34fbL);
+    public static final List<ServiceMeasurementUUID> CYCLING_CADENCE = List.of(
+            CYCLING_POWER,
+            CYCLING_SPEED_CADENCE
+    );
+
+    public static final ServiceMeasurementUUID RUNNING_SPEED_CADENCE = new ServiceMeasurementUUID(
+            new UUID(0x181400001000L, 0x800000805f9b34fbL),
+            new UUID(0x2A5300001000L, 0x800000805f9b34fbL)
+    );

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

@@ -98,17 +119,49 @@ public class BluetoothUtils {
        return null;
    }

-    public static Integer parseCyclingPower(BluetoothGattCharacteristic characteristic) {
+    public static SensorDataCyclingPower.Data parseCyclingPower(String address, String sensorName, BluetoothGattCharacteristic characteristic) {
        // DOCUMENTATION https://www.bluetooth.com/wp-content/uploads/Sitecore-Media-Library/Gatt/Xml/Characteristics/org.bluetooth.characteristic.cycling_power_measurement.xml
        int valueLength = characteristic.getValue().length;
-        if (valueLength < 4) {
+        if (valueLength == 0) {
            return null;
        }

-        return characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_SINT16, 2);
+        int index = 0;
+        int flags1 = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT8, index++);
+        int flags2 = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT8, index++);
+        boolean hasPedalPowerBalance = (flags1 & 0x01) > 0;
+        boolean hasAccumulatedTorque = (flags1 & 0x04) > 0;
+        boolean hasWheel = (flags1 & 16) > 0;
+        boolean hasCrank = (flags1 & 32) > 0;
+
+        Integer instantaneousPower = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_SINT16, index);
+        index += 2;
+
+        if (hasPedalPowerBalance) {
+            index += 1;
+        }
+        if (hasAccumulatedTorque) {
+            index += 2;
+        }
+        if (hasWheel) {
+            index += 2 + 2;
+        }
+
+        SensorDataCyclingCadence cadence = null;
+        if (hasCrank && valueLength - index >= 4) {
+            long crankCount = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index);
+            index += 2;
+
+            int crankTime = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index); // 1/1024s
+
+            cadence = new SensorDataCyclingCadence(address, sensorName, crankCount, crankTime);
+        }
+
+
+        return new SensorDataCyclingPower.Data(new SensorDataCyclingPower(sensorName, address, Power.of(instantaneousPower)), cadence);
    }

-    public static SensorDataCycling.CadenceAndSpeed parseCyclingCrankAndWheel(String address, String sensorName, @NonNull BluetoothGattCharacteristic characteristic) {
+    public static SensorDataCyclingCadenceAndDistanceSpeed parseCyclingCrankAndWheel(String address, String sensorName, @NonNull BluetoothGattCharacteristic characteristic) {
        // DOCUMENTATION https://www.bluetooth.com/wp-content/uploads/Sitecore-Media-Library/Gatt/Xml/Characteristics/org.bluetooth.characteristic.csc_measurement.xml
        int valueLength = characteristic.getValue().length;
        if (valueLength == 0) {
@@ -120,25 +173,25 @@ public class BluetoothUtils {
        boolean hasCrank = (flags & 0x02) > 0;

        int index = 1;
-        SensorDataCycling.DistanceSpeed speed = null;
+        SensorDataCyclingDistanceSpeed speed = null;
        if (hasWheel && valueLength - index >= 6) {
            int wheelTotalRevolutionCount = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT32, index);
            index += 4;
            int wheelTime = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index); // 1/1024s
-            speed = new SensorDataCycling.DistanceSpeed(address, sensorName, wheelTotalRevolutionCount, wheelTime);
+            speed = new SensorDataCyclingDistanceSpeed(address, sensorName, wheelTotalRevolutionCount, wheelTime);
            index += 2;
        }

-        SensorDataCycling.CyclingCadence cadence = null;
+        SensorDataCyclingCadence cadence = null;
        if (hasCrank && valueLength - index >= 4) {
            long crankCount = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index);
            index += 2;

            int crankTime = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index); // 1/1024s
-            cadence = new SensorDataCycling.CyclingCadence(address, sensorName, crankCount, crankTime);
+            cadence = new SensorDataCyclingCadence(address, sensorName, crankCount, crankTime);
        }

-        return new SensorDataCycling.CadenceAndSpeed(address, sensorName, cadence, speed);
+        return new SensorDataCyclingCadenceAndDistanceSpeed(address, sensorName, cadence, speed);
    }

    public static SensorDataRunning parseRunningSpeedAndCadence(String address, String sensorName, @NonNull BluetoothGattCharacteristic characteristic) {
@@ -0,0 +1,47 @@
+package de.dennisguse.opentracks.sensors;
+
+import androidx.annotation.NonNull;
+
+import java.util.Objects;
+import java.util.UUID;
+
+public class ServiceMeasurementUUID {
+
+    private final UUID serviceUUID;
+    private final UUID measurementUUID;
+
+    public ServiceMeasurementUUID(UUID serviceUUID, UUID measurementUUID) {
+        this.serviceUUID = serviceUUID;
+        this.measurementUUID = measurementUUID;
+    }
+
+    public UUID getServiceUUID() {
+        return serviceUUID;
+    }
+
+    public UUID getMeasurementUUID() {
+        return measurementUUID;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "ServiceMeasurementUUID{" +
+                "serviceUUID=" + serviceUUID +
+                ", measurementUUID=" + measurementUUID +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ServiceMeasurementUUID that = (ServiceMeasurementUUID) o;
+        return Objects.equals(serviceUUID, that.serviceUUID) && Objects.equals(measurementUUID, that.measurementUUID);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(serviceUUID, measurementUUID);
+    }
+}
@@ -1,256 +0,0 @@
-package de.dennisguse.opentracks.sensors.sensorData;
-
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.util.Pair;
-
-import java.time.Duration;
-
-import de.dennisguse.opentracks.data.models.Cadence;
-import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.data.models.UnitConversions;
-import de.dennisguse.opentracks.sensors.UintUtils;
-
-/**
- * Provides cadence in rpm and speed in milliseconds from Bluetooth LE Cycling Cadence and Speed sensors.
- */
-public final class SensorDataCycling {
-
-    private static final String TAG = SensorDataCycling.class.getSimpleName();
-
-    private SensorDataCycling() {
-    }
-
-    public static class CyclingCadence extends SensorData<Cadence> {
-
-        private final Long crankRevolutionsCount; // UINT32
-        private final Integer crankRevolutionsTime; // UINT16; 1/1024s
-
-        public CyclingCadence(String sensorAddress) {
-            super(sensorAddress);
-            this.crankRevolutionsCount = null;
-            this.crankRevolutionsTime = null;
-        }
-
-        public CyclingCadence(String sensorAddress, String sensorName, long crankRevolutionsCount, int crankRevolutionsTime) {
-            super(sensorAddress, sensorName);
-            this.crankRevolutionsCount = crankRevolutionsCount;
-            this.crankRevolutionsTime = crankRevolutionsTime;
-        }
-
-        /**
-         * Workaround for Wahoo CADENCE: provides speed instead of cadence
-         */
-        public CyclingCadence(@NonNull DistanceSpeed speed) {
-            this(speed.getSensorAddress(), speed.getSensorName(), speed.wheelRevolutionsCount, speed.wheelRevolutionsTime);
-        }
-
-        public boolean hasData() {
-            return crankRevolutionsCount != null && crankRevolutionsTime != null;
-        }
-
-        public long getCrankRevolutionsCount() {
-            return crankRevolutionsCount;
-        }
-
-        public int getCrankRevolutionsTime() {
-            return crankRevolutionsTime;
-        }
-
-        @NonNull
-        @Override
-        protected Cadence getNoneValue() {
-            return Cadence.of(0);
-        }
-
-        public void compute(CyclingCadence previous) {
-            if (hasData() && previous != null && previous.hasData()) {
-                float timeDiff_ms = UintUtils.diff(crankRevolutionsTime, previous.crankRevolutionsTime, UintUtils.UINT16_MAX) / 1024f * UnitConversions.S_TO_MS;
-                if (timeDiff_ms <= 0) {
-                    Log.e(TAG, "Timestamps difference is invalid: cannot compute cadence.");
-                    value = null;
-                    return;
-                }
-
-                // TODO We have to treat with overflow according to the documentation: read https://github.com/OpenTracksApp/OpenTracks/pull/953#discussion_r711625268
-                if (crankRevolutionsCount < previous.crankRevolutionsCount) {
-                    Log.e(TAG, "Crank revolutions count difference is invalid: cannot compute cadence.");
-                    return;
-                }
-
-                long crankDiff = UintUtils.diff(crankRevolutionsCount, previous.crankRevolutionsCount, UintUtils.UINT32_MAX);
-                float cadence_ms = crankDiff / timeDiff_ms;
-                value = Cadence.of((float) (cadence_ms / UnitConversions.MS_TO_S / UnitConversions.S_TO_MIN));
-            }
-        }
-
-        @NonNull
-        @Override
-        public String toString() {
-            return super.toString() + " cadence=" + value + " time=" + crankRevolutionsTime + " count=" + crankRevolutionsCount;
-        }
-
-        @Override
-        public boolean equals(@Nullable Object obj) {
-            if (!(obj instanceof CyclingCadence)) return false;
-
-            CyclingCadence comp = (CyclingCadence) obj;
-            if (hasData() && comp.hasData() == hasData()) {
-                return getCrankRevolutionsCount() == comp.getCrankRevolutionsCount() && getCrankRevolutionsTime() == comp.getCrankRevolutionsTime();
-            } else {
-                return false;
-            }
-        }
-    }
-
-    public static class DistanceSpeed extends SensorData<DistanceSpeed.Data> {
-
-        private final Long wheelRevolutionsCount; // UINT32
-        private final Integer wheelRevolutionsTime; // UINT16; 1/1024s
-
-        public DistanceSpeed(String sensorAddress) {
-            super(sensorAddress);
-            this.wheelRevolutionsCount = null;
-            this.wheelRevolutionsTime = null;
-        }
-
-        public DistanceSpeed(String sensorAddress, String sensorName, long wheelRevolutionsCount, int wheelRevolutionsTime) {
-            super(sensorAddress, sensorName);
-            this.wheelRevolutionsCount = wheelRevolutionsCount;
-            this.wheelRevolutionsTime = wheelRevolutionsTime;
-        }
-
-        public boolean hasData() {
-            return wheelRevolutionsCount != null && wheelRevolutionsTime != null;
-        }
-
-        public long getWheelRevolutionsCount() {
-            return wheelRevolutionsCount;
-        }
-
-        public int getWheelRevolutionsTime() {
-            return wheelRevolutionsTime;
-        }
-
-        @NonNull
-        @Override
-        protected Data getNoneValue() {
-            if (value != null) {
-                return new Data(value.distance, value.distanceOverall, Speed.zero());
-            } else {
-                return new Data(Distance.of(0), Distance.of(0), Speed.zero());
-            }
-        }
-
-        public void compute(DistanceSpeed previous, Distance wheelCircumference) {
-            if (hasData() && previous != null && previous.hasData()) {
-                float timeDiff_ms = UintUtils.diff(wheelRevolutionsTime, previous.wheelRevolutionsTime, UintUtils.UINT16_MAX) / 1024f * UnitConversions.S_TO_MS;
-                Duration timeDiff = Duration.ofMillis((long) timeDiff_ms);
-                if (timeDiff.isZero() || timeDiff.isNegative()) {
-                    Log.e(TAG, "Timestamps difference is invalid: cannot compute speed.");
-                    value = null;
-                    return;
-                }
-
-                if (wheelRevolutionsCount < previous.wheelRevolutionsCount) {
-                    Log.e(TAG, "Wheel revolutions count difference is invalid: cannot compute speed.");
-                    return;
-                }
-                long wheelDiff = UintUtils.diff(wheelRevolutionsCount, previous.wheelRevolutionsCount, UintUtils.UINT32_MAX);
-
-                Distance distance = wheelCircumference.multipliedBy(wheelDiff);
-                Distance distanceOverall = distance;
-                if (previous.hasValue()) {
-                    distanceOverall = distance.plus(previous.getValue().distanceOverall);
-                }
-                Speed speed_mps = Speed.of(distance, timeDiff);
-                value = new Data(distance, distanceOverall, speed_mps);
-            }
-        }
-
-        @Override
-        public void reset() {
-            if (value != null) {
-                value = new Data(value.distance, Distance.of(0), value.speed);
-            }
-        }
-
-        @NonNull
-        @Override
-        public String toString() {
-            return super.toString() + " data=" + value + " time=" + wheelRevolutionsTime + " count=" + wheelRevolutionsCount;
-        }
-
-        @Override
-        public boolean equals(@Nullable Object obj) {
-            if (!(obj instanceof DistanceSpeed)) return false;
-
-            DistanceSpeed comp = (DistanceSpeed) obj;
-            if (!(hasData() && comp.hasData())) {
-                return false;
-            }
-
-            return getWheelRevolutionsCount() == comp.getWheelRevolutionsCount() && getWheelRevolutionsTime() == comp.getWheelRevolutionsTime();
-        }
-
-        public static class Data {
-            private final Distance distance;
-            private final Distance distanceOverall;
-            private final Speed speed;
-
-            private Data(Distance distance, Distance distanceOverall, Speed speed) {
-                this.distance = distance;
-                this.distanceOverall = distanceOverall;
-                this.speed = speed;
-            }
-
-            public Distance getDistance() {
-                return distance;
-            }
-
-            public Distance getDistanceOverall() {
-                return distanceOverall;
-            }
-
-            public Speed getSpeed() {
-                return speed;
-            }
-
-            @NonNull
-            @Override
-            public String toString() {
-                return "Data{" +
-                        "distance=" + getDistance() +
-                        ", distance_overall=" + getDistanceOverall() +
-                        ", speed=" + getSpeed() +
-                        '}';
-            }
-        }
-    }
-
-    public static class CadenceAndSpeed extends SensorData<Pair<CyclingCadence, DistanceSpeed>> {
-
-        public CadenceAndSpeed(String sensorAddress, String sensorName, @Nullable CyclingCadence cadence, @Nullable DistanceSpeed distanceSpeed) {
-            super(sensorAddress, sensorName);
-            this.value = new Pair<>(cadence, distanceSpeed);
-        }
-
-        public CyclingCadence getCadence() {
-            return this.value != null ? this.value.first : null;
-        }
-
-        public DistanceSpeed getDistanceSpeed() {
-            return this.value != null ? this.value.second : null;
-        }
-
-        @NonNull
-        @Override
-        protected Pair<CyclingCadence, DistanceSpeed> getNoneValue() {
-            return new Pair<>(null, null);
-        }
-    }
-}
-
@@ -0,0 +1,88 @@
+package de.dennisguse.opentracks.sensors.sensorData;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.time.Duration;
+
+import de.dennisguse.opentracks.data.models.Cadence;
+import de.dennisguse.opentracks.sensors.UintUtils;
+
+public class SensorDataCyclingCadence extends SensorData<Cadence> {
+
+    private final String TAG = SensorDataCyclingCadence.class.getSimpleName();
+
+    private final Long crankRevolutionsCount; // UINT32
+    private final Integer crankRevolutionsTime; // UINT16; 1/1024s
+
+    public SensorDataCyclingCadence(String sensorAddress) {
+        super(sensorAddress);
+        this.crankRevolutionsCount = null;
+        this.crankRevolutionsTime = null;
+    }
+
+    public SensorDataCyclingCadence(String sensorAddress, String sensorName, long crankRevolutionsCount, int crankRevolutionsTime) {
+        super(sensorAddress, sensorName);
+        this.crankRevolutionsCount = crankRevolutionsCount;
+        this.crankRevolutionsTime = crankRevolutionsTime;
+    }
+
+    public boolean hasData() {
+        return crankRevolutionsCount != null && crankRevolutionsTime != null;
+    }
+
+    public long getCrankRevolutionsCount() {
+        return crankRevolutionsCount;
+    }
+
+    public int getCrankRevolutionsTime() {
+        return crankRevolutionsTime;
+    }
+
+    @NonNull
+    @Override
+    protected Cadence getNoneValue() {
+        return Cadence.of(0);
+    }
+
+    public void compute(SensorDataCyclingCadence previous) {
+        if (hasData() && previous != null && previous.hasData()) {
+            float timeDiff_ms = UintUtils.diff(crankRevolutionsTime, previous.crankRevolutionsTime, UintUtils.UINT16_MAX) / 1024f * 1000;
+            Duration timeDiff = Duration.ofMillis((long) timeDiff_ms);
+            if (timeDiff.isZero() || timeDiff.isNegative()) {
+                Log.e(TAG, "Timestamps difference is invalid: cannot compute cadence.");
+                value = null;
+                return;
+            }
+
+            // TODO We have to treat with overflow according to the documentation: read https://github.com/OpenTracksApp/OpenTracks/pull/953#discussion_r711625268
+            if (crankRevolutionsCount < previous.crankRevolutionsCount) {
+                Log.e(TAG, "Crank revolutions count difference is invalid: cannot compute cadence.");
+                return;
+            }
+
+            long crankDiff = UintUtils.diff(crankRevolutionsCount, previous.crankRevolutionsCount, UintUtils.UINT32_MAX);
+            value = Cadence.of(crankDiff, timeDiff);
+        }
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return super.toString() + " cadence=" + value + " time=" + crankRevolutionsTime + " count=" + crankRevolutionsCount;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (!(obj instanceof SensorDataCyclingCadence)) return false;
+
+        SensorDataCyclingCadence comp = (SensorDataCyclingCadence) obj;
+        if (hasData() && comp.hasData() == hasData()) {
+            return getCrankRevolutionsCount() == comp.getCrankRevolutionsCount() && getCrankRevolutionsTime() == comp.getCrankRevolutionsTime();
+        } else {
+            return false;
+        }
+    }
+}
@@ -0,0 +1,27 @@
+package de.dennisguse.opentracks.sensors.sensorData;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Pair;
+
+public class SensorDataCyclingCadenceAndDistanceSpeed extends SensorData<Pair<SensorDataCyclingCadence, SensorDataCyclingDistanceSpeed>> {
+
+    public SensorDataCyclingCadenceAndDistanceSpeed(String sensorAddress, String sensorName, @Nullable SensorDataCyclingCadence cadence, @Nullable SensorDataCyclingDistanceSpeed distanceSpeed) {
+        super(sensorAddress, sensorName);
+        this.value = new Pair<>(cadence, distanceSpeed);
+    }
+
+    public SensorDataCyclingCadence getCadence() {
+        return this.value != null ? this.value.first : null;
+    }
+
+    public SensorDataCyclingDistanceSpeed getDistanceSpeed() {
+        return this.value != null ? this.value.second : null;
+    }
+
+    @NonNull
+    @Override
+    protected Pair<SensorDataCyclingCadence, SensorDataCyclingDistanceSpeed> getNoneValue() {
+        return new Pair<>(null, null);
+    }
+}
@@ -0,0 +1,139 @@
+package de.dennisguse.opentracks.sensors.sensorData;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.time.Duration;
+
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.sensors.UintUtils;
+
+public class SensorDataCyclingDistanceSpeed extends SensorData<SensorDataCyclingDistanceSpeed.Data> {
+
+    private final String TAG = SensorDataCyclingDistanceSpeed.class.getSimpleName();
+
+    private final Long wheelRevolutionsCount; // UINT32
+    private final Integer wheelRevolutionsTime; // UINT16; 1/1024s
+
+    public SensorDataCyclingDistanceSpeed(String sensorAddress) {
+        super(sensorAddress);
+        this.wheelRevolutionsCount = null;
+        this.wheelRevolutionsTime = null;
+    }
+
+    public SensorDataCyclingDistanceSpeed(String sensorAddress, String sensorName, long wheelRevolutionsCount, int wheelRevolutionsTime) {
+        super(sensorAddress, sensorName);
+        this.wheelRevolutionsCount = wheelRevolutionsCount;
+        this.wheelRevolutionsTime = wheelRevolutionsTime;
+    }
+
+    public boolean hasData() {
+        return wheelRevolutionsCount != null && wheelRevolutionsTime != null;
+    }
+
+    public long getWheelRevolutionsCount() {
+        return wheelRevolutionsCount;
+    }
+
+    public int getWheelRevolutionsTime() {
+        return wheelRevolutionsTime;
+    }
+
+    @NonNull
+    @Override
+    protected Data getNoneValue() {
+        if (value != null) {
+            return new Data(value.distance, value.distanceOverall, Speed.zero());
+        } else {
+            return new Data(Distance.of(0), Distance.of(0), Speed.zero());
+        }
+    }
+
+    public void compute(SensorDataCyclingDistanceSpeed previous, Distance wheelCircumference) {
+        if (hasData() && previous != null && previous.hasData()) {
+            float timeDiff_ms = UintUtils.diff(wheelRevolutionsTime, previous.wheelRevolutionsTime, UintUtils.UINT16_MAX) / 1024f * 1000;
+            Duration timeDiff = Duration.ofMillis((long) timeDiff_ms);
+            if (timeDiff.isZero() || timeDiff.isNegative()) {
+                Log.e(TAG, "Timestamps difference is invalid: cannot compute speed.");
+                value = null;
+                return;
+            }
+
+            if (wheelRevolutionsCount < previous.wheelRevolutionsCount) {
+                Log.e(TAG, "Wheel revolutions count difference is invalid: cannot compute speed.");
+                return;
+            }
+            long wheelDiff = UintUtils.diff(wheelRevolutionsCount, previous.wheelRevolutionsCount, UintUtils.UINT32_MAX);
+
+            Distance distance = wheelCircumference.multipliedBy(wheelDiff);
+            Distance distanceOverall = distance;
+            if (previous.hasValue()) {
+                distanceOverall = distance.plus(previous.getValue().distanceOverall);
+            }
+            Speed speed_mps = Speed.of(distance, timeDiff);
+            value = new Data(distance, distanceOverall, speed_mps);
+        }
+    }
+
+    @Override
+    public void reset() {
+        if (value != null) {
+            value = new Data(value.distance, Distance.of(0), value.speed);
+        }
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return super.toString() + " data=" + value + " time=" + wheelRevolutionsTime + " count=" + wheelRevolutionsCount;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (!(obj instanceof SensorDataCyclingDistanceSpeed)) return false;
+
+        SensorDataCyclingDistanceSpeed comp = (SensorDataCyclingDistanceSpeed) obj;
+        if (!(hasData() && comp.hasData())) {
+            return false;
+        }
+
+        return getWheelRevolutionsCount() == comp.getWheelRevolutionsCount() && getWheelRevolutionsTime() == comp.getWheelRevolutionsTime();
+    }
+
+    public static class Data {
+        private final Distance distance;
+        private final Distance distanceOverall;
+        private final Speed speed;
+
+        private Data(Distance distance, Distance distanceOverall, Speed speed) {
+            this.distance = distance;
+            this.distanceOverall = distanceOverall;
+            this.speed = speed;
+        }
+
+        public Distance getDistance() {
+            return distance;
+        }
+
+        public Distance getDistanceOverall() {
+            return distanceOverall;
+        }
+
+        public Speed getSpeed() {
+            return speed;
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return "Data{" +
+                    "distance=" + getDistance() +
+                    ", distance_overall=" + getDistanceOverall() +
+                    ", speed=" + getSpeed() +
+                    '}';
+        }
+    }
+}
@@ -1,6 +1,7 @@
 package de.dennisguse.opentracks.sensors.sensorData;

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

 import de.dennisguse.opentracks.data.models.Power;

@@ -17,13 +18,40 @@ public class SensorDataCyclingPower extends SensorData<Power> {

    @NonNull
    @Override
-    public String toString() {
-        return super.toString() + " power=" + value;
+    protected Power getNoneValue() {
+        return Power.of(0f);
    }

    @NonNull
    @Override
-    protected Power getNoneValue() {
-        return Power.of(0f);
+    public String toString() {
+        return super.toString() + " data=" + value;
+    }
+
+    public static class Data {
+        private final SensorDataCyclingPower power;
+        private final SensorDataCyclingCadence cadence;
+
+        public Data(SensorDataCyclingPower power, @Nullable SensorDataCyclingCadence cadence) {
+            this.power = power;
+            this.cadence = cadence;
+        }
+
+        public SensorDataCyclingPower getPower() {
+            return power;
+        }
+
+        public SensorDataCyclingCadence getCadence() {
+            return cadence;
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return "Data{" +
+                    "power=" + power +
+                    ", cadence=" + cadence +
+                    '}';
+        }
    }
 }
@@ -13,9 +13,9 @@ public final class SensorDataSet {

    private SensorDataHeartRate heartRate;

-    private SensorDataCycling.CyclingCadence cyclingCadence;
+    private SensorDataCyclingCadence cyclingCadence;

-    private SensorDataCycling.DistanceSpeed cyclingDistanceSpeed;
+    private SensorDataCyclingDistanceSpeed cyclingDistanceSpeed;

    private SensorDataCyclingPower cyclingPower;

@@ -64,11 +64,11 @@ public final class SensorDataSet {
        return null;
    }

-    public SensorDataCycling.CyclingCadence getCyclingCadence() {
+    public SensorDataCyclingCadence getCyclingCadence() {
        return cyclingCadence;
    }

-    public SensorDataCycling.DistanceSpeed getCyclingDistanceSpeed() {
+    public SensorDataCyclingDistanceSpeed getCyclingDistanceSpeed() {
        return cyclingDistanceSpeed;
    }

@@ -146,12 +146,12 @@ public final class SensorDataSet {
            return;
        }

-        if (type instanceof SensorDataCycling.CyclingCadence) {
-            this.cyclingCadence = (SensorDataCycling.CyclingCadence) data;
+        if (type instanceof SensorDataCyclingCadence) {
+            this.cyclingCadence = (SensorDataCyclingCadence) data;
            return;
        }
-        if (type instanceof SensorDataCycling.DistanceSpeed) {
-            this.cyclingDistanceSpeed = (SensorDataCycling.DistanceSpeed) data;
+        if (type instanceof SensorDataCyclingDistanceSpeed) {
+            this.cyclingDistanceSpeed = (SensorDataCyclingDistanceSpeed) data;
            return;
        }

@@ -15,12 +15,14 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;

 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.settings.PreferencesUtils;

 public class TrackDeleteService extends Service {

@@ -31,7 +33,7 @@ public class TrackDeleteService extends Service {

    private final Binder binder = new Binder();
    private ExecutorService serviceExecutor;
-    private MutableLiveData<DeleteStatus> deleteResultObservable;
+    private MutableLiveData<DeletionFinishedStatus> deleteResultObservable;
    private NotificationManager notificationManager;
    private NotificationCompat.Builder notificationBuilder;

@@ -59,22 +61,18 @@ public class TrackDeleteService extends Service {
        return START_NOT_STICKY;
    }

-    private void deleteTracks(@NonNull ArrayList<Track.Id> trackIds) {
-        sendResult(null,0, trackIds.size());
+    private void deleteTracks(@NonNull List<Track.Id> trackIds) {
        serviceExecutor.execute(() -> {
            ContentProviderUtils contentProviderUtils = new ContentProviderUtils(this);
-            for (int i = 0; i < trackIds.size(); i++) {
-                updateNotification(i + 1, trackIds.size());
-                contentProviderUtils.deleteTrack(this, trackIds.get(i));
-                sendResult(trackIds.get(i), i + 1, trackIds.size());
-            }
+            contentProviderUtils.deleteTracks(this, trackIds);
+            sendResult(trackIds);
            stopSelf();
        });
    }

-    private void sendResult(Track.Id trackId, int deletes, int total) {
+    private void sendResult(List<Track.Id> trackIds) {
        if (deleteResultObservable != null) {
-            deleteResultObservable.postValue(new DeleteStatus(trackId, deletes, total));
+            deleteResultObservable.postValue(new DeletionFinishedStatus(trackIds));
        }
    }

@@ -83,7 +81,7 @@ public class TrackDeleteService extends Service {
        return binder;
    }

-    public LiveData<DeleteStatus> getDeletingStatusObservable() {
+    public LiveData<DeletionFinishedStatus> getDeletingStatusObservable() {
        return deleteResultObservable;
    }

@@ -106,25 +104,13 @@ public class TrackDeleteService extends Service {
        notificationBuilder = new NotificationCompat.Builder(this, CHANNEL_ID);
        notificationBuilder
                .setContentTitle(this.getString(R.string.track_delete_progress_message))
-                .setContentText(this.getString(R.string.track_delete_progress, 0, tracksToDelete))
+                .setContentText(this.getString(R.string.track_delete_number_of_tracks, tracksToDelete))
                .setSmallIcon(R.drawable.ic_logo_color_24dp)
-                .setProgress(tracksToDelete, 0, false);
+                .setProgress(0, 0, true);

        startForeground(NOTIFICATION_ID, notificationBuilder.build());
    }

-    /**
-     * Updates notification progress.
-     *
-     * @param progress number of tracks already deleted.
-     * @param total    total of tracks to be deleted.
-     */
-    private void updateNotification(int progress, int total) {
-        notificationBuilder.setProgress(total, progress, false);
-        notificationBuilder.setContentText(this.getString(R.string.track_delete_progress, progress, total));
-        notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
-    }
-
    public class Binder extends android.os.Binder {

        private Binder() {
@@ -136,36 +122,25 @@ public class TrackDeleteService extends Service {
        }
    }

-    public static class DeleteStatus {
-        private final int progress;
-        private final int max;
-        private final Track.Id trackId;
+    public static class DeletionFinishedStatus {
+        private final List<Track.Id> trackIds;

        /**
-         * @param trackId  Track.Id just deleted if any.
-         * @param progress number of deletes.
-         * @param max      total of deletes to be done.
+         * @param trackIds List of deleted Track.Ids.
         */
-        private DeleteStatus(@Nullable Track.Id trackId, int progress, int max) {
-            this.trackId = trackId;
-            this.progress = progress;
-            this.max = max;
-        }
-
-        public boolean isFinished() {
-            return progress == max;
+        private DeletionFinishedStatus(@Nullable List<Track.Id> trackIds) {
+            this.trackIds = trackIds;
        }

        public boolean isDeleted(Track.Id trackId) {
-            return this.trackId != null && this.trackId.equals(trackId);
+            return this.trackIds != null && this.trackIds.contains(trackId);
        }

        @NonNull
        @Override
        public String toString() {
            return "DeleteStatus{" +
-                    "number of deletes=" + progress +
-                    ", total=" + max +
+                    "trackIds=" + trackIds +
                    '}';
        }
    }
@@ -10,6 +10,7 @@ import android.util.Pair;

 import androidx.annotation.NonNull;

+import java.time.Duration;
 import java.time.ZoneOffset;

 import de.dennisguse.opentracks.R;
@@ -180,8 +181,16 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
        }

        if (!trackPoint.hasLocation() && !trackPoint.hasSensorDistance()) {
-            Log.d(TAG, "Ignoring TrackPoint as it has no distance.");
-            return false;
+            Duration minStorageInterval = Duration.ofSeconds(10); // TODO Should be configurable.
+            boolean shouldStore = lastStoredTrackPoint.getTime().plus(minStorageInterval)
+                    .isBefore(trackPoint.getTime());
+            if (!shouldStore) {
+                Log.d(TAG, "Ignoring TrackPoint as it has no distance (and sensor data is not new enough).");
+                return false;
+            } else {
+                insertTrackPoint(trackPoint, true);
+                return true;
+            }
        }

        Distance distanceToLastStoredTrackPoint;
@@ -129,7 +129,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        trackRecordingManager = null;

        // Reverse order from onCreate
-        showNotification(false); //TODO Why?
+        stopForeground(true);
+
        notificationManager.stop();
        notificationManager = null;

@@ -205,7 +206,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
    private void startSensors() {
        wakeLock = SystemUtils.acquireWakeLock(this, wakeLock);
        trackPointCreator.start(this, handler);
-        showNotification(true);
+        startForeground(TrackRecordingServiceNotificationManager.NOTIFICATION_ID, notificationManager.setGPSonlyStarted(this));
    }

    public void endCurrentTrack() {
@@ -247,7 +248,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        if (!isRecording()) return;

        trackPointCreator.stop();
-        showNotification(false);
+        stopForeground(true);
+        notificationManager.cancelNotification();
        wakeLock = SystemUtils.releaseWakeLock(wakeLock);
    }

@@ -273,19 +275,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        }
    }

-    private void showNotification(boolean isGpsStarted) {
-        if (isRecording()) {
-            startForeground(TrackRecordingServiceNotificationManager.NOTIFICATION_ID, notificationManager.setRecording(this, recordingStatus.getTrackId()));
-        }
-        if (!isRecording() && isGpsStarted) {
-            startForeground(TrackRecordingServiceNotificationManager.NOTIFICATION_ID, notificationManager.setGPSonlyStarted(this));
-        }
-        if (!isRecording() && !isGpsStarted) {
-            stopForeground(true);
-            notificationManager.cancelNotification();
-        }
-    }
-
    public Marker.Id insertMarker(String name, String category, String description, String photoUrl) {
        if (!isRecording()) {
            return null;
@@ -28,6 +28,7 @@ import android.widget.Toast;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;

 import de.dennisguse.opentracks.BuildConfig;
 import de.dennisguse.opentracks.R;
@@ -66,15 +67,21 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death

    /**
     * Starts and binds the service.
+     *
+     * @param foreground is the service expected to call `startForeground()`?
     */
-    public void startAndBind(Context context) {
+    public void startAndBind(Context context, boolean foreground) {
        if (trackRecordingService != null) {
            // Service is already started and bound.
            return;
        }

        Log.i(TAG, "Starting the service.");
-        context.startService(new Intent(context, TrackRecordingService.class));
+        if (foreground) {
+            ContextCompat.startForegroundService(context, new Intent(context, TrackRecordingService.class));
+        } else {
+            context.startService(new Intent(context, TrackRecordingService.class));
+        }

        startConnection(context);
    }
@@ -88,7 +95,7 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
    @Deprecated
    public void startAndBindWithCallback(Context context) {
        if (trackRecordingService == null) {
-            startAndBind(context);
+            startAndBind(context, false);
            return;
        }
        if (callback != null) {
@@ -68,6 +68,7 @@ class TrackRecordingServiceNotificationManager implements SharedPreferences.OnSh
    }

    void stop() {
+        cancelNotification();
        PreferencesUtils.unregisterOnSharedPreferenceChangeListener(this);
    }

@@ -17,6 +17,7 @@
 package de.dennisguse.opentracks.services.announcement;

 import android.content.Context;
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.speech.tts.TextToSpeech;
@@ -34,8 +35,8 @@ import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.TrackPointIterator;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.ui.intervals.IntervalStatistics;
@@ -56,6 +57,10 @@ public class VoiceAnnouncement {
    private final AudioManager audioManager;

    private final ContentProviderUtils contentProviderUtils;
+    private TrackPoint.Id startTrackPointId = null;
+
+    private IntervalStatistics intervalStatistics;
+    private Distance intervalDistance;

    private final AudioManager.OnAudioFocusChangeListener audioFocusChangeListener = new AudioManager.OnAudioFocusChangeListener() {
        @Override
@@ -116,6 +121,8 @@ public class VoiceAnnouncement {
        this.context = context;
        audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
        contentProviderUtils = new ContentProviderUtils(context);
+        intervalDistance = PreferencesUtils.getVoiceAnnouncementDistance();
+        intervalStatistics = new IntervalStatistics(intervalDistance);
    }

    public void start() {
@@ -132,7 +139,10 @@ public class VoiceAnnouncement {
            if (ttsFallback == null) {
                Log.w(TAG, "MediaPlayer for ttsFallback could not be created.");
            } else {
-                ttsFallback.setAudioStreamType(AUDIO_STREAM);
+                ttsFallback.setAudioAttributes(
+                        new AudioAttributes.Builder()
+                                .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                                .build());
                ttsFallback.setLooping(false);
            }
        }
@@ -165,21 +175,22 @@ public class VoiceAnnouncement {
            return;
        }

+        Distance currentIntervalDistance = PreferencesUtils.getVoiceAnnouncementDistance();
+        if (currentIntervalDistance != intervalDistance) {
+            intervalStatistics = new IntervalStatistics(currentIntervalDistance);
+            intervalDistance = currentIntervalDistance;
+            startTrackPointId = null;
+        }

-        UnitSystem unitSystem = PreferencesUtils.getUnitSystem();
-        boolean isReportSpeed = PreferencesUtils.isReportSpeed(track.getCategory());
-
-        //TODO Do not load all trackpoints for every announcement
-        TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), null);
-        IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.one(unitSystem));
-        intervalStatistics.addTrackPoints(trackPointIterator);
+        TrackPointIterator trackPointIterator = new TrackPointIterator(contentProviderUtils, track.getId(), startTrackPointId);
+        startTrackPointId = intervalStatistics.addTrackPoints(trackPointIterator);
        IntervalStatistics.Interval lastInterval = intervalStatistics.getLastInterval();
        SensorStatistics sensorStatistics = null;
        if (track.getId() != null) {
            sensorStatistics = contentProviderUtils.getSensorStats(track.getId());
        }

-        Spannable announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), unitSystem, isReportSpeed, lastInterval, sensorStatistics);
+        Spannable announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track.getCategory()), lastInterval, sensorStatistics);

        if (announcement.length() > 0) {
            // We don't care about the utterance id. It is supplied here to force onUtteranceCompleted to be called.
@@ -5,8 +5,8 @@ import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnno
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceAverageSpeedPace;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapHeartRate;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapSpeedPace;
-import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTotalDistance;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceMovingTime;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTotalDistance;

 import android.content.Context;
 import android.text.Spannable;
@@ -33,8 +33,8 @@ class VoiceAnnouncementUtils {

    static Spannable getAnnouncement(Context context, TrackStatistics trackStatistics, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) {
        SpannableStringBuilder builder = new SpannableStringBuilder();
-        Distance distance = trackStatistics.getTotalDistance();
-        Speed distancePerTime = trackStatistics.getAverageMovingSpeed();
+        Distance totalDistance = trackStatistics.getTotalDistance();
+        Speed averageMovingSpeed = trackStatistics.getAverageMovingSpeed();
        Speed currentDistancePerTime = currentInterval != null ? currentInterval.getSpeed() : null;

        int perUnitStringId;
@@ -68,7 +68,7 @@ class VoiceAnnouncementUtils {
                throw new RuntimeException("Not implemented");
        }

-        double distanceInUnit = distance.toKM_Miles(unitSystem);
+        double distanceInUnit = totalDistance.toKM_Miles(unitSystem);

        if (shouldVoiceAnnounceTotalDistance()) {
            builder.append(context.getString(R.string.total_distance));
@@ -78,7 +78,7 @@ class VoiceAnnouncementUtils {
            // Punctuation helps introduce natural pauses in TTS
            builder.append(".");
        }
-        if (distance.isZero()) {
+        if (totalDistance.isZero()) {
            return builder;
        }

@@ -91,7 +91,7 @@ class VoiceAnnouncementUtils {

        if (isReportSpeed) {
            if (shouldVoiceAnnounceAverageSpeedPace()) {
-                double speedInUnit = distancePerTime.to(unitSystem);
+                double speedInUnit = averageMovingSpeed.to(unitSystem);
                builder.append(" ")
                        .append(context.getString(R.string.speed));
                appendDecimalUnit(builder, context.getResources().getQuantityString(speedId, getQuantityCount(speedInUnit), speedInUnit), speedInUnit, 1, unitSpeedTTS);
@@ -108,7 +108,7 @@ class VoiceAnnouncementUtils {
            }
        } else {
            if (shouldVoiceAnnounceAverageSpeedPace()) {
-                Duration time = distancePerTime.toPace(unitSystem);
+                Duration time = averageMovingSpeed.toPace(unitSystem);
                builder.append(" ")
                        .append(context.getString(R.string.pace));
                appendDuration(context, builder, time);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dennis Guse	9db2aff631	Release: v4.1.1	2022-09-29 20:23:21 +02:00
Xosé M	b7cedab1fb	Translated using Weblate (Galician) Currently translated at 100.0% (502 of 502 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/gl/	2022-09-28 21:39:42 +02:00
metezd	0a193c8b5c	Translated using Weblate (Turkish) Currently translated at 97.8% (490 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/tr/	2022-09-28 21:39:42 +02:00
Mingu113	7049fab204	Translated using Weblate (Vietnamese) Currently translated at 73.6% (70 of 95 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/app-store-metadata-files/vi/	2022-09-28 21:39:42 +02:00
Mingu113	80fa49bcf0	Translated using Weblate (Vietnamese) Currently translated at 100.0% (501 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/vi/	2022-09-28 21:39:42 +02:00
Leon Marz	a1eb5fb15f	Check if the device has GPS Fixes #1380	2022-09-28 21:39:33 +02:00
dependabot[bot]	9160b9b104	Bump reactivecircus/android-emulator-runner from 2.25.0 to 2.26.0 Bumps [reactivecircus/android-emulator-runner](https://github.com/reactivecircus/android-emulator-runner) from 2.25.0 to 2.26.0. - [Release notes](https://github.com/reactivecircus/android-emulator-runner/releases) - [Changelog](https://github.com/ReactiveCircus/android-emulator-runner/blob/main/CHANGELOG.md) - [Commits](https://github.com/reactivecircus/android-emulator-runner/compare/v2.25.0...v2.26.0) --- updated-dependencies: - dependency-name: reactivecircus/android-emulator-runner dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-09-26 20:19:51 +02:00
Dennis Guse	85a73c3c85	Implement introduction screen. Fixes #1316.	2022-09-18 15:44:49 +02:00
Dennis Guse	8389f9150a	Update sensor documentation.	2022-09-17 17:08:50 +02:00
Dennis Guse	3075f4010f	Release: v4.1.0	2022-09-15 23:14:53 +02:00
Dennis Guse	82e305e6a7	Upgrade to Android Gradle Plugin 7.3.0	2022-09-15 22:14:55 +02:00
Dennis Guse	6351a335c0	Merge pull request #1217 from OpenTracksApp/kml23#339 Upgrade to KML2.3	2022-09-13 23:51:10 +02:00
Dennis Guse	6538daedef	README: add export format compatibility matrix. Part of #339.	2022-09-13 23:50:43 +02:00
Dennis Guse	82fe859c84	KML: Export KML2.3 - KML2.2 and KML2.3 can be imported. Fixes #339.	2022-09-13 23:20:06 +02:00
Dennis Guse	f567b03be5	Bugfix: import all crashed with ClassCastException.	2022-09-11 14:37:35 +02:00
monyxie	7dc4e8dbc8	Translated using Weblate (Chinese (Simplified)) Currently translated at 72.6% (69 of 95 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/app-store-metadata-files/zh_Hans/	2022-09-10 23:11:09 +02:00
monyxie	2a272a887e	Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (501 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/zh_Hans/	2022-09-10 23:11:09 +02:00
Xosé M	868509e00b	Translated using Weblate (Galician) Currently translated at 100.0% (501 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/gl/	2022-09-10 23:11:08 +02:00
FTno	477bdd5214	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (501 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2022-09-10 23:11:08 +02:00
Xosé M	286cec8d77	Translated using Weblate (Galician) Currently translated at 100.0% (501 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/gl/	2022-09-10 23:11:08 +02:00
Dennis Guse	58d4ee7d7d	Merge pull request #1372 from OpenTracksApp/cadence#1352 Cycling cadence from powermeter	2022-09-10 23:10:58 +02:00
dependabot[bot]	0e93a304f0	Bump appcompat from 1.5.0 to 1.5.1 Bumps appcompat from 1.5.0 to 1.5.1. --- updated-dependencies: - dependency-name: androidx.appcompat:appcompat dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-09-07 22:24:38 +02:00
dependabot[bot]	0adc4c7986	Bump mockito-android from 4.7.0 to 4.8.0 Bumps [mockito-android](https://github.com/mockito/mockito) from 4.7.0 to 4.8.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-09-07 22:20:51 +02:00
Dennis Guse	a93424629d	BLE: process cycling cadence from powermeter. Fixes #1352.	2022-09-04 19:55:32 +02:00
Dennis Guse	da29766fd0	BLE: BluetoothConnectionManager supports multiple BLE services per sensor type (e.g., cadence). Part of #1352.	2022-09-04 19:11:31 +02:00
Dennis Guse	dc7afbd07f	BLE: extract SensorDataCycling. Part of #1352.	2022-09-04 12:11:09 +02:00
Dennis Guse	67b174feac	BLE: do not try to connect twice. Might had some interesting side effects. Part of #1352.	2022-09-04 12:11:09 +02:00
Dennis Guse	b6b81b5d3d	BLE: extract sensor managers into separate files. Part of #1352.	2022-09-04 12:11:09 +02:00
Dennis Guse	7d804b603d	BLE: decode cadence from cycling powermeter. Part of #1352.	2022-09-04 12:11:09 +02:00
Dennis Guse	8696a15ce7	Cleanup: introduced ServiceMeasurementUUID. Part of #1352.	2022-09-04 11:54:26 +02:00
Dennis Guse	989fe39849	Cleanup: BLE preferences. Part of #1352.	2022-09-04 11:31:42 +02:00
Dennis Guse	ed1e432691	Merge remote-tracking branch 'weblate/main'	2022-09-03 23:58:15 +02:00
Dennis Guse	4f612e32d6	Voice announcements: "speed" -> "average moving speed" (en only). Fixes #1346.	2022-09-03 23:26:09 +02:00
Dennis Guse	e5d1e421a4	Release: v4.0.8	2022-09-03 10:21:38 +02:00
Surfoo	08ab8cc61d	Translated using Weblate (French) Currently translated at 100.0% (501 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/fr/	2022-08-28 17:01:16 +02:00
Dennis Guse	c3b30815c8	SplashScreen: use Androidx library. Improvement for Android 12+. Fixes #1365.	2022-08-28 17:01:10 +02:00
Dennis Guse	5a4919efd2	PublicAPI: support setting the icon. Fixes #1282.	2022-08-28 15:17:42 +02:00
dependabot[bot]	bb549fdc93	Bump desugar_jdk_libs from 1.2.0 to 1.2.2 Bumps [desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 1.2.0 to 1.2.2. - [Release notes](https://github.com/google/desugar_jdk_libs/releases) - [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/desugar_jdk_libs/commits) --- updated-dependencies: - dependency-name: com.android.tools:desugar_jdk_libs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-08-25 21:58:51 +02:00
Dennis Guse	73e59cbba2	UI: show timezone if different than local. Fixes #1296.	2022-08-22 18:43:53 +02:00
Dennis Guse	27727b6dcf	Merge pull request #1310 from OpenTracksApp/time Refactoring things regarding Duration, Speed, and Distance	2022-08-21 23:25:44 +02:00
Dennis Guse	06d2957407	Desugar: upgrade to AGP 7.3.0-rc01 Required for desugar 1.2.0)	2022-08-21 23:25:06 +02:00
Dennis Guse	8b08af6bcf	Upgrade to Gradlew 7.5.1	2022-08-21 22:02:49 +02:00
Dennis Guse	78dad95ef6	Altitude: show always in m/ft. Fixes #1319.	2022-08-21 22:02:49 +02:00
Dennis Guse	be9d56721e	Preferences: nicer formattings for distances.	2022-08-21 22:02:49 +02:00
Dennis Guse	e5785dd3ac	Distance now does all conversions itself.	2022-08-21 22:02:49 +02:00
Dennis Guse	11d912d14d	Speed: use Distance for conversions.	2022-08-21 22:02:49 +02:00
Dennis Guse	807ac3fc9f	Remove UnitConversions for time/durations.	2022-08-21 22:02:49 +02:00
Dennis Guse	45874d3749	Release: v4.0.7	2022-08-21 21:55:19 +02:00
Peter Storch	594f69320a	Fix dependencies to lifecycle-viewmodel	2022-08-21 19:28:07 +02:00
dependabot[bot]	d4927c9444	Bump appcompat from 1.4.2 to 1.5.0 Bumps appcompat from 1.4.2 to 1.5.0. --- updated-dependencies: - dependency-name: androidx.appcompat:appcompat dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-08-21 19:28:07 +02:00
Alexander Ivanov	00dbd056d6	Translated using Weblate (Russian) Currently translated at 99.0% (496 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/ru/	2022-08-21 18:53:26 +02:00
M K	8f19ad8f66	Translated using Weblate (Arabic) Currently translated at 53.6% (269 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/ar/	2022-08-21 18:53:26 +02:00
mondstern	2fdad54a7c	Translated using Weblate (German) Currently translated at 94.8% (475 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/de/	2022-08-21 18:53:26 +02:00
Peter Storch	5a5f040ed5	Fix #1340 mass track deletion time	2022-08-21 18:53:20 +02:00
Dennis Guse	0ada9a2463	Android13: request NOTIFICATION_POST permission. Fixes #1353. Part of #1210.	2022-08-18 08:07:37 +02:00
Dennis Guse	719bb981ec	Bugfix: Public API stop does not start service in foreground. Fixes #1354.	2022-08-17 18:43:27 +02:00
dependabot[bot]	3c95d8744d	Bump mockito-android from 4.6.1 to 4.7.0 Bumps [mockito-android](https://github.com/mockito/mockito) from 4.6.1 to 4.7.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-08-15 07:59:40 +02:00
Dennis Guse	63d1c9ee5e	GPS: set signal lost threshold to 30s.	2022-08-14 20:18:37 +02:00
Dennis Guse	1ccd2e3c0a	Release: v4.0.6	2022-08-07 19:47:54 +02:00
Dennis Guse	cdbddabc1b	Cleanup: use ContextCompat.getColor()	2022-08-04 22:11:44 +02:00
Dennis Guse	9f6ca83f27	Bug: PublicAPI needs to call startForegroundService (SDK API26+). Fixes #1301.	2022-08-04 22:11:44 +02:00
dependabot[bot]	f2ee99a477	Bump gradle from 7.2.1 to 7.2.2 Bumps gradle from 7.2.1 to 7.2.2. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-08-04 06:44:02 +02:00
Dennis Guse	7009ede095	EGM2008 offset lookup for negative longitudes was wrong.	2022-08-03 17:30:31 +02:00
Dennis Guse	2b530a1c53	Cleanup: unused imports.	2022-08-02 18:44:15 +02:00
Poussinou	33673f5921	Update FUNDING.yml	2022-07-31 14:59:56 +02:00
Dennis Guse	a7398d43e3	Release: v4.0.5	2022-07-29 17:58:32 +02:00
Dennis Guse	59b016a4a3	PlayStore: use an inverted icon (app launcher only). Part of #1329.	2022-07-29 17:56:28 +02:00
Dennis Guse	78aa5d51c6	Intervals: if gain/loss is not available show "-" instead of null. Fixes #1338.	2022-07-26 22:30:08 +02:00
Quang Trung	95f584b554	Translated using Weblate (Vietnamese) Currently translated at 100.0% (501 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/vi/	2022-07-21 15:04:36 +02:00
Dennis Guse	cf759d526d	README_TESTED_SENSORS.md: we now store sensor data without movement. Part of #1088.	2022-07-18 07:35:46 +02:00
Dennis Guse	4c44ea12a4	Release: v4.0.4	2022-07-15 21:41:46 +02:00
dependabot[bot]	9d09865907	Bump reactivecircus/android-emulator-runner from 2.24.0 to 2.25.0 Bumps [reactivecircus/android-emulator-runner](https://github.com/reactivecircus/android-emulator-runner) from 2.24.0 to 2.25.0. - [Release notes](https://github.com/reactivecircus/android-emulator-runner/releases) - [Changelog](https://github.com/ReactiveCircus/android-emulator-runner/blob/main/CHANGELOG.md) - [Commits](https://github.com/reactivecircus/android-emulator-runner/compare/v2.24.0...v2.25.0) --- updated-dependencies: - dependency-name: reactivecircus/android-emulator-runner dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-07-13 07:39:30 +02:00
Dennis Guse	5667d2d83e	Store sensor data without distance. Fixes #1088.	2022-07-11 22:56:11 +02:00
Dennis Guse	386f017fb7	VoiceAnnouncement: avoid using deprecated API.	2022-07-10 21:46:15 +02:00
Román Ginés	87594e822d	Bugfixed: adding a mark with a photo after rotating in camera resulted in a crash. Fixes #1321 .	2022-07-10 19:47:45 +02:00
Dennis Guse	ee832c7bd2	Revert upgrade ot AGP 7.3.0-beta.	2022-07-10 17:59:32 +02:00
Dennis Guse	30042d5bc3	Merge branch 'translations'	2022-07-09 19:49:28 +02:00
Hiajen	73cbb7a29c	Translated using Weblate (German) Currently translated at 75.5% (68 of 90 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/app-store-metadata-files/de/	2022-07-09 19:48:52 +02:00
Hiajen	c100fdde4f	Translated using Weblate (German) Currently translated at 94.8% (475 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/de/	2022-07-09 19:48:52 +02:00
Dennis Guse	04e1496084	Cleanup: adjusted Interval uses constructor. Fixes #1320.	2022-07-09 15:52:57 +02:00
Dennis Guse	21d1852505	Test: import+export results in same timezone. Part of #1296.	2022-07-08 00:16:48 +02:00
Dennis Guse	1502b0cfa7	Gain/loss: handle events in our TrackRecordingService.handler (avoids potential race conditions).	2022-07-07 18:27:56 +02:00
Dennis Guse	e7d6f65508	Gain/loss: use 5s as sensor interval to save some energy.	2022-07-07 18:27:56 +02:00
Dennis Guse	0e69a444a5	Add a comma.	2022-07-07 18:26:27 +02:00
Román Ginés	3b62999fde	Announcement computes intervals from last track point. Fixes #645 . Bugfixed: intervals distance wasn't computed correctly.	2022-07-06 22:54:45 +02:00
Dennis Guse	97431233ac	Fix translations.	2022-07-05 21:01:09 +02:00
Uglješa	d49675afc8	Translated using Weblate (Serbian) Currently translated at 56.6% (284 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/sr/	2022-07-03 18:29:42 +02:00
vsevjednom-cz	c1f7ab36a8	Translated using Weblate (Czech) Currently translated at 94.2% (472 of 501 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/cs/	2022-07-03 18:29:42 +02:00
FTno	eb14cc7bc6	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (500 of 500 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2022-07-03 18:29:42 +02:00
Xosé M	a47b9164af	Translated using Weblate (Galician) Currently translated at 100.0% (500 of 500 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/gl/	2022-07-03 18:29:42 +02:00
Surfoo	502e3ecb21	Translated using Weblate (French) Currently translated at 100.0% (500 of 500 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/fr/	2022-07-03 18:29:42 +02:00
metezd	71903f174a	Translated using Weblate (Turkish) Currently translated at 98.0% (490 of 500 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/tr/	2022-07-03 18:29:41 +02:00
Dennis Guse	ab6606a295	Github actions: rename APK build job.	2022-07-03 18:29:38 +02:00
Dennis Guse	c4e2023992	Public API: allow setting track properties (name, category, description) on StartRecording. Fixes #1282.	2022-07-03 17:32:21 +02:00
Dennis Guse	cb10bdda3f	Settings: show package id in Public API settings.	2022-07-03 10:28:43 +02:00
Dennis Guse	f913472aae	Settings: idle speed threshold has now a summary.	2022-07-03 10:28:31 +02:00
Dennis Guse	af4826c578	TrackStoppedActivity: update track data on resume track. Fixes #1249.	2022-07-02 08:51:31 +02:00
Dennis Guse	63172ec66f	Github Actions: downgrade triggers.	2022-07-01 20:40:38 +02:00
Dennis Guse	3d6c339509	Android13: use new Image picker. Part of #1210.	2022-07-01 20:24:20 +02:00
Dennis Guse	49f86c4eb9	Android13: upgrade target sdk to 33. Part of #1210.	2022-07-01 20:24:20 +02:00
Dennis Guse	7664bd248d	Release: v4.0.3	2022-07-01 13:27:50 +02:00
Dennis Guse	73615aa0d6	Statistics: remove speed filtering (fix tests). Part of #1003.	2022-07-01 13:24:18 +02:00
Dennis Guse	81bb6699d8	Statistics: remove speed filtering. Part of #1003.	2022-06-30 14:03:33 +02:00
dependabot[bot]	93c67e3728	Bump desugar_jdk_libs from 1.1.5 to 1.1.6 Bumps [desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 1.1.5 to 1.1.6. - [Release notes](https://github.com/google/desugar_jdk_libs/releases) - [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/desugar_jdk_libs/commits) --- updated-dependencies: - dependency-name: com.android.tools:desugar_jdk_libs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-29 08:45:59 +02:00
Dennis Guse	993816a34a	Github issue template for data not recorded. Fixes #1295.	2022-06-28 16:18:41 +02:00
Šimon Hořánek	3c0999c3a0	Translated using Weblate (Czech) Currently translated at 94.3% (471 of 499 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/cs/	2022-06-27 23:03:27 +02:00
metezd	4528e7148f	Translated using Weblate (Turkish) Currently translated at 98.1% (490 of 499 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/tr/	2022-06-27 23:03:27 +02:00
FTno	74042f5d85	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (499 of 499 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2022-06-27 23:03:27 +02:00
Dennis Guse	92f6fbe04a	Prevent crash if no dashboard is installed.	2022-06-27 23:03:23 +02:00
Dennis Guse	5fa50250de	Cleanup tests for StringUtils.parseTime(). Part of #1295.	2022-06-27 19:30:23 +02:00
Dennis Guse	8ee9daf7af	Github issue template for data not recorded. Fixes #1295.	2022-06-27 12:58:17 +02:00
Dennis Guse	a54c8c1d25	Use Set.of().	2022-06-22 20:31:41 +02:00
Dennis Guse	8137ec8de2	GPX exporter: only export trkseq if it actually contains data. Fixes #1291.	2022-06-21 19:56:19 +02:00