Release: v4.1.1

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/

.github/workflows/test.yml

@@ -23,7 +23,7 @@ jobs:
           java-version: '11'
 
       - name: run tests
-        uses: reactivecircus/android-emulator-runner@v2.25.0
+        uses: reactivecircus/android-emulator-runner@v2.26.0
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}

README.md

@@ -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)
 
@@ -111,19 +111,24 @@ The API can be invoked by sending an explicit Intent to start an activity.
 * **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"`
 
 `StartRecording` supports the following parameters:
 
-* Set track data: `TRACK_NAME`, `TRACK_CATEGORY`, and `TRACK_DESCRIPTION`
-* Send recorded data to another application via _Dashboard API_: `STATS_TARGET_PACKAGE`
-  and `STATS_TARGET_CLASS`
+* Set track data: `TRACK_NAME`, `TRACK_DESCRIPTION`, `TRACK_CATEGORY`, and `TRACK_ICON` (non-localized identifier see [/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38](/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38)). 
+  NOTE: if `TRACK_ICON` is not present, `TRACK_CATEGORY` will be used to determine the icon (localized).
+* Send recorded data to another application via _Dashboard API_: `STATS_TARGET_PACKAGE` and `STATS_TARGET_CLASS`
 
-The Public API is disabled by default to protect the user's privacy, but it can easily be enabled in
-the settings.
+The Public API is disabled by default to protect the user's privacy, but it can easily be enabled in the settings.
 
-__IMPORTANT__: triggering `StartRecording` does not check if Android permissions (location or
-Bluetooth) were granted. If they are not granted`
+## 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)
 

README_TESTED_SENSORS.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,13 +38,13 @@ However, often only one value is provided.
 
 We only support _Instantaneous Power_.
 
-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
@@ -63,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                                                                        |

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 
@@ -59,8 +59,8 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 5004
-        versionName "v4.0.7"
+        versionCode 5051
+        versionName "v4.1.1"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -81,6 +81,8 @@ android {
         }
     }
 
+    namespace 'de.dennisguse.opentracks'
+
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
@@ -118,22 +120,23 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
 
-    implementation 'androidx.appcompat:appcompat:1.5.0'
+    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.7.0'
+    androidTestImplementation 'org.mockito:mockito-android:4.8.0'
 
     androidTestUtil 'androidx.test:orchestrator:1.4.1'
 }

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

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

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

@@ -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"

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

@@ -0,0 +1,7 @@
+v4.1.1: OpenTracks
+
+Changes:
+- Add introduction screen (show once)
+
+Bugfix:
+- Do not crash if no GPS device is present

fastlane/metadata/android/vi/changelogs/4253.txt

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

fastlane/metadata/android/vi/full_description.txt

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

fastlane/metadata/android/vi/short_description.txt

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

fastlane/metadata/android/zh-CN/full_description.txt

@@ -1,11 +1,22 @@
-OpenTracks是一个完全尊重你的隐私的运动跟踪应用程序。
+一款尊重您的隐私的运动追踪应用。
+
+健康幸福的生活总少不了各种运动和户外活动。
+
+使用本应用，您可以保持对您的训练数据的有效追踪，为您的健康助力。
+本应用可以在您跑步或散步时记录数据，也可以在您骑车时作为一个大屏幕自行车电脑。
+您可以为路上的有趣位置创建标记，还可以用图片作为标记。
+您的数据会被详尽地记录下来，供您查阅分析。
+您的数据只会分享给您想要分享给的人。
 
-特点。
-* 运动追踪：追踪你的运动和户外活动
-* 照片和标记：在跟踪时标记有趣的地点
-* 海拔增减：通过气压传感器
-* 高度显示为EGM2008（平均海平面以上）；导出为WGS84
 * 语音播报
-* 支持蓝牙LE传感器：心率、速度和距离（骑车）、节奏（骑车）和功率计（骑车）。
-* 导出数据：以KMZ（包括照片）、KML或GPX形式导出轨迹
-* 没有互联网接入。不使用互联网
+* 支持蓝牙LE传感器：心率、速度和距离（骑车）、踏频（骑车）和功率计（骑车）。
+* 海拔增减：通过气压传感器。
+* EGM2008 海拔显示（平均海平面以上）；导出为 WGS84。
+* 导出路线数据，支持 KMZ（包括照片）、KML 和 GPX 格式。
+* 不需要联网，不需要额外权限。
+* 深色和浅色主题，跟随系统设置。
+* 没有广告。
+
+本应用是开源软件
+意味着您可以使用、学习、修改和分发本应用的源代码。
+本应用使用 Apache 2.0 协议发布。

fastlane/metadata/android/zh-CN/short_description.txt

@@ -1 +1 @@
-一个完全尊重你隐私的运动追踪器。
+一款尊重您的隐私的运动追踪应用。

gradle/wrapper/gradle-wrapper.properties

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

src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java

@@ -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();

src/androidTest/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackExporterTest.java

@@ -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));

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

@@ -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;
@@ -463,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"));
@@ -504,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);

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

@@ -69,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
@@ -123,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
@@ -171,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
@@ -221,8 +221,8 @@ public class GPXTrackImporterTest {
     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.debug.test.R.raw.gpx_timezone);
-        InputStream inputStreamExpected = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.gpx_timezone);
+        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();
 

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

@@ -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);

src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothUtilsTest.java

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

src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java

@@ -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();

src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java

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

src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java

@@ -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));
     }

src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java

@@ -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);

src/main/AndroidManifest.xml

@@ -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
@@ -88,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
@@ -311,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
@@ -355,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"

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

@@ -33,4 +33,10 @@ public class AboutActivity extends AbstractActivity {
         viewBinding = AboutBinding.inflate(getLayoutInflater());
         return viewBinding.getRoot();
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        viewBinding = null;
+    }
 }

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

@@ -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;
@@ -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);
 

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

@@ -6,7 +6,6 @@ import androidx.annotation.VisibleForTesting;
 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;
 
@@ -41,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();

src/main/java/de/dennisguse/opentracks/data/models/Cadence.java

@@ -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" +
                 '}';
     }
 }

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

@@ -34,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) {
@@ -117,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) {
@@ -177,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;
 }

src/main/java/de/dennisguse/opentracks/data/models/DistanceFormatter.java

@@ -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;
     }
@@ -56,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));
@@ -88,8 +91,11 @@ public class DistanceFormatter {
 
         private UnitSystem unitSystem;
 
+        private double threshold;
+
         public Builder() {
             decimalCount = 2;
+            threshold = 0.5;
         }
 
         public Builder setDecimalCount(int decimalCount) {
@@ -102,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) {

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

@@ -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));
     }

src/main/java/de/dennisguse/opentracks/data/models/UnitConversions.java

@@ -1,69 +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
-    @Deprecated
-    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() {
-    }
-}

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

@@ -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() {

src/main/java/de/dennisguse/opentracks/introduction/IntroductionActivity.java

@@ -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();
+    }
+}

src/main/java/de/dennisguse/opentracks/introduction/OSMDashboardFragment.java

@@ -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;
+    }
+}

src/main/java/de/dennisguse/opentracks/introduction/WelcomeFragment.java

@@ -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;
+    }
+}

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

@@ -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>");
     }
 }

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

@@ -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();

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

@@ -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.");
         }
     }
 

src/main/java/de/dennisguse/opentracks/publicapi/AbstractAPIActivity.java

@@ -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,7 +31,10 @@ 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)

src/main/java/de/dennisguse/opentracks/publicapi/StartRecording.java

@@ -15,6 +15,7 @@ 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";
@@ -40,8 +41,11 @@ public class StartRecording extends AbstractAPIActivity {
         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_DESCRIPTION, null),
+        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);
     }
 

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

@@ -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 {
 

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

@@ -31,7 +31,8 @@ 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;
@@ -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();
 
@@ -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();

src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingCadence.java

@@ -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;
+    }
+}

src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingDistanceSpeed.java

@@ -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;
+    }
+}

src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingPower.java

@@ -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;
+    }
+}

src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerHeartRate.java

@@ -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;
+    }
+}

src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerRunningSpeedAndCadence.java

@@ -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);
+    }
+}

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

@@ -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) {

src/main/java/de/dennisguse/opentracks/sensors/ServiceMeasurementUUID.java

@@ -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);
+    }
+}

src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCycling.java

@@ -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);
-        }
-    }
-}
-

src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingCadence.java

@@ -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;
+        }
+    }
+}

src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingCadenceAndDistanceSpeed.java

@@ -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);
+    }
+}

src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingDistanceSpeed.java

@@ -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() +
+                    '}';
+        }
+    }
+}

src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingPower.java

@@ -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 +
+                    '}';
+        }
     }
 }

src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java

@@ -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;
         }
 

src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java

@@ -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);

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

@@ -10,6 +10,7 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.location.LocationManagerCompat;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -152,6 +153,12 @@ public class GPSHandler implements LocationListener, GpsStatus.GpsStatusListener
             Log.e(TAG, "Not started.");
             return;
         }
+
+        if(!LocationManagerCompat.hasProvider(locationManager, LocationManager.GPS_PROVIDER)) {
+            Log.e(TAG, "Device doesn't have GPS.");
+            return;
+        }
+
         if (PermissionRequester.GPS.hasPermission(context)) {
             try {
                 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, gpsInterval.toMillis(), 0, this);

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

@@ -197,6 +197,14 @@ public class PreferencesUtils {
         return getBoolean(R.string.publicapi_dashboard_enabled_key, resources.getBoolean(R.bool.publicapi_dashboard_enabled_default));
     }
 
+    public static boolean shouldShowIntroduction() {
+        return getBoolean(R.string.show_introduction_screen_key, resources.getBoolean(R.bool.show_introduction_screen_default));
+    }
+
+    public static void setShowIntroduction(boolean introduction) {
+        setBoolean(R.string.show_introduction_screen_key, introduction);
+    }
+
     public static UnitSystem getUnitSystem() {
         final String STATS_UNIT_DEFAULT = resources.getString(R.string.stats_units_default);
 
@@ -323,7 +331,7 @@ public class PreferencesUtils {
         UnitSystem unitSystem = getUnitSystem();
 
         DistanceFormatter formatter = DistanceFormatter.Builder()
-                .setDecimalCount(1)
+                .setDecimalCount(0)
                 .setUnit(unitSystem)
                 .build(resources);
         for (int i = 0; i < values.length; i++) {
@@ -417,7 +425,8 @@ public class PreferencesUtils {
 
         DistanceFormatter formatter = DistanceFormatter.Builder()
                 .setUnit(unitSystem)
-                .setDecimalCount(1)
+                .setDecimalCount(0)
+                .setThreshold(Double.MAX_VALUE)
                 .build(resources);
         for (int i = 0; i < entryValues.length; i++) {
             int value = Integer.parseInt(entryValues[i]);
@@ -461,7 +470,8 @@ public class PreferencesUtils {
         UnitSystem unitSystem = getUnitSystem();
 
         DistanceFormatter formatter = DistanceFormatter.Builder()
-                .setDecimalCount(1)
+                .setDecimalCount(0)
+                .setThreshold(Double.MAX_VALUE)
                 .setUnit(unitSystem)
                 .build(resources);
         for (int i = 0; i < entryValues.length; i++) {
@@ -534,7 +544,8 @@ public class PreferencesUtils {
         UnitSystem unitSystem = getUnitSystem();
 
         DistanceFormatter formatter = DistanceFormatter.Builder()
-                .setDecimalCount(1)
+                .setDecimalCount(0)
+                .setThreshold(Double.MAX_VALUE)
                 .setUnit(unitSystem)
                 .build(resources);
 

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

@@ -9,11 +9,6 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.sensors.BluetoothUtils;
-import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference;
-import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingPowerPreference;
-import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeHeartRatePreference;
-import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeRunningSpeedAndCadencePreference;
 import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeSensorPreference;
 
 public class SensorsSettingsFragment extends PreferenceFragmentCompat {
@@ -34,18 +29,8 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
 
     @Override
     public void onDisplayPreferenceDialog(Preference preference) {
-        DialogFragment dialogFragment = null;
-        if (preference instanceof BluetoothLeHeartRatePreference) {
-            dialogFragment = BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(preference.getKey(), BluetoothUtils.HEART_RATE_SUPPORTING_DEVICES);
-        } else if (preference instanceof BluetoothLeCyclingCadenceAndSpeedPreference) {
-            dialogFragment = BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(preference.getKey(), BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID);
-        } else if (preference instanceof BluetoothLeCyclingPowerPreference) {
-            dialogFragment = BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(preference.getKey(), BluetoothUtils.CYCLING_POWER_UUID);
-        } else if (preference instanceof BluetoothLeRunningSpeedAndCadencePreference) {
-            dialogFragment = BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(preference.getKey(), BluetoothUtils.RUNNING_RUNNING_SPEED_CADENCE_UUID);
-        }
-
-        if (dialogFragment != null) {
+        if (preference instanceof BluetoothLeSensorPreference) {
+            DialogFragment dialogFragment = ((BluetoothLeSensorPreference) preference).createInstance();
             dialogFragment.setTargetFragment(this, 0);
             dialogFragment.show(getParentFragmentManager(), getClass().getSimpleName());
             return;

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

@@ -1,23 +0,0 @@
-package de.dennisguse.opentracks.settings.bluetooth;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-public class BluetoothLeCyclingCadenceAndSpeedPreference extends BluetoothLeSensorPreference {
-
-    public BluetoothLeCyclingCadenceAndSpeedPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    public BluetoothLeCyclingCadenceAndSpeedPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public BluetoothLeCyclingCadenceAndSpeedPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public BluetoothLeCyclingCadenceAndSpeedPreference(Context context) {
-        super(context);
-    }
-}

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

@@ -0,0 +1,32 @@
+package de.dennisguse.opentracks.settings.bluetooth;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.preference.PreferenceDialogFragmentCompat;
+
+import de.dennisguse.opentracks.sensors.BluetoothUtils;
+
+public class BluetoothLeCyclingCadencePreference extends BluetoothLeSensorPreference {
+
+    public BluetoothLeCyclingCadencePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public BluetoothLeCyclingCadencePreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public BluetoothLeCyclingCadencePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BluetoothLeCyclingCadencePreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public PreferenceDialogFragmentCompat createInstance() {
+        return BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.CYCLING_CADENCE);
+    }
+}

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

@@ -3,6 +3,10 @@ package de.dennisguse.opentracks.settings.bluetooth;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import androidx.preference.PreferenceDialogFragmentCompat;
+
+import de.dennisguse.opentracks.sensors.BluetoothUtils;
+
 public class BluetoothLeCyclingPowerPreference extends BluetoothLeSensorPreference {
 
     public BluetoothLeCyclingPowerPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -20,4 +24,9 @@ public class BluetoothLeCyclingPowerPreference extends BluetoothLeSensorPreferen
     public BluetoothLeCyclingPowerPreference(Context context) {
         super(context);
     }
+
+    @Override
+    public PreferenceDialogFragmentCompat createInstance() {
+        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.CYCLING_POWER);
+    }
 }

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

@@ -0,0 +1,32 @@
+package de.dennisguse.opentracks.settings.bluetooth;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.preference.PreferenceDialogFragmentCompat;
+
+import de.dennisguse.opentracks.sensors.BluetoothUtils;
+
+public class BluetoothLeCyclingSpeedPreference extends BluetoothLeSensorPreference {
+
+    public BluetoothLeCyclingSpeedPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public BluetoothLeCyclingSpeedPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public BluetoothLeCyclingSpeedPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BluetoothLeCyclingSpeedPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public PreferenceDialogFragmentCompat createInstance() {
+        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.CYCLING_SPEED_CADENCE);
+    }
+}

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

@@ -3,6 +3,10 @@ package de.dennisguse.opentracks.settings.bluetooth;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import androidx.preference.PreferenceDialogFragmentCompat;
+
+import de.dennisguse.opentracks.sensors.BluetoothUtils;
+
 public class BluetoothLeHeartRatePreference extends BluetoothLeSensorPreference {
 
     public BluetoothLeHeartRatePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -20,4 +24,9 @@ public class BluetoothLeHeartRatePreference extends BluetoothLeSensorPreference
     public BluetoothLeHeartRatePreference(Context context) {
         super(context);
     }
+
+    @Override
+    public PreferenceDialogFragmentCompat createInstance() {
+        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.HEART_RATE_SUPPORTING_DEVICES);
+    }
 }

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

@@ -3,6 +3,10 @@ package de.dennisguse.opentracks.settings.bluetooth;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import androidx.preference.PreferenceDialogFragmentCompat;
+
+import de.dennisguse.opentracks.sensors.BluetoothUtils;
+
 public class BluetoothLeRunningSpeedAndCadencePreference extends BluetoothLeSensorPreference {
 
     public BluetoothLeRunningSpeedAndCadencePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -20,4 +24,9 @@ public class BluetoothLeRunningSpeedAndCadencePreference extends BluetoothLeSens
     public BluetoothLeRunningSpeedAndCadencePreference(Context context) {
         super(context);
     }
+
+    @Override
+    public PreferenceDialogFragmentCompat createInstance() {
+        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.RUNNING_SPEED_CADENCE);
+    }
 }

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

@@ -23,11 +23,11 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.sensors.BluetoothUtils;
+import de.dennisguse.opentracks.sensors.ServiceMeasurementUUID;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.util.PermissionRequester;
 
@@ -92,6 +92,8 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
         return getValue();
     }
 
+    public abstract PreferenceDialogFragmentCompat createInstance();
+
     public static class BluetoothLeSensorPreferenceDialog extends PreferenceDialogFragmentCompat {
 
         private AnimatedVectorDrawableCompat bluetoothIcon;
@@ -123,15 +125,18 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
             }
         };
 
-        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, UUID sensorUUID) {
+        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, ServiceMeasurementUUID sensorUUID) {
             return newInstance(preferenceKey, Collections.singletonList(sensorUUID));
         }
 
-        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, List<UUID> sensorUUIDs) {
+        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, List<ServiceMeasurementUUID> sensorUUIDs) {
             final BluetoothLeSensorPreferenceDialog fragment = new BluetoothLeSensorPreferenceDialog();
             final Bundle b = new Bundle(1);
             b.putString(ARG_KEY, preferenceKey);
-            b.putParcelableArrayList(ARG_BLE_SERVICE_UUIDS, new ArrayList<>(sensorUUIDs.stream().map(ParcelUuid::new).collect(Collectors.toList())));
+            b.putParcelableArrayList(ARG_BLE_SERVICE_UUIDS, new ArrayList<>(sensorUUIDs.stream()
+                    .map(ServiceMeasurementUUID::getServiceUUID)
+                    .map(ParcelUuid::new)
+                    .collect(Collectors.toList())));
             fragment.setArguments(b);
             return fragment;
         }

src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java

@@ -30,7 +30,6 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.data.models.UnitConversions;
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
@@ -154,7 +153,7 @@ public class DescriptionGenerator {
         }
 
         // Recorded time
-        builder.append(context.getString(R.string.description_recorded_time, StringUtils.formatDateTime(OffsetDateTime.ofInstant(stats.getStartTime(), ZoneId.systemDefault()))));
+        builder.append(context.getString(R.string.description_recorded_time, StringUtils.formatDateTimeWithOffset(OffsetDateTime.ofInstant(stats.getStartTime(), ZoneId.systemDefault()))));
         builder.append(lineBreak);
 
         return builder.toString();
@@ -230,7 +229,7 @@ public class DescriptionGenerator {
     @VisibleForTesting
     void writeAltitude(double altitude_m, StringBuilder builder, int resId, String lineBreak) {
         long altitudeInM = Math.round(altitude_m);
-        long altitudeInFt = Math.round(altitude_m * UnitConversions.M_TO_FT);
+        long altitudeInFt = Math.round(Distance.of(altitude_m).toFT());
         builder.append(context.getString(resId, altitudeInM, altitudeInFt));
         builder.append(lineBreak);
     }

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

@@ -27,7 +27,6 @@ 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.TrackPoint;
-import de.dennisguse.opentracks.data.models.UnitConversions;
 
 /**
  * Updater for {@link TrackStatistics}.
@@ -196,7 +195,7 @@ public class TrackStatisticsUpdater {
         // See if the speed seems physically likely. Ignore any speeds that imply acceleration greater than 2g.
         Duration timeDifference = Duration.between(lastTrackPoint.getTime(), trackPoint.getTime());
         Speed maxSpeedDifference = Speed.of(Distance.of(SPEED_MAX_ACCELERATION), Duration.ofMillis(1000))
-                .mul(timeDifference.toMillis() / UnitConversions.S_TO_MS);
+                .mul(timeDifference.toSeconds());
 
         Speed speedDifference = Speed.absDiff(lastTrackPoint.getSpeed(), trackPoint.getSpeed());
         return speedDifference.lessThan(maxSpeedDifference);

src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java

@@ -108,7 +108,11 @@ public class ListItemUtils {
         String timeValue = null;
         if (!isRecording) {
             dateValue = StringUtils.formatDateTodayRelative(context, offsetDateTime);
-            timeValue = offsetDateTime.format(DateTimeFormatter.ofPattern("HH:mm"));
+            String pattern = "HH:mm";
+            if (!offsetDateTime.getOffset().equals(OffsetDateTime.now().getOffset())) {
+                pattern = "HH:mm x";
+            }
+            timeValue = offsetDateTime.format(DateTimeFormatter.ofPattern(pattern));
         }
         setTextView(context, dateTextView, dateValue, hasPhoto);
         setTextView(context, timeTextView, timeValue, hasPhoto);

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

@@ -61,13 +61,6 @@ public class StringUtils {
     private StringUtils() {
     }
 
-    /**
-     * Formats the date and time of the OffsetDateTime (using default Locale format)
-     */
-    public static String formatDateTime(OffsetDateTime odt) {
-        return odt.format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM));
-    }
-
     /**
      * Formats the date and time with the offset (using default Locale format).
      */
@@ -75,6 +68,13 @@ public class StringUtils {
         return odt.toZonedDateTime().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL));
     }
 
+    public static String formatDateTimeWithOffsetIfDifferent(OffsetDateTime odt) {
+        if (!odt.getOffset().equals(OffsetDateTime.now().getOffset())) {
+            return odt.toZonedDateTime().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL));
+        }
+        return odt.toZonedDateTime().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM));
+    }
+
     public static String formatLocalDateTime(LocalDateTime localDateTime) {
         return localDateTime.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL));
     }
@@ -257,7 +257,8 @@ public class StringUtils {
     //TODO altitude_m should be double or a value object
     public static Pair<String, String> getAltitudeParts(Context context, Float altitude_m, UnitSystem unitSystem) {
         DistanceFormatter formatter = DistanceFormatter.Builder()
-                .setDecimalCount(1)
+                .setDecimalCount(0)
+                .setThreshold(Double.MAX_VALUE)
                 .setUnit(unitSystem)
                 .build(context);
 

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

@@ -26,12 +26,17 @@ import de.dennisguse.opentracks.data.models.Track;
  *
  * @author Jimmy Shih
  */
+@Deprecated //TODO Refactor: all this should happen somewhere else (ContentProviderUtils?)
 public class TrackUtils {
 
     private TrackUtils() {
     }
 
     public static void updateTrack(Context context, Track track, String name, String category, String description, ContentProviderUtils contentProviderUtils) {
+        updateTrack(context, track, name, category, TrackIconUtils.getIconValue(context, category), description, contentProviderUtils);
+    }
+
+    public static void updateTrack(Context context, Track track, String name, String category, String iconValue, String description, ContentProviderUtils contentProviderUtils) {
         boolean update = false;
         if (name != null) {
             track.setName(name);
@@ -39,9 +44,13 @@ public class TrackUtils {
         }
         if (category != null) {
             track.setCategory(category);
-            track.setIcon(TrackIconUtils.getIconValue(context, category));
             update = true;
         }
+        if (iconValue != null) {
+            track.setIcon(iconValue);
+        } else if (category != null){
+            track.setIcon(TrackIconUtils.getIconValue(context, category));
+        }
         if (description != null) {
             track.setDescription(description);
             update = true;

src/main/res/drawable/ic_logo_color_splashscreen.xml

@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+
+    <group
+        android:name="rotationGroup"
+        android:pivotX="50"
+        android:pivotY="50"
+        android:scaleX="0.6"
+        android:scaleY="0.6"
+        >
+        <path android:pathData="M82.489,12.834C83.196,10.418 82.043,9.556 79.926,10.917L10.087,55.828c-2.117,1.361 -1.795,2.628 0.714,2.815L39.806,60.807c2.51,0.188 5.291,2.267 6.18,4.621l10.282,27.208c0.89,2.354 2.195,2.304 2.902,-0.111z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:endX="70.0"
+                    android:endY="30.0"
+                    android:startX="7.0"
+                    android:startY="83.0"
+                    android:type="linear">
+                    <item
+                        android:color="#FFFBB22F"
+                        android:offset="0" />
+                    <item
+                        android:color="#FFFF6D00"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
+</vector>

src/main/res/drawable/osmdashboard_ic_logo_color_24dp.xml

@@ -0,0 +1,39 @@
+<vector android:height="24dp" android:viewportHeight="108"
+    android:viewportWidth="108" android:width="24dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <path android:fillColor="#808080"
+            android:pathData="m0,-0c36,0 72,0 108,0 0,36 0,72 0,108 -36,0 -72,0 -108,0 0,-36 0,-72 0,-108z"
+            android:strokeColor="#00000000"
+            android:strokeLineJoin="round" android:strokeWidth="1.165"/>
+    </group>
+    <group>
+        <path android:fillColor="#ffffff" android:fillType="nonZero"
+            android:pathData="m95.219,-10.07c-38.179,14.319 -76.358,28.638 -114.537,42.957 0.964,2.651 1.928,5.301 2.892,7.952 38.179,-14.319 76.358,-28.638 114.537,-42.957 -0.964,-2.651 -1.928,-5.301 -2.892,-7.952z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1.86967"/>
+    </group>
+    <group>
+        <path android:fillColor="#ffffff" android:fillType="nonZero"
+            android:pathData="m32.694,14.99c-1.335,2.636 -2.671,5.272 -4.006,7.908 35.607,18.661 71.214,37.322 106.82,55.984 1.335,-2.633 2.671,-5.266 4.006,-7.899 -35.607,-18.664 -71.214,-37.328 -106.82,-55.993z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1.96044"/>
+    </group>
+    <group>
+        <path android:fillColor="#ffffff" android:fillType="nonZero"
+            android:pathData="m92.049,51.041c-22.717,26.392 -45.434,52.784 -68.151,79.176 2.113,1.883 4.227,3.766 6.34,5.65 22.72,-26.395 45.44,-52.79 68.159,-79.185 -2.116,-1.88 -4.233,-3.761 -6.349,-5.641z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1.89063"/>
+    </group>
+    <path
+        android:pathData="M87.636,20.525C88.234,18.481 87.258,17.751 85.467,18.903L26.377,56.902c-1.791,1.152 -1.519,2.224 0.604,2.382L51.522,61.114c2.124,0.159 4.477,1.918 5.229,3.91l8.7,23.021c0.753,1.992 1.857,1.949 2.455,-0.094z"
+        android:strokeColor="#f69123" android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="86.99409" android:endY="19.146372"
+                android:startX="41.27608" android:startY="80.26603" android:type="linear">
+                <item android:color="#FFFBB22F" android:offset="0"/>
+                <item android:color="#FFF58820" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>

src/main/res/drawable/splashscreen.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:opacity="opaque">
-
-    <item android:drawable="@color/splashscreen_background" />
-
-    <item
-        android:width="300dp"
-        android:height="300dp"
-        android:gravity="center"
-        tools:targetApi="m">
-        <inset
-            android:drawable="@drawable/ic_logo_color_24dp"
-            android:inset="20dp" />
-    </item>
-
-</layer-list>

src/main/res/layout/introduction.xml

@@ -0,0 +1,26 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/introduction_view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/next_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="90dp"
+        app:borderWidth="0dp"
+        app:srcCompat="@android:drawable/ic_media_play"
+        app:tint="@android:color/white"
+        tools:ignore="RedundantDescriptionCheck,ImageContrastCheck" />
+
+</RelativeLayout>

src/main/res/layout/osm_dashboard.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_marginTop="75dp"
+        android:layout_marginBottom="10dp"
+        android:src="@drawable/osmdashboard_ic_logo_color_24dp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/introduction_osm_dashboard"
+        android:textSize="30sp"
+        android:layout_gravity="center"
+        android:gravity="center_horizontal"/>
+
+</LinearLayout>

src/main/res/layout/welcome.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_marginTop="75dp"
+        android:layout_marginBottom="10dp"
+        android:src="@drawable/ic_logo_color_24dp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/about_description"
+        android:textSize="30sp"
+        android:layout_gravity="center"
+        android:gravity="center_horizontal"/>
+
+</LinearLayout>

src/main/res/values-fr/strings.xml

@@ -605,4 +605,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
         <item quantity="one">%1$.2f mile nautique</item>
         <item quantity="other">%1$.2f milles nautique</item>
     </plurals>
+    <string name="settings_public_api_package_title">Nom du paquet pour l\'API Publique</string>
+    <string name="track_delete_number_of_tracks">%1$d parcours</string>
 </resources>

src/main/res/values-gl/strings.xml

@@ -45,11 +45,8 @@ limitations under the License.
     <string name="help_recording_content">
 OpenTracks usa o sensor GPS do dispositivo para gravar a localización de xeito contínuo.
 Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, elevación), OpenTracks  non pode facer nada ao respecto.</string>
-    <string name="help_data_storage_title">¿De que xeito garda OpenTracks os datos dos sensores?</string>
-    <string name="help_data_storage_content">
-Os datos dos sensores gárdanse asociados a localización.
-Respecto do ritmo cardíaco, significa que só se garda <i>unha medida</i> asociada a unha localización.
-Se te detés ou estás en interiores, non se gardarán datos do sensor (mais serán mostrados). </string>
+    <string name="help_data_storage_title">De que xeito garda OpenTracks os datos dos sensores\?</string>
+    <string name="help_data_storage_content"> Os datos dos sensores gárdanse asociados á localización. Respecto do ritmo cardíaco, significa que só se garda <i>unha medida</i> asociada a unha localización. Se te detés ou estás en interiores, non se gardarán datos do sensor (mais serán mostrados). </string>
     <string name="help_gps_troubleshooting_title">¿OpenTracks non grava as localizacións?</string>
     <string name="help_gps_troubleshooting_content"> Podes intentar:
 \n a) mira que o GPS esté activado,
@@ -248,35 +245,35 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="settings_chart_by_distance">Por distancia</string>
     <string name="settings_chart_by_time">Por duración</string>
     <!-- Settings Recording -->
-    <string name="settings_recording_show_on_lockscreen_while_recording_title">Mostrar estatísticas na pantalla de bloqueo</string>
+    <string name="settings_recording_show_on_lockscreen_while_recording_title">Estatísticas na pantalla de bloqueo</string>
     <string name="settings_recording_show_on_lockscreen_while_recording_summary">Ao gravar, mostra estatísticas sen desbloquear o dispositivo.</string>
     <string name="settings_recording_keep_screen_on_while_recording_title">Manter pantalla acesa</string>
-    <string name="settings_recording_keep_screen_on_while_recording_summary">Ao gravar, manten a pantalla acesa.</string>
+    <string name="settings_recording_keep_screen_on_while_recording_summary">Ao gravar, mantén a pantalla acesa.</string>
     <string name="settings_recording_fullscreen_on_while_recording_title">Pantalla completa</string>
     <string name="settings_recording_fullscreen_on_while_recording_summary">Mentras grava, mostrar a pantalla completa.</string>
     <string name="settings_recording_default_activity_title">Tipo de actividade predeterminada</string>
-    <string name="settings_recording_location_frequency_summary">%1$s entre as situacións gravadas</string>
-    <string name="settings_recording_max_recording_distance_summary">Créase un novo segmento se a distancia entre as situacións é superior a %1$s</string>
+    <string name="settings_recording_location_frequency_summary">%1$s entre as posicións gravadas</string>
+    <string name="settings_recording_max_recording_distance_summary">Créase un novo segmento se a distancia entre as posicións é superior a %1$s</string>
     <string name="settings_recording_max_recording_distance_title">Distancia máxima</string>
-    <string name="settings_recording_min_recording_distance_title">Distancia entre situacións</string>
-    <string name="settings_recording_min_recording_interval_title">Tempo entre situacións</string>
+    <string name="settings_recording_min_recording_distance_title">Intervalo da distancia para gravar</string>
+    <string name="settings_recording_min_recording_interval_title">Tempo entre posicións</string>
     <string name="settings_recording_min_required_accuracy_summary">Descoñécese se a precisión é inferior a %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión do GPS</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
     <string name="settings_recording_track_name_number_option">Número</string>
-    <string name="settings_recording_track_name_title">Nome da ruta por omisión</string>
+    <string name="settings_recording_track_name_title">Nome por defecto para a ruta</string>
     <!-- Settings Reset -->
-    <string name="settings_reset_confirm_message">Toda a configuración volverá aos valores predeterminados.</string>
+    <string name="settings_reset_confirm_message">Toda a configuración volverá aos valores predeterminados. Esto non elimina as rutas no dispotivo.</string>
     <string name="settings_reset_confirm_title">Restablecer agora?</string>
-    <string name="settings_reset_done">Restablecéronse todos os valores predeterminados da configuración</string>
+    <string name="settings_reset_done">Restableceuse a configuración aos valores por defecto</string>
     <!-- Settings Sensor -->
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_wheel_circumference">Circunferencia da roda (mm)</string>
     <!-- Settings Stats -->
     <string name="settings_stats_rate_title">Indicador preferido</string>
     <string name="settings_stats_units_imperial">Imperiais (millas, pés)</string>
-    <string name="settings_stats_units_metric">Métricas (km, m)</string>
+    <string name="settings_stats_units_metric">Unidades (km, m)</string>
     <string name="settings_stats_units_title">Unidades preferidas</string>
     <!-- Share Track -->
     <string name="share_track_share_file_body">Creo que che pode interesar esta ruta.
@@ -504,7 +501,7 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="settings_announcements_distance_frequency">Intervalo de distancia</string>
     <string name="permission_bluetooth_failed">OpenTracks require permiso para usar o Bluetooth.</string>
     <string name="permission_bluetooth_failed_rejected">Tes que permitirlle a OpenTracks nos axustes do sistema que acceda a Dispositivos Próximos.</string>
-    <string name="settings_recording_idle_speed_title">Ocioso límite de velocidade</string>
+    <string name="settings_recording_idle_speed_title">Limiar detección movemento</string>
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
     <string name="value_float_mile_hour">%1$.1f km/h</string>
     <string name="value_float_mile_hour_recommended">%1$.1f km/h (recomendado)</string>
@@ -515,17 +512,17 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="settings_announcements_summary">A Distancia, Tempo, Voz Velocidade</string>
     <string name="settings_open_tracks_summary">Todo Sobre OpenTracks Proxecto</string>
     <string name="settings_defaults_title">Por defecto Unidades e Actividade</string>
-    <string name="settings_ui_title">Interface De Usuario</string>
+    <string name="settings_ui_title">Interface da app</string>
     <string name="settings_ui_summary">Aparencia, Gravación, Deseño, Tema</string>
     <string name="settings_gps_title">GPS</string>
     <string name="settings_gps_summary">Intervalo de tempo, Distancia intervalo, Max Distancia, Precisión</string>
-    <string name="settings_sensors_title">Bluetooth Sensores</string>
-    <string name="settings_sensors_summary">Ciclismo Sensores, Roda Circunferencia, Execución De Sensores</string>
-    <string name="settings_announcements_title">Voz Anuncios</string>
+    <string name="settings_sensors_title">Sensores Bluetooth</string>
+    <string name="settings_sensors_summary">Sensores de ciclismo, Circunferencia da roda, Sensores de carreira</string>
+    <string name="settings_announcements_title">Indicacións por Voz</string>
     <string name="settings_import_export_title">Importación/Exportación</string>
     <string name="settings_import_export_summary">Importación, Exportación, Auto Exportación</string>
     <string name="settings_units_category">Unidades</string>
-    <string name="settings_activity_defaults_category">Actividade de Inadimplência</string>
+    <string name="settings_activity_defaults_category">Valores por defecto</string>
     <string name="settings_reset_summary">Axustar a Configuración de Valores por Defecto</string>
     <string name="menu_select_layout">Elixe disposición</string>
     <string name="custom_layout_list_title">Disposicións</string>
@@ -565,7 +562,7 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="voice_per_kilometer">por quilómetro</string>
     <string name="voice_per_mile">por milla</string>
     <string name="pace">Ritmo</string>
-    <string name="speed">Velocidade</string>
+    <string name="speed">Vel. media en movemento</string>
     <plurals name="voiceDistanceKilometers">
         <item quantity="one">1 quilómetro</item>
         <item quantity="other">%1$.2f quilómetros</item>
@@ -600,15 +597,18 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
         <item quantity="one">1 milla náutica</item>
         <item quantity="other">%1$.2f millas náuticas</item>
     </plurals>
-    <string name="show_on_dashboard">Taboleiro da API OpenTracks</string>
+    <string name="show_on_dashboard">Usar API OpenTracks</string>
     <plurals name="voiceSpeedMKnots">
         <item quantity="one">1 nó</item>
         <item quantity="other">%1$.1f nós</item>
     </plurals>
-    <string name="show_on_dashboard_not_installed">Non hai ningunha aplicación instalada con soporte para a API do taboleiro OpenTracks.</string>
+    <string name="show_on_dashboard_not_installed">Non hai ningunha aplicación instalada con soporte para a API de OpenTracks.</string>
     <string name="select_show_on_map_behavior">Elixe \"ver no mapa\"</string>
     <string name="show_on_map_format_ask">Preguntar</string>
     <string name="always">Sempre</string>
     <string name="error_crash_title">%1$s fallou</string>
     <string name="report_bug">Informar do problema</string>
+    <string name="settings_public_api_package_title">Nome do paquete para Public API</string>
+    <string name="track_delete_number_of_tracks">%1$d rutas</string>
+    <string name="introduction_osm_dashboard">OpenTracks non proporciona un mapa. Instala OSMDashboard para ver as gravacións nun mapa.</string>
 </resources>

src/main/res/values-nb/strings.xml

@@ -178,7 +178,7 @@ limitations under the License.
     <string name="settings_chart_by_distance">Etter distanse</string>
     <string name="settings_chart_by_time">Etter tid</string>
     <string name="settings_recording_default_activity_title">Standard aktivitetstype</string>
-    <string name="settings_recording_location_frequency_summary">%1$s mellom innspilte posisjoner</string>
+    <string name="settings_recording_location_frequency_summary">%1$s mellom registrerte posisjoner</string>
     <string name="settings_recording_max_recording_distance_summary">Det blir opprettet et nytt segment hvis avstanden mellom to posisjoner er større enn %1$s</string>
     <string name="settings_recording_max_recording_distance_title">Maks avstand</string>
     <string name="settings_recording_min_recording_distance_title">Avstandsintervall for opptak</string>
@@ -599,4 +599,6 @@ limitations under the License.
         <item quantity="other">%1$.2f nautiske mil</item>
     </plurals>
     <string name="show_on_dashboard_not_installed">Ingen app som støtter OpenTracks Dashboard API er installert.</string>
+    <string name="track_delete_number_of_tracks">%1$d spor</string>
+    <string name="settings_public_api_package_title">Pakkenavn for Offentlig API</string>
 </resources>

src/main/res/values-tr/strings.xml

@@ -589,5 +589,7 @@ limitations under the License.
         <item quantity="one">1 deniz mili</item>
         <item quantity="other">%1$.2f deniz mili</item>
     </plurals>
-    <string name="image_discard"></string>
+    <string name="image_discard"/>
+    <string name="settings_public_api_package_title">Genel API için paket adı</string>
+    <string name="show_on_dashboard_not_installed">OpenTracks Gösterge Paneli API\'sini destekleyen hiçbir uygulama yüklü değil.</string>
 </resources>

src/main/res/values-vi/strings.xml

@@ -546,7 +546,7 @@ limitations under the License.
     <string name="lap_time">Thời gian lòng</string>
     <string name="pace">Tốc độ</string>
     <string name="lap_speed">Vòng tốc độ</string>
-    <string name="speed">Tốc độ</string>
+    <string name="speed">Tốc độ di chuyển trung bình</string>
     <plurals name="voiceDistanceKilometers">
         <item quantity="other">%1$.2f Tầng km</item>
     </plurals>
@@ -590,4 +590,5 @@ limitations under the License.
     <string name="show_on_map_format_ask">Hỏi</string>
     <string name="show_on_dashboard">API OpenTracks Dashboard</string>
     <string name="always">Luôn luôn</string>
+    <string name="track_delete_number_of_tracks">%1$d tracks</string>
 </resources>

src/main/res/values-zh/strings.xml

@@ -83,20 +83,20 @@ limitations under the License.
     <string name="activity_type_wind_surfing">帆板运动</string>
     <!-- Description -->
     <string name="description_activity_type">活动类型：%1$s</string>
-    <string name="description_average_moving_pace_in_minute">平均移动步速：%1$s分钟/公里（%2$s分钟/英里）</string>
+    <string name="description_average_moving_pace_in_minute">平均移动配速：%1$s分钟/公里（%2$s分钟/英里）</string>
     <string name="description_average_moving_speed">平均移动速度：%1$.2f 公里/小时（%2$.1f 英里/小时）</string>
-    <string name="description_average_pace_in_minute">平均步速：%1$s分钟/公里（%2$s分钟/英里）</string>
+    <string name="description_average_pace_in_minute">平均配速：%1$s分钟/公里（%2$s分钟/英里）</string>
     <string name="description_average_speed">平均时速：%1$.2f 公里/小时（%2$.1f 英里/小时）</string>
     <string name="description_altitude_gain">海拔升高：%1$d 米（%2$d 英尺）</string>
     <string name="description_altitude_imperial">海拔（英尺）</string>
     <string name="description_altitude_metric">海拔（米）</string>
-    <string name="description_fastest_pace_in_minute">最快步速：%1$s分钟/公里（%2$s分钟/英里）</string>
+    <string name="description_fastest_pace_in_minute">最快配速：%1$s分钟/公里（%2$s分钟/英里）</string>
     <string name="description_max_altitude">最高海拔：%1$d 米（%2$d 英尺）</string>
     <string name="description_max_speed">最高限速：%1$.2f 公里/小时（%2$.1f 英里/小时）</string>
     <string name="description_min_altitude">最低海拔：%1$d 米（%2$d 英尺）</string>
     <string name="description_moving_time">移动时间：%1$s</string>
-    <string name="description_pace_imperial">步速（分钟/英里）</string>
-    <string name="description_pace_metric">步速（分钟/公里）</string>
+    <string name="description_pace_imperial">配速（分钟/英里）</string>
+    <string name="description_pace_metric">配速（分钟/公里）</string>
     <string name="description_recorded_time">记录时间：%1$s</string>
     <string name="description_speed_ms">速度（米/秒）</string>
     <string name="description_sensor_cadence">蹬踏频率（转数/分钟）</string>
@@ -176,7 +176,7 @@ limitations under the License.
     <string name="sensor_state_power">功率</string>
     <!-- Settings Advanced -->
     <string name="settings_advanced">高级</string>
-    <string name="settings_default_trackfileformat">导出文件格式</string>
+    <string name="settings_default_trackfileformat">导出/分享文件格式</string>
     <!-- Settings Chart -->
     <string name="settings_chart_by_distance">按距离</string>
     <string name="settings_chart_by_time">按时间</string>
@@ -204,8 +204,8 @@ limitations under the License.
     <string name="settings_night_mode_option_day">白天模式</string>
     <string name="settings_night_mode_option_night">夜间模式</string>
     <!-- Settings Reset -->
-    <string name="settings_reset_confirm_message">所有设置都将恢复为默认值。</string>
-    <string name="settings_reset_confirm_title">立即重置？</string>
+    <string name="settings_reset_confirm_message">所有设置都将恢复为默认值。此操作不会删除设备上的路线。</string>
+    <string name="settings_reset_confirm_title">是否立即重置？</string>
     <string name="settings_reset_done">所有设置都已恢复为默认值</string>
     <!-- Settings Sensor -->
     <string name="settings_sensor_bluetooth">蓝牙</string>
@@ -215,32 +215,32 @@ limitations under the License.
     <string name="settings_stats_units_imperial">英制（英里、英尺）</string>
     <string name="settings_stats_units_metric">公制（公里、米）</string>
     <string name="settings_stats_units_title">首选单位</string>
-    <string name="settings_prevent_reimport_tracks_title">禁止导出重复数据</string>
+    <string name="settings_prevent_reimport_tracks_title">防止重复导入路线</string>
     <!-- Share Track -->
     <string name="share_track_share_file_body">我想您可能会对此路线感兴趣。
 \n
 \n%1$s</string>
-    <string name="share_track_subject">我要与您分享路线</string>
+    <string name="share_track_subject">我想给您分享一条路线</string>
     <!-- Stats -->
-    <string name="stats_average_moving_pace">平均移动步速</string>
+    <string name="stats_average_moving_pace">平均移动配速</string>
     <string name="stats_average_moving_speed">平均移动速度</string>
-    <string name="stats_average_pace">平均步速</string>
+    <string name="stats_average_pace">平均配速</string>
     <string name="stats_average_speed">平均速度</string>
     <string name="stats_altitude">海拔</string>
-    <string name="stats_fastest_pace">最快步速</string>
-    <string name="stats_gain">爬高</string>
+    <string name="stats_fastest_pace">最快配速</string>
+    <string name="stats_gain">爬升</string>
     <string name="stats_latitude">纬度</string>
     <string name="stats_longitude">经度</string>
     <string name="stats_max_speed">最高速度</string>
     <string name="stats_moving_time">移动时间</string>
-    <string name="stats_pace">步速</string>
+    <string name="stats_pace">配速</string>
     <string name="stats_speed">速度</string>
     <string name="stats_distance">距离</string>
     <string name="stats_total_time">总时间</string>
     <string name="stats_split_interval">分段间隔</string>
     <!-- Track -->
     <string name="track_name_format">路线 %1$d</string>
-    <string name="track_markers">%1$s标记</string>
+    <string name="track_markers">%1$s 标记</string>
     <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">系统将从设备中永久删除路线及其标记。</string>
     <string name="track_delete_one_confirm_title">删除路线？</string>
@@ -370,4 +370,227 @@ limitations under the License.
     <string name="help_recording_title">OpenTracks 如何记录数据？</string>
     <string name="gps_fixed_and_ready">GPS 已就绪</string>
     <string name="gps_disabled_msg">GPS 被禁用</string>
+    <string name="speed">平均移动速度</string>
+    <string name="about_description"><i>OpenTracks</i> 是一款完全尊重您的个人隐私的运动追踪软件。</string>
+    <string name="help_feature_content">* 创建 GPS 路线
+\n* 使用心率传感器（仅支持低功率蓝牙）
+\n* 语音播报（时间或距离）
+\n* 创建标记（可包含图片）
+\n* 完全不需要联网
+\n* 在地图上显示路线（见下方）</string>
+    <string name="help_gps_troubleshooting_content"> 下面是你可以做的事情： 
+\n 一、检查 GPS 是否已经开启， 
+\n 二、改善 GPS 信号（比如走到室外）， 
+\n 三、用譬如 <a href="https://f-droid.org/en/packages/com.android.gpstest.osmdroid/">GPSTest</a> 之类的工具检查 GPS 是否正常，并且
+\n 四、关闭节能模式。 
+\n 
+\n 如果以上措施都不起作用，请给我们提交 BUG 报告。 </string>
+    <string name="help_storage_pictures_title">OpenTracks 是如何存储被用作标记的照片的？</string>
+    <string name="help_track_export_content"> 您可以在设置界面导出路线，支持的格式有 KMZ、KML 和 GPX。KMZ 和 KML 格式包含全部数据；GPX 仅包含位置数据。用<i>分享图标</i>分享出去的路线即为 KMZ 格式。 </string>
+    <string name="help_support_content"> 你可以： 
+\n 一、向别人介绍 OpenTracks， 
+\n 二、<a href="https://github.com/OpenTracksApp/OpenTracks/issues">提交新功能建议</a>， 
+\n 三、<a href="https://github.com/OpenTracksApp/OpenTracks/issues">报告 BUG</a>， 
+\n 四、帮助开发本应用， 
+\n 五、在 <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">Google Play 商店</a>购买本应用， 
+\n 六、赞助，或者 
+\n 七、做任何你认为可以帮助到 OpenTracks 的事情。 </string>
+    <string name="activity_type_swimming">游泳</string>
+    <string name="export_with_photos">带照片</string>
+    <string name="export_progress_summary_skip_msg">路线已跳过</string>
+    <string name="generic_overwrite">覆盖</string>
+    <string name="import_progress_summary_ok_msg">文件已导入</string>
+    <string name="delete_service">删除服务</string>
+    <string name="settings_open_tracks_summary">关于 OpenTracks 项目的一切</string>
+    <string name="value_float_kilometer_hour_recommended">%1$.1f 公里/小时（推荐）</string>
+    <string name="permission_bluetooth_failed">OpenTracks 需要使用蓝牙的权限。</string>
+    <string name="generic_choose_an_option">选择一项</string>
+    <string name="settings_gps_summary">时间间隔，距离间隔，最大距离，精度</string>
+    <string name="select_show_on_map_behavior">选择“在地图上显示”按钮的行为</string>
+    <string name="permission_bluetooth_failed_rejected">您需要在系统设置中手动授予 OpenTracks 访问附近设备的权限。</string>
+    <string name="settings_recording_customize_layout_title">自定义记录中布局</string>
+    <string name="settings_announcements_lap_heart_rate">单圈心率</string>
+    <string name="custom_layout_list_layout_removed">布局已删除</string>
+    <string name="stats_custom_layout_default_layout">默认布局</string>
+    <string name="settings_layout_reset_confirm_message">所有布局设置都会被恢复至默认值。此操作不会删除设备上的路线。</string>
+    <string name="settings_public_api_enabled_summary_on">其他应用可以开始或停止记录。</string>
+    <string name="settings_public_api_dashboard_enabled_summary_on">开始记录的应用可以访问记录下的数据。</string>
+    <string name="help_track_map_content"> 点击地图图标。 
+\n 方法一（在线地图）：安装 <a href="https://github.com/OpenTracksApp/OSMDashboard">OSMDashboard</a>。该应用提供基于 <a href="https://www.openstreetmap.org">OpenStreetMap</a> 的在线或离线地图。 
+\n 事实上，OSMDashboard 是一款独立的应用，它仅能（临时）访问将要被展示的数据。
+\n 方法二：通过一个正常的地图应用（例如 <a href="http://osmand.net/">OsmAnd</a> 和 <a href="https://maps.me/">MAPS.ME</a>）。这些应用需要支持 KMZ 文件格式（只包含位置和时间戳）。事实上，应用需要支持 <i>application/vnd.google-earth.kmz</i> MIME 类型的 <i>ACTION_VIEW</i> 操作。 </string>
+    <string name="export_progress_summary_errors_msg">错误</string>
+    <string name="permission_gps_failed">OpenTracks 需要使用 GPS 的权限。</string>
+    <string name="settings_recording_idle_speed_title">静止速度阈值</string>
+    <string name="custom_layout_list_title">布局</string>
+    <string name="image_discard">丢弃</string>
+    <string name="import_thread_interrupted">线程被中断</string>
+    <string name="import_unsupported_format">不支持的文件格式</string>
+    <string name="import_parser_error">解析器错误：%1$s</string>
+    <string name="import_unable_to_import_file">无法导入文件：%1$s</string>
+    <string name="menu_select_layout">选择布局</string>
+    <string name="voice_per_kilometer">每公里</string>
+    <string name="track_delete_number_of_tracks">%1$d 条路线</string>
+    <string name="stats_clock">时钟</string>
+    <string name="export_error_post_workout">健身后导出失败，请检查导出文件夹。</string>
+    <string name="export_track_already_exists_msg">路线 %1$s 已经存在于目标文件夹。</string>
+    <string name="pace">配速</string>
+    <string name="generic_show_errors">显示错误</string>
+    <string name="settings_export_filename_title">文件名格式</string>
+    <string name="generic_filter">过滤器</string>
+    <string name="generic_from">从</string>
+    <string name="generic_to">到</string>
+    <string name="menu_insert_gallery_img">插入相册中的图片</string>
+    <string name="settings_announcements_summary">时间，距离，语音速度</string>
+    <string name="settings_import_export_summary">导入，导出，自动导出</string>
+    <string name="settings_running_sensor">跑步</string>
+    <string name="settings_sensor_cycling_distance_speed">距离和速度</string>
+    <string name="settings_sensor_cycling_cadence">踏频</string>
+    <string name="settings_sensor_running_speed_and_cadence">距离、速度和踏频</string>
+    <string name="settings_import_section">导入</string>
+    <string name="stats_sensors_heart_rate">心率</string>
+    <string name="track_discarding">丢弃路线</string>
+    <string name="unit_nautical_mile">海里</string>
+    <string name="location_latitude_longitude">%1$s, %2$s</string>
+    <string name="voice_per_mile">每英里</string>
+    <string name="no_compatible_file_manager_installed">没有安装兼容的文件管理器</string>
+    <string name="track_detail_intervals_tab">分段</string>
+    <string name="settings_generic_sensor">通用</string>
+    <string name="settings_cycling_sensor">骑自行车</string>
+    <string name="settings_public_api_package_title">公共 API 包名</string>
+    <string name="stats_sensors_cadence">步频</string>
+    <string name="stats_sensors_power">功率</string>
+    <string name="track_recording_notification_accuracy">位置精度：%1$s</string>
+    <string name="unit_knots">节</string>
+    <string name="unit_minute_per_nautical_mile">分钟/海里</string>
+    <string name="location_coordinate">%1$s°</string>
+    <string name="value_float_kilometer_hour">%1$.1f 公里/小时</string>
+    <string name="value_integer_knots">%1$d 节</string>
+    <string name="value_float_mile_hour">%1$.1f 英里/小时</string>
+    <string name="value_float_knots">%1$.1f 节</string>
+    <string name="value_float_knots_recommended">%1$.1f 节（推荐）</string>
+    <string name="total_distance">总距离</string>
+    <string name="current_heart_rate">当前心率</string>
+    <string name="sensor_state_cadence_max">最大步频</string>
+    <string name="sensor_state_heart_rate_avg">平均心率</string>
+    <string name="sensor_state_heart_rate_max">最大心率</string>
+    <string name="sensor_state_power_avg">平均功率</string>
+    <string name="bluetooth_disabled">请开启蓝牙。</string>
+    <string name="settings_defaults_summary">偏好的单位，默认活动类型，路线默认名称</string>
+    <string name="settings_ui_title">用户界面</string>
+    <string name="settings_ui_summary">外观，记录中布局，主题</string>
+    <string name="settings_gps_title">GPS</string>
+    <string name="settings_import_export_title">导入/导出</string>
+    <string name="settings_activity_defaults_category">活动默认</string>
+    <string name="settings_announcements_totaltime_frequency">时间间隔</string>
+    <string name="settings_announcements_distance_frequency">距离间隔</string>
+    <string name="custom_layout_list_edit_already_exists">布局名已存在</string>
+    <string name="settings_public_api_enabled_title">公共 API</string>
+    <string name="track_distance_notification">距离：%1$s</string>
+    <string name="value_float_mile_hour_recommended">%1$.1f 英里/小时（推荐）</string>
+    <string name="lap_time">单圈用时</string>
+    <plurals name="voiceDistanceKilometers">
+        <item quantity="other">%1$.2f 公里</item>
+    </plurals>
+    <plurals name="voiceDistanceMiles">
+        <item quantity="other">%1$.2f 英里</item>
+    </plurals>
+    <string name="average_heart_rate">平均心率</string>
+    <string name="export_without_photos">不带照片</string>
+    <string name="settings_sensor_bluetooth_service_filter_enabled">只显示蓝牙广播中包含所需服务的设备</string>
+    <plurals name="voiceSpeedMKnots">
+        <item quantity="other">%1$.1f 节</item>
+    </plurals>
+    <string name="voice_per_nautical_mile">每海里</string>
+    <plurals name="voiceDistanceNauticalMiles">
+        <item quantity="other">%1$.2f 海里</item>
+    </plurals>
+    <string name="share_image_subject">我想跟你分享一张图片</string>
+    <string name="share_image_body">我觉得你可能对这张图片感兴趣。</string>
+    <string name="field_set_primary">设为主要</string>
+    <string name="field_remove_from_layout">移除</string>
+    <string name="help_gps_troubleshooting_title">为什么 OpenTracks 没有记录下我的位置？</string>
+    <string name="help_support_title">我能通过什么途径支持 OpenTracks 呢？</string>
+    <string name="generic_skip">跳过</string>
+    <string name="generic_separator_done_total">/</string>
+    <plurals name="generic_completed_with_errors">
+        <item quantity="other">已完成但有 %1$d 个错误</item>
+    </plurals>
+    <string name="generic_completed">已完成</string>
+    <string name="generic_click_twice_cancel">再按一次返回取消</string>
+    <string name="settings_api_title">公共 API</string>
+    <string name="aggregated_stats_empty_message">记录您的第一条路线后即可看到汇总统计数据</string>
+    <string name="aggregated_stats_filter_no_results">当前过滤条件下没有活动</string>
+    <string name="interval_list_empty_message">目前暂时没有分段</string>
+    <string name="lap_speed">单圈速度</string>
+    <string name="about_third_party_data">第三方数据</string>
+    <string name="help_track_map_title">如何在地图上显示路线？</string>
+    <string name="help_track_export_title">如何导出或分享我记录的路线？</string>
+    <string name="export_all_do_it_for_all">用同样方式处理全部冲突</string>
+    <string name="export_progress_summary_overwrite_msg">路线已覆盖</string>
+    <string name="show_on_dashboard_not_installed">没有安装支持 OpenTracks 仪表盘 API 的应用。</string>
+    <string name="help_storage_pictures_content">这些照片被保存在设备内部存储中（也就是说只能在 OpenTracks 内访问）。</string>
+    <string name="help_data_storage_content"> 应用每记录一次位置便同时记录一次传感器数据。以心率传感器为例，这意味着每一个位置仅仅对应<i>一个</i>心率读数。如果你站着不动或者处于室内，心率数据就不会被记录（但会被显示）。 </string>
+    <string name="description_speed_nautical">速度（节）</string>
+    <string name="description_speed_source_gps">GPS</string>
+    <string name="export_cannot_write_to_dir">无法写入导出文件夹。</string>
+    <string name="export_dir_not_writable">" （不可写！）"</string>
+    <string name="export_track_errors">路线没有被导出</string>
+    <string name="export_progress_summary_new_msg">新路线已导出</string>
+    <string name="generic_undo">撤销</string>
+    <string name="generic_dismiss">关闭</string>
+    <string name="settings_defaults_title">默认的单位和活动类型</string>
+    <string name="settings_sensors_title">蓝牙传感器</string>
+    <string name="settings_sensors_summary">自行车传感器，车轮周长，跑步传感器</string>
+    <string name="settings_announcements_title">语音播报</string>
+    <string name="settings_reset_summary">将设置重置为默认值</string>
+    <string name="settings_layout_reset">重置自定义布局</string>
+    <string name="description_pace_nautical">配速（分钟/海里）</string>
+    <string name="field_set_secondary">设为次要</string>
+    <string name="gps_recording_status">%1$s：%2$s</string>
+    <string name="generic_open_track">打开路线</string>
+    <string name="menu_add_custom_layout">创建新布局</string>
+    <string name="menu_filter">过滤器</string>
+    <string name="custom_layout_list_edit_name">输入布局名以添加</string>
+    <string name="custom_layout_select_layout">选择布局</string>
+    <string name="settings_layout_reset_confirm_title">是否重置布局？</string>
+    <string name="settings_announcements_average_speed_pace">平均速度/配速</string>
+    <string name="settings_stats_units_nautical">海事（海里、英尺）</string>
+    <string name="settings_public_api_enabled_summary_off">只有 OpenTracks 才能开始或停止记录。</string>
+    <string name="settings_public_api_disabled_toast">OpenTracks 公共 API 已停用：可以在设置中启用。</string>
+    <string name="settings_public_api_dashboard_enabled_title">自动数据传输</string>
+    <string name="settings_public_api_dashboard_enabled_summary_off">记录下的数据不会被自动分享给其他应用。</string>
+    <string name="settings_export_section">导出</string>
+    <string name="stats_loss">降低</string>
+    <string name="stats_coordinates">纬度/经度</string>
+    <string name="track_pace_notification">配速：%1$s</string>
+    <string name="settings_announcements_lap_speed_pace">单圈速度/配速</string>
+    <string name="activity_type_swimming_open">开放水域游泳</string>
+    <string name="activity_type_workout">健身</string>
+    <string name="generic_today">今天</string>
+    <string name="generic_yesterday">昨天</string>
+    <string name="import_no_kml_file_found">在 KMZ 中没有找到 doc.kml 文件</string>
+    <string name="import_error_info">%1$s：%2$s</string>
+    <string name="import_error_list_dialog_title">文件未导入</string>
+    <string name="import_file_imported">文件 %1$s 已导入</string>
+    <string name="import_prevent_reimport">您设置了防止重复导入路线</string>
+    <string name="import_progress_summary_exists_msg">已存在</string>
+    <string name="import_progress_summary_errors_msg">错误</string>
+    <string name="marker_add_photo_canceled">已取消，照片标记没有被添加</string>
+    <string name="sensor_state_cadence_avg">平均步频</string>
+    <string name="sensor_could_not_scan">无法扫描蓝牙设备（错误：%1$i）。</string>
+    <string name="settings_open_tracks_title">Open Tracks</string>
+    <string name="settings_units_category">单位</string>
+    <string name="settings_recording_customize_layout_select_columns">每行数据字段数</string>
+    <string name="settings_announcements_average_heart_rate">平均心率</string>
+    <string name="settings_layout_reset_done">所有布局设置已恢复至默认值</string>
+    <string name="settings_all_reset">重置</string>
+    <string name="track_delete_not_recording">该路线无法被删除，因为它还在记录中。</string>
+    <string name="error_crash_title">%1$s 已崩溃</string>
+    <string name="share_crash_report">分享崩溃报告</string>
+    <string name="report_bug">报告 BUG</string>
+    <string name="show_on_map_format_ask">询问</string>
+    <string name="show_on_dashboard">OpenTracks 仪表盘 API</string>
+    <string name="always">总是</string>
+    <string name="track_speed_notification">速度：%1$s</string>
 </resources>

src/main/res/values/settings.xml

@@ -322,6 +322,9 @@
     <string name="publicapi_dashboard_enabled_key" translatable="false">apiDashboardEnabledKey</string>
     <bool name="publicapi_dashboard_enabled_default">false</bool>
 
+    <string name="show_introduction_screen_key">showIntroduction</string>
+    <bool name="show_introduction_screen_default">true</bool>
+
     <!-- androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode() -->
     <string name="night_mode_key" translatable="false">nightMode</string>
     <string name="night_mode_default" translatable="false">@string/night_mode_system_value</string>

src/main/res/values/strings.xml

@@ -577,7 +577,7 @@ limitations under the License.
     <string name="lap_time">Lap time</string>
     <string name="pace">Pace</string>
     <string name="lap_speed">Lap speed</string>
-    <string name="speed">Speed</string>
+    <string name="speed">Average moving speed</string>
     <string name="total_distance">Total distance</string>
     <plurals name="voiceDistanceKilometers">
         <item quantity="one">1 kilometer</item>
@@ -669,4 +669,6 @@ limitations under the License.
     <string name="show_on_dashboard">OpenTracks Dashboard API</string>
     <string name="show_on_dashboard_not_installed">No application supporting OpenTracks Dashboard API installed.</string>
     <string name="always">Always</string>
+
+    <string name="introduction_osm_dashboard">OpenTracks itself does not provide a map. Please install OSMDashboard to view your recordings on a map.</string>
 </resources>

src/main/res/values/themes_custom.xml

@@ -59,10 +59,11 @@ limitations under the License.
         <item name="indicatorColor">?attr/colorSecondary</item>
     </style>
 
-    <style name="SplashTheme" parent="ThemeCustom">
-        <item name="android:statusBarColor">@color/splashscreen_background</item>
-        <item name="android:navigationBarColor">@color/splashscreen_background</item>
-        <item name="android:windowBackground">@drawable/splashscreen</item>
+    <style name="SplashTheme" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/splashscreen_background</item>
+
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_logo_color_splashscreen</item>
+        <item name="postSplashScreenTheme">@style/ThemeCustom</item>
     </style>
 
     <style name="Widget.OpenTracks.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">

src/main/res/xml/settings_sensors.xml

@@ -12,7 +12,7 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/settings_cycling_sensor">
-        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference
+        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadencePreference
             android:defaultValue="@string/sensor_type_value_none"
             android:key="@string/settings_sensor_bluetooth_cycling_cadence_key"
             android:title="@string/settings_sensor_cycling_cadence" />
@@ -20,7 +20,7 @@
             android:defaultValue="@string/sensor_type_value_none"
             android:key="@string/settings_sensor_bluetooth_cycling_power_key"
             android:title="@string/sensor_state_power" />
-        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference
+        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingSpeedPreference
             android:defaultValue="@string/sensor_type_value_none"
             android:key="@string/settings_sensor_bluetooth_cycling_speed_key"
             android:title="@string/settings_sensor_cycling_distance_speed" />