Release: v4.3.5

Fixes #1561.

.github/workflows/build_apk.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
 
       - name: Assemble APK
         shell: bash

.github/workflows/lint.yml

@@ -16,6 +16,6 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - run: ./gradlew lint

README.md

@@ -2,7 +2,7 @@
 
 _OpenTracks_ is a sport tracking application that completely respects your privacy.
 
-[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
+[![Awesome Humane Tech](https://codeberg.org/teaserbot-labs/delightful-humane-design/raw/branch/main/humane-tech-badge.svg)](https://delightful.club/delightful-humane-design/#health)
 
 <table>
     <tr>
@@ -40,8 +40,10 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
     </tr>
 </table>
 
+Translations are hosted on <a href="https://hosted.weblate.org/engage/opentracks/">
+hosted.weblate.org</a>.
 <a href="https://hosted.weblate.org/engage/opentracks/">
-  <img src="https://hosted.weblate.org/widgets/opentracks/-/horizontal-auto.svg" alt="Translation status" />
+<img src="https://hosted.weblate.org/widgets/opentracks/-/horizontal-auto.svg" alt="Translation status" />
 </a>
 
 ## Screenshots
@@ -150,7 +152,7 @@ The developer documentation is in [README_API.md](README_API.md).
 ## Project history
 
 _OpenTracks_ is based upon Google _My Tracks app_ ([code](https://code.google.com/archive/p/mytracks/)).
-Initially, _My Tracks_ was initially released by Google in 2010 as [open-source software](http://google-latlong.blogspot.fr/2010/05/code-for-my-tracks-is-now-yours.html).
+_My Tracks_ was initially released by Google in 2010 as [open-source software](http://google-latlong.blogspot.fr/2010/05/code-for-my-tracks-is-now-yours.html).
 In 2016, [Google decided to discontinue](https://support.google.com/maps/answer/6333516) _My Tracks_ and stopped distributing it via the Google Play store in April 2016.
 Then [Plonk42](https://github.com/plonk42) conducted some maintenance work until 2016, so _My Tracks_ could still be used (based upon version _Google's MyTracks_ version 2.0.6).
 Plonk42's version is available [here](https://github.com/Plonk42/mytracks).

README_RELEASE.md

@@ -17,7 +17,7 @@ Application id: de.dennisguse.opentracks
 It if it properly tagged F-Droid takes care of building the app and publishing.
 Usually, it takes two days before the update is published (build, signed, and published). 
 
-The recent build activity can be found [here](https://f-droid.org/wiki/index.php?title=Special:RecentChanges&days=7&from=&hidebots=0&hideanons=1&hideliu=1&limit=500)
+The recent build activity can be found [here](https://monitor.f-droid.org/builds/build)
 
 ## Google Play Store
 Application id: `de.dennisguse.opentracks.playstore`

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.1.0-beta02'
     }
 }
 
@@ -47,20 +47,25 @@ android {
     compileOptions {
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     compileSdk 33
 
     buildFeatures {
         viewBinding true
+        buildConfig true
+    }
+
+    androidResources {
+        generateLocaleConfig = true
     }
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 5119
-        versionName "v4.2.0"
+        versionCode 5211
+        versionName "v4.3.5"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -106,11 +111,11 @@ android {
         }
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.resValue "string", "applicationId", variant.applicationId
 
         if (variant.buildType.name == 'nightly') {
-            variant.outputs.all {
+            variant.outputs.configureEach {
                 setVersionCodeOverride(getVersionCode())
                 setVersionNameOverride(getVersionName())
                 outputFileName = "${applicationId}_${variant.versionCode}.apk"
@@ -120,22 +125,23 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
-    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation 'androidx.mediarouter:mediarouter:1.4.0'
 
     androidTestImplementation 'androidx.test:core:1.5.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test:rules:1.5.0'
-    androidTestImplementation 'androidx.test:runner:1.5.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
-    androidTestImplementation 'org.mockito:mockito-android:4.11.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'org.mockito:mockito-android:5.3.1'
 
     androidTestUtil 'androidx.test:orchestrator:1.4.2'
 }

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

@@ -0,0 +1,8 @@
+v4.2.1: OpenTracks
+
+Changes:
+- Speed sensor: acceptable wheel diameter is 100mm-4000mm
+
+Bugfix:
+- Reconnect to a sensor if connection is lost
+

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

@@ -0,0 +1,9 @@
+v4.2.2: OpenTracks
+
+Bugfix:
+- Track icon wrongly shown in dialog
+- Textcolor for heartrate zone 1 was ignoring theme
+- Not all activityTypes were shown in dropdownlist
+- Crash due to color not found
+
+

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

@@ -0,0 +1,5 @@
+v4.3.0: OpenTracks
+
+Changes:
+- Allow backups (incl. encrypted to the Google)
+- Android 13: allow app-specific language settings

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

@@ -0,0 +1,8 @@
+v4.3.1: OpenTracks
+
+Changes:
+- Setting to skip voice announcements on device speaker
+
+Bugfix:
+- GPS disabled warning was falsely shown
+

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

@@ -0,0 +1,9 @@
+v4.3.2: OpenTracks
+
+Bugfix:
+- KML header was misformed (#1522)
+
+Developer:
+- Use Java 17 (multi-line text, switch)
+- API33: locale config is generated
+

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

@@ -0,0 +1,5 @@
+v4.3.3: OpenTracks
+
+Bugfixes:
+- Hidden fields were shown (introduced in v4.2.0)
+- Speed was shown instead of pace (introduced in v4.2.0)

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

@@ -0,0 +1,4 @@
+v4.3.4: OpenTracks
+
+Bugfix:
+- Android 13: regional locales could not be selected (introduced in v4.3.0)

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

@@ -0,0 +1,6 @@
+v4.3.5: OpenTracks
+
+Bugfix:
+- Sensor parsing had a overflow one off bug (#1559)
+- Insert marker: don't crash if no camera app is installed (#1561)
+

fastlane/metadata/android/nl/changelogs/4358.txt

@@ -2,13 +2,13 @@ v3.19.0: OpenTracks
 
 Wijzigingen:
 - Ondersteuning voor Running Speed en Cadence (RCS) sensoren
-- Bij het delen van een track wordt een afbeelding gemaakt
+- Bij delen van een track: maakt een deel-afbeelding
 - Niet trillen bij starten van opnemen
-- Bij opnemen: UI toont recentst ontvangen hoogte, snelheid en richting (ook al is deze niet opgeslagen)
+- Bij opnemen: UI toont meest recente hoogte, snelheid en richting (zelfs als niet opgeslagen)
 
 Bugfix:
-- Berekening van totale tijd mag geen pauze-tijd bevatten (vereist opnieuw importeren)
-- (opnieuw) Gebruik aangepaste overzichten indien aanwezig
+- Berekening totale tijd mag geen pauze-tijd bevatten (vereist opnieuw importeren)
+- (opnieuw) Gebruik aanwezige aangepaste overzichten
 
 Ontwikkelaar:
 - Upgrade naar SDK31 en AGP7.0.0 (vereist JDK11)

fastlane/metadata/android/nl/changelogs/4773.txt

@@ -5,4 +5,4 @@ Wijzigingen:
 - Gesproken meldingen van hartslag
 
 Bugfix:
-- Crash due to race condition
+- Vastloper door race condities

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

@@ -0,0 +1,22 @@
+一個尊重您的隱私的運動蹤跡紀錄器。
+
+運動與戶外活動賦予幸福、技能與自信。
+
+由保持追蹤您的訓練來重視您的健康。
+紀錄您的跑步或健行，並且在您騎自行車時給您一台具有大螢幕的自行車電腦。
+用照片標記您一路上有趣的地點。
+保持紀錄非常詳細的統計資料以供分析。
+僅分享資料給您想要分享的其他人。
+
+* 語音播報。
+* 支援藍芽 LE 感測器：心律、速度與距離 (騎自行車)、踏頻 (騎自行車)、功率計 (騎自行車)。
+* 海拔上升與下降：通過氣壓感測器。
+* EGM2008 海拔顯示 (平均海平面以上)；匯出為 WGS84。
+* 匯出蹤跡資料為 KMZ (包含照片)、KML、GPX。
+* 沒有網路存取或額外的權限需求。
+* 深色與淺色主題，取決於系統設定。
+* 沒有廣告。
+
+此為 自由軟體 / 免費軟體 / 開放原始碼
+這意味您可以使用、學習、修改與分享此專案的原始碼。
+授權條款：Apache 2.0

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

@@ -0,0 +1 @@
+一個尊重您的隱私的運動蹤跡紀錄器。

fastlane/metadata/android/zh-TW/title.txt

@@ -0,0 +1 @@
+OpenTracks

gradle.properties

@@ -1,2 +1,2 @@
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=256m
+org.gradle.jvmargs=-Xmx1024m

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

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

@@ -27,21 +27,23 @@ public class KmlTrackExporterTest {
      */
     @Test
     public void writeCloseSegment_only_write_sensordata_if_present() {
-        String expected = "<when>1970-01-01T00:00:00Z</when>\n" +
-                "<coord/>\n" +
-                "<when>1970-01-01T01:00:00+01:00</when>\n" +
-                "<coord/>\n" +
-                "<ExtendedData>\n" +
-                "<SchemaData schemaUrl=\"#schema\">\n" +
-                "</SchemaData>\n" +
-                "</ExtendedData>\n" +
-                "</Track>\n";
+        String expected = """
+                <when>1970-01-01T00:00:00Z</when>
+                <coord/>
+                <when>1970-01-01T01:00:00+01:00</when>
+                <coord/>
+                <ExtendedData>
+                <SchemaData schemaUrl="#schema">
+                </SchemaData>
+                </ExtendedData>
+                </Track>
+                """;
 
         // given
         TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(0));
 
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        KMLTrackExporter kmlTrackWriter = (KMLTrackExporter) TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
+        KMLTrackExporter kmlTrackWriter = (KMLTrackExporter) TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context, null);
         kmlTrackWriter.prepare(outputStream);
 
         kmlTrackWriter.writeTrackPoint(ZoneOffset.UTC, trackPoint);

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

@@ -166,7 +166,7 @@ public class ExportImportTest {
 
         trackPointCreator.setClock("2020-02-02T02:02:18Z");
         BluetoothRemoteSensorManager mockRemoteSensorManager = Mockito.mock(BluetoothRemoteSensorManager.class);
-        trackPointCreator.setRemoteSensorManager(mockRemoteSensorManager);
+        trackPointCreator.getSensorManager().setBluetoothSensorManager(mockRemoteSensorManager);
         service.endCurrentTrack();
 
         trackPointCreator.setClock("2020-02-02T02:03:20Z");
@@ -179,7 +179,7 @@ public class ExportImportTest {
         sendLocation(trackPointCreator, "2020-02-02T02:03:23Z", 3, 16.001, 10, 27, 15, 10, 0);
 
         trackPointCreator.setClock("2020-02-02T02:03:24Z");
-        trackPointCreator.setRemoteSensorManager(mockRemoteSensorManager);
+        trackPointCreator.getSensorManager().setBluetoothSensorManager(mockRemoteSensorManager);
         service.endCurrentTrack();
 
         Track track = contentProviderUtils.getTrack(trackId);
@@ -204,7 +204,7 @@ public class ExportImportTest {
         // given
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context, contentProviderUtils);
 
         // when
         // 1. export
@@ -287,7 +287,7 @@ public class ExportImportTest {
         editor.commit();
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context, contentProviderUtils);
 
         // when
         trackExporter.writeTrack(track, context.getContentResolver().openOutputStream(tmpFileUri));
@@ -310,7 +310,7 @@ public class ExportImportTest {
         // given
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context, contentProviderUtils);
 
         // when
         // 1. export
@@ -428,7 +428,7 @@ public class ExportImportTest {
         editor.commit();
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context, contentProviderUtils);
 
         // when
         // 1. export
@@ -453,7 +453,7 @@ public class ExportImportTest {
         // given
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.CSV.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.CSV.createTrackExporter(context, contentProviderUtils);
 
         // when
         // 1. export
@@ -521,12 +521,12 @@ public class ExportImportTest {
             sensorDataSet.fillTrackPoint(trackPoint);
             return sensorDataSet;
         });
-        trackPointCreator.setRemoteSensorManager(remoteSensorManager);
+        trackPointCreator.getSensorManager().setBluetoothSensorManager(remoteSensorManager);
         trackPointCreator.onChange(new SensorDataSet());
     }
 
     private void mockAltitudeChange(TrackPointCreator trackPointCreator, float altitudeGain) {
-        AltitudeSumManager altitudeSumManager = trackPointCreator.getAltitudeSumManager();
+        AltitudeSumManager altitudeSumManager = trackPointCreator.getSensorManager().getAltitudeSumManager();
         altitudeSumManager.setAltitudeGain_m(altitudeGain);
         altitudeSumManager.setAltitudeLoss_m(altitudeGain);
     }

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

@@ -231,7 +231,7 @@ public class GPXTrackImporterTest {
         importTrackId = importer.importFile(inputStream).get(0);
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
 
-        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context, contentProviderUtils);
         trackExporter.writeTrack(importedTrack, outputStream);
 
         // then

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

@@ -11,13 +11,44 @@ public class UintUtilsTest {
         assertEquals(0, UintUtils.diff(1, 1, UintUtils.UINT16_MAX));
         assertEquals(1, UintUtils.diff(2, 1, UintUtils.UINT16_MAX));
         assertEquals(3, UintUtils.diff(5, 2, UintUtils.UINT16_MAX));
-        assertEquals(65534, UintUtils.diff(1, 2, UintUtils.UINT16_MAX));
-
+        assertEquals(65535, UintUtils.diff(1, 2, UintUtils.UINT16_MAX));     /* unsigned 16 arithmetic is modulo UINT16_MAX + 1, not modulo UINT16_MAX */
         assertEquals(65530, UintUtils.diff(UintUtils.UINT16_MAX, 5, UintUtils.UINT16_MAX));
+
+        /*   Test modulo arithmetic for arguments that are out of range */
+
+        if (false) {   /*  false means UintUtils.diff() throws if arguments out of range */
+            assertEquals(0, UintUtils.diff(65537, 1, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(1, 65537, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(65537, 65537, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(-65535, 1, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(1, -65535, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(-65535, -65535, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(-65535, 65537, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(65537, -65535, UintUtils.UINT16_MAX));
+        }
+
+        /*  The following tests are the above, but for 32-bit unsigned. */
+
+        assertEquals(0, UintUtils.diff(1, 1, UintUtils.UINT32_MAX));
+        assertEquals(1, UintUtils.diff(2, 1, UintUtils.UINT32_MAX));
+        assertEquals(3, UintUtils.diff(5, 2, UintUtils.UINT32_MAX));
+        assertEquals(4294967295L, UintUtils.diff(1, 2, UintUtils.UINT32_MAX));
+        assertEquals(4294967290L, UintUtils.diff(UintUtils.UINT32_MAX, 5, UintUtils.UINT32_MAX));
+
+        if (false) { /*  false means UintUtils.diff() throws if arguments out of range */
+            assertEquals(0, UintUtils.diff(4294967297L, 1, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(1, 4294967297L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(4294967297L, 4294967297L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(-4294967295L, 1, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(1, -4294967295L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(-4294967295L, -4294967295L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(-4294967295L, 4294967297L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(65537, -4294967297L, UintUtils.UINT32_MAX));
+        }
     }
 
     @Test
     public void realData() {
         assertEquals(1, UintUtils.diff(381616, 381615, UintUtils.UINT32_MAX));
     }
-}
+}

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

@@ -45,6 +45,8 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
 
 /**
  * Tests insert location.
+ * Note: on API23, the TrackRecordingService may not be stopped properly before the next test.
+ * So, if something fails, subsequent tests may be affected.
  */
 @RunWith(AndroidJUnit4.class)
 public class TrackRecordingServiceTestRecording {
@@ -112,7 +114,7 @@ public class TrackRecordingServiceTestRecording {
         String startTime = "2020-02-02T02:02:02Z";
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // then
         assertEquals(new TrackStatistics(startTime, startTime, 0, 0, 0, 0, null, null)
@@ -149,7 +151,7 @@ public class TrackRecordingServiceTestRecording {
 
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // when
         String pauseTime = "2020-02-02T02:02:03Z";
@@ -195,7 +197,7 @@ public class TrackRecordingServiceTestRecording {
         String starTime = "2020-02-02T02:02:02Z";
         trackPointCreator.setClock(starTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         String pauseTime = "2020-02-02T02:02:03Z";
         trackPointCreator.setClock(pauseTime);
@@ -227,7 +229,7 @@ public class TrackRecordingServiceTestRecording {
 
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         String stopTime = "2020-02-02T02:02:03Z";
         trackPointCreator.setClock(stopTime);
@@ -237,7 +239,7 @@ public class TrackRecordingServiceTestRecording {
         String resumeTime = "2020-02-02T02:02:04Z";
         trackPointCreator.setClock(resumeTime);
         service.resumeTrack(trackId);
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // then
         new TrackPointAssert().assertEquals(List.of(
@@ -258,12 +260,13 @@ public class TrackRecordingServiceTestRecording {
 
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
-        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getRemoteSensorManager();
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getSensorManager().getBluetoothSensorManager();
 
         // when
         String sensor1 = "2020-02-02T02:02:03Z";
         trackPointCreator.setClock(sensor1);
+
         remoteSensorManager.onChanged(new SensorDataHeartRate("", "", HeartRate.of(5))); //Should be ignored
 
         String sensor3 = "2020-02-02T02:02:13Z";
@@ -297,7 +300,7 @@ public class TrackRecordingServiceTestRecording {
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
 
         // when
@@ -371,7 +374,7 @@ public class TrackRecordingServiceTestRecording {
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // when
         String gps1 = "2020-02-02T02:02:03Z";
@@ -436,7 +439,7 @@ public class TrackRecordingServiceTestRecording {
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // when
         String gps1 = "2020-02-02T02:02:03Z";
@@ -500,7 +503,7 @@ public class TrackRecordingServiceTestRecording {
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // when
         String gps1 = "2020-02-02T02:02:03Z";
@@ -564,7 +567,7 @@ public class TrackRecordingServiceTestRecording {
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // when
         String gps1 = "2020-02-02T02:02:03Z";
@@ -652,7 +655,7 @@ public class TrackRecordingServiceTestRecording {
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // when
         String gps1 = "2020-02-02T02:02:03Z";
@@ -702,7 +705,7 @@ public class TrackRecordingServiceTestRecording {
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // when
         String gps1 = "2020-02-02T02:02:03Z";
@@ -748,7 +751,7 @@ public class TrackRecordingServiceTestRecording {
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // when
         String gps1 = "2020-02-02T02:02:03Z";
@@ -812,8 +815,8 @@ public class TrackRecordingServiceTestRecording {
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
-        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getRemoteSensorManager();
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getSensorManager().getBluetoothSensorManager();
 
         // when
         String sensor1 = "2020-02-02T02:02:03Z";

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

@@ -1,17 +1,12 @@
 package de.dennisguse.opentracks.services;
 
 import android.content.Context;
-import android.content.Intent;
 import android.location.Location;
 
 import androidx.test.rule.ServiceTestRule;
 
-import org.mockito.Mockito;
-
-import java.time.Clock;
 import java.util.concurrent.TimeoutException;
 
-import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
@@ -24,15 +19,6 @@ public class TrackRecordingServiceTestUtils {
     public static void resetService(ServiceTestRule mServiceRule, Context context) throws TimeoutException {
         // Let's use default values.
         PreferencesUtils.clear();
-
-        // Reset service (if some previous test failed)
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
-                .getService();
-
-        BluetoothRemoteSensorManager remoteSensorManager = Mockito.mock(BluetoothRemoteSensorManager.class);
-        service.getTrackPointCreator().setRemoteSensorManager(remoteSensorManager);
-        service.getTrackPointCreator().setClock(Clock.systemUTC());
-        service.endCurrentTrack();
     }
 
     static void sendGPSLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, long speed) {

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

@@ -26,7 +26,7 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 @RunWith(MockitoJUnitRunner.class)
-public class GPSHandlerTest {
+public class GPSManagerTest {
 
     private final Context context = ApplicationProvider.getApplicationContext();
 
@@ -34,7 +34,7 @@ public class GPSHandlerTest {
     private TrackPointCreator trackPointCreator;
 
     @InjectMocks
-    private GPSHandler locationHandler;
+    private GPSManager locationHandler;
 
     @BeforeClass
     public static void preSetUp() {
@@ -50,7 +50,7 @@ public class GPSHandlerTest {
         Mockito.when(trackPointCreator.createNow())
                 .thenReturn(Instant.now());
 
-        locationHandler.onStart(context, new Handler());
+        locationHandler.start(context, new Handler());
     }
 
     /**

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

@@ -25,7 +25,7 @@ public class TrackPointCreatorTest {
     private TrackPointCreator.Callback server;
 
     @Mock
-    private GPSHandler locationHandler;
+    private GPSManager locationHandler;
 
     private TrackPointCreator subject;
 

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

@@ -34,23 +34,24 @@ public class EGM2008UtilsTest {
         int expectedLength = 18671444;
         int expectedHeaderLength = 404;
 
-        String expectedHeader = "P5\n" +
-                "# Geoid file in PGM format for the GeographicLib::Geoid class\n" +
-                "# Description WGS84 EGM2008, 5-minute grid\n" +
-                "# URL http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008\n" +
-                "# DateTime 2009-08-29 18:45:00\n" +
-                "# MaxBilinearError 0.478\n" +
-                "# RMSBilinearError 0.012\n" +
-                "# MaxCubicError 0.294\n" +
-                "# RMSCubicError 0.005\n" +
-                "# Offset -108\n" +
-                "# Scale 0.003\n" +
-                "# Origin 90N 0E\n" +
-                "# AREA_OR_POINT Point\n" +
-                "# Vertical_Datum WGS84\n" +
-                "4320    2161\n" +
-                "65535" +
-                "\n";
+        String expectedHeader = """
+                P5
+                # Geoid file in PGM format for the GeographicLib::Geoid class
+                # Description WGS84 EGM2008, 5-minute grid
+                # URL http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008
+                # DateTime 2009-08-29 18:45:00
+                # MaxBilinearError 0.478
+                # RMSBilinearError 0.012
+                # MaxCubicError 0.294
+                # RMSCubicError 0.005
+                # Offset -108
+                # Scale 0.003
+                # Origin 90N 0E
+                # AREA_OR_POINT Point
+                # Vertical_Datum WGS84
+                4320    2161
+                65535
+                """;
 
         // when
         try (InputStream inputStream = context.getResources().openRawResource(EGM2008Utils.EGM2008_5_DATA)) {

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

@@ -52,8 +52,8 @@ public class StatisticsUtilsTest extends TestCase {
         recordingLayout.addField(new DataField("key5", true, true, false));
 
         // when
-        RecordingLayout resultTrue = StatisticsUtils.filterVisible(recordingLayout, true);
-        RecordingLayout resultFalse = StatisticsUtils.filterVisible(recordingLayout, false);
+        RecordingLayout resultTrue = recordingLayout.toRecordingLayout(true);
+        RecordingLayout resultFalse = recordingLayout.toRecordingLayout(false);
 
         // then
         assertEquals(resultTrue.getFields().size(), 3);

src/main/AndroidManifest.xml

@@ -62,7 +62,9 @@ limitations under the License.
 
     <application
         android:name=".Startup"
-        android:allowBackup="false"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules_30_lower"
+        android:dataExtractionRules="@xml/backup_rules_31_higher"
         android:hardwareAccelerated="true"
         android:hasFragileUserData="false"
         android:icon="@drawable/ic_launcher"

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

@@ -24,6 +24,7 @@ import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackEditBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
@@ -75,7 +76,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
 
         viewBinding.fields.trackEditActivityType.setText(track.getCategory());
 
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
         viewBinding.fields.trackEditActivityType.setAdapter(adapter);
         viewBinding.fields.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(this, (String) viewBinding.fields.trackEditActivityType.getAdapter().getItem(position))));
         viewBinding.fields.trackEditActivityType.setOnFocusChangeListener((v, hasFocus) -> {

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

@@ -311,9 +311,9 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
         searchMenuItem = menu.findItem(R.id.track_list_search);
         SearchView searchView = ActivityUtils.configureSearchWidget(this, searchMenuItem);
 
-        searchView.findViewById(R.id.search_edit_frame).setPadding(0, 0, 48, 0);
+        searchView.findViewById(androidx.appcompat.R.id.search_edit_frame).setPadding(0, 0, 48, 0);
 
-        SearchView.SearchAutoComplete searchAutoComplete = searchView.findViewById(R.id.search_src_text);
+        SearchView.SearchAutoComplete searchAutoComplete = searchView.findViewById(androidx.appcompat.R.id.search_src_text);
         searchAutoComplete.setHintTextColor(ContextCompat.getColor(this, android.R.color.white));
         searchAutoComplete.setTextColor(ContextCompat.getColor(this, android.R.color.white));
 

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

@@ -274,18 +274,14 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
         @NonNull
         @Override
         public Fragment createFragment(int position) {
-            switch (position) {
-                case 0:
-                    return StatisticsRecordedFragment.newInstance(trackId);
-                case 1:
-                    return IntervalsFragment.newInstance(trackId, true);
-                case 2:
-                    return ChartFragment.newInstance(false);
-                case 3:
-                    return ChartFragment.newInstance(true);
-                default:
-                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-            }
+            return switch (position) {
+                case 0 -> StatisticsRecordedFragment.newInstance(trackId);
+                case 1 -> IntervalsFragment.newInstance(trackId, true);
+                case 2 -> ChartFragment.newInstance(false);
+                case 3 -> ChartFragment.newInstance(true);
+                default ->
+                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            };
         }
 
         @Override
@@ -294,18 +290,14 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
         }
 
         public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case 0:
-                    return getString(R.string.track_detail_stats_tab);
-                case 1:
-                    return getString(R.string.track_detail_intervals_tab);
-                case 2:
-                    return getString(R.string.settings_chart_by_time);
-                case 3:
-                    return getString(R.string.settings_chart_by_distance);
-                default:
-                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-            }
+            return switch (position) {
+                case 0 -> getString(R.string.track_detail_stats_tab);
+                case 1 -> getString(R.string.track_detail_intervals_tab);
+                case 2 -> getString(R.string.settings_chart_by_time);
+                case 3 -> getString(R.string.settings_chart_by_distance);
+                default ->
+                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            };
         }
     }
 

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

@@ -333,18 +333,14 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
         @NonNull
         @Override
         public Fragment createFragment(int position) {
-            switch (position) {
-                case 0:
-                    return StatisticsRecordingFragment.newInstance();
-                case 1:
-                    return IntervalsFragment.newInstance(trackId, false);
-                case 2:
-                    return ChartFragment.newInstance(false);
-                case 3:
-                    return ChartFragment.newInstance(true);
-                default:
-                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-            }
+            return switch (position) {
+                case 0 -> StatisticsRecordingFragment.newInstance();
+                case 1 -> IntervalsFragment.newInstance(trackId, false);
+                case 2 -> ChartFragment.newInstance(false);
+                case 3 -> ChartFragment.newInstance(true);
+                default ->
+                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            };
         }
 
         @Override
@@ -353,18 +349,14 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
         }
 
         public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case 0:
-                    return getString(R.string.track_detail_stats_tab);
-                case 1:
-                    return getString(R.string.track_detail_intervals_tab);
-                case 2:
-                    return getString(R.string.settings_chart_by_time);
-                case 3:
-                    return getString(R.string.settings_chart_by_distance);
-                default:
-                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-            }
+            return switch (position) {
+                case 0 -> getString(R.string.track_detail_stats_tab);
+                case 1 -> getString(R.string.track_detail_intervals_tab);
+                case 2 -> getString(R.string.settings_chart_by_time);
+                case 3 -> getString(R.string.settings_chart_by_distance);
+                default ->
+                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            };
         }
     }
 
@@ -381,13 +373,18 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     }
 
     private void onGpsStatusChanged(GpsStatusValue gpsStatusValue) {
-        if (gpsStatusValue.isGpsStarted() && snackbar != null && snackbar.isShown()) {
-            snackbar.dismiss();
+        boolean snackbarShowing = snackbar != null && snackbar.isShown();
+        if (gpsStatusValue.isGpsStarted()) {
+            if (snackbarShowing) {
+                snackbar.dismiss();
+            }
             return;
         }
-        if (gpsStatusValue != GpsStatusValue.GPS_DISABLED) {
+
+        if (snackbarShowing) {
             return;
         }
+
         snackbar = Snackbar
                 .make(viewBinding.trackRecordingCoordinatorLayout,
                         getString(R.string.gps_recording_status, getString(gpsStatusValue.message), getString(R.string.gps_recording_without_signal)),

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

@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.data.models.Track;
@@ -51,7 +52,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements
 
         viewBinding.trackEditActivityType.setText(track.getCategory());
 
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
         viewBinding.trackEditActivityType.setAdapter(adapter);
         viewBinding.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(this, (String) viewBinding.trackEditActivityType.getAdapter().getItem(position))));
         viewBinding.trackEditActivityType.setOnFocusChangeListener((v, hasFocus) -> {

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

@@ -210,16 +210,11 @@ abstract class ChartValueSeries {
     }
 
     int getTitleId(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return metricTitleId;
-            case IMPERIAL:
-                return imperialTitleId;
-            case NAUTICAL_IMPERIAL:
-                return nauticalTitleId;
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> metricTitleId;
+            case IMPERIAL -> imperialTitleId;
+            case NAUTICAL_IMPERIAL -> nauticalTitleId;
+        };
     }
 
     Paint getTitlePaint() {

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

@@ -733,16 +733,11 @@ public class ChartView extends View {
     private String getXAxisLabel() {
         Context context = getContext();
         if (chartByDistance) {
-            switch (unitSystem) {
-                case METRIC:
-                    return context.getString(R.string.unit_kilometer);
-                case IMPERIAL:
-                    return context.getString(R.string.unit_mile);
-                case NAUTICAL_IMPERIAL:
-                    return context.getString(R.string.unit_nautical_mile);
-                default:
-                    throw new RuntimeException("Not implemented");
-            }
+            return switch (unitSystem) {
+                case METRIC -> context.getString(R.string.unit_kilometer);
+                case IMPERIAL -> context.getString(R.string.unit_mile);
+                case NAUTICAL_IMPERIAL -> context.getString(R.string.unit_nautical_mile);
+            };
         } else {
             return context.getString(R.string.description_time);
         }

src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java

@@ -133,20 +133,12 @@ public class CustomContentProvider extends ContentProvider {
 
     @Override
     public int delete(@NonNull Uri url, String where, String[] selectionArgs) {
-        String table;
-        switch (getUrlType(url)) {
-            case TRACKPOINTS:
-                table = TrackPointsColumns.TABLE_NAME;
-                break;
-            case TRACKS:
-                table = TracksColumns.TABLE_NAME;
-                break;
-            case MARKERS:
-                table = MarkerColumns.TABLE_NAME;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URL " + url);
-        }
+        String table = switch (getUrlType(url)) {
+            case TRACKPOINTS -> TrackPointsColumns.TABLE_NAME;
+            case TRACKS -> TracksColumns.TABLE_NAME;
+            case MARKERS -> MarkerColumns.TABLE_NAME;
+            default -> throw new IllegalArgumentException("Unknown URL " + url);
+        };
 
         Log.w(TAG, "Deleting from table " + table);
         int totalChangesBefore = getTotalChanges();
@@ -186,24 +178,15 @@ public class CustomContentProvider extends ContentProvider {
 
     @Override
     public String getType(@NonNull Uri url) {
-        switch (getUrlType(url)) {
-            case TRACKPOINTS:
-                return TrackPointsColumns.CONTENT_TYPE;
-            case TRACKPOINTS_BY_ID:
-            case TRACKPOINTS_BY_TRACKID:
-                return TrackPointsColumns.CONTENT_ITEMTYPE;
-            case TRACKS:
-                return TracksColumns.CONTENT_TYPE;
-            case TRACKS_BY_ID:
-                return TracksColumns.CONTENT_ITEMTYPE;
-            case MARKERS:
-                return MarkerColumns.CONTENT_TYPE;
-            case MARKERS_BY_ID:
-            case MARKERS_BY_TRACKID:
-                return MarkerColumns.CONTENT_ITEMTYPE;
-            default:
-                throw new IllegalArgumentException("Unknown URL " + url);
-        }
+        return switch (getUrlType(url)) {
+            case TRACKPOINTS -> TrackPointsColumns.CONTENT_TYPE;
+            case TRACKPOINTS_BY_ID, TRACKPOINTS_BY_TRACKID -> TrackPointsColumns.CONTENT_ITEMTYPE;
+            case TRACKS -> TracksColumns.CONTENT_TYPE;
+            case TRACKS_BY_ID -> TracksColumns.CONTENT_ITEMTYPE;
+            case MARKERS -> MarkerColumns.CONTENT_TYPE;
+            case MARKERS_BY_ID, MARKERS_BY_TRACKID -> MarkerColumns.CONTENT_ITEMTYPE;
+            default -> throw new IllegalArgumentException("Unknown URL " + url);
+        };
     }
 
     @Override
@@ -251,47 +234,47 @@ public class CustomContentProvider extends ContentProvider {
         SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
         String sortOrder = null;
         switch (getUrlType(url)) {
-            case TRACKPOINTS:
+            case TRACKPOINTS -> {
                 queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
                 sortOrder = sort != null ? sort : TrackPointsColumns.DEFAULT_SORT_ORDER;
-                break;
-            case TRACKPOINTS_BY_ID:
+            }
+            case TRACKPOINTS_BY_ID -> {
                 queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
                 queryBuilder.appendWhere(TrackPointsColumns._ID + "=" + ContentUris.parseId(url));
-                break;
-            case TRACKPOINTS_BY_TRACKID:
+            }
+            case TRACKPOINTS_BY_TRACKID -> {
                 queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
                 queryBuilder.appendWhere(TrackPointsColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
-                break;
-            case TRACKS:
+            }
+            case TRACKS -> {
                 if (projection != null && Arrays.asList(projection).contains(TracksColumns.MARKER_COUNT)) {
                     queryBuilder.setTables(TracksColumns.TABLE_NAME + " LEFT OUTER JOIN (SELECT " + MarkerColumns.TRACKID + " AS markerTrackId, COUNT(*) AS " + TracksColumns.MARKER_COUNT + " FROM " + MarkerColumns.TABLE_NAME + " GROUP BY " + MarkerColumns.TRACKID + ") ON (" + TracksColumns.TABLE_NAME + "." + TracksColumns._ID + "= markerTrackId)");
                 } else {
                     queryBuilder.setTables(TracksColumns.TABLE_NAME);
                 }
                 sortOrder = sort != null ? sort : TracksColumns.DEFAULT_SORT_ORDER;
-                break;
-            case TRACKS_BY_ID:
+            }
+            case TRACKS_BY_ID -> {
                 queryBuilder.setTables(TracksColumns.TABLE_NAME);
                 queryBuilder.appendWhere(TracksColumns._ID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
-                break;
-            case TRACKS_SENSOR_STATS:
+            }
+            case TRACKS_SENSOR_STATS -> {
                 long trackId = ContentUris.parseId(url);
                 return db.rawQuery(SENSOR_STATS_QUERY, new String[]{String.valueOf(trackId), String.valueOf(trackId)});
-            case MARKERS:
+            }
+            case MARKERS -> {
                 queryBuilder.setTables(MarkerColumns.TABLE_NAME);
                 sortOrder = sort != null ? sort : MarkerColumns.DEFAULT_SORT_ORDER;
-                break;
-            case MARKERS_BY_ID:
+            }
+            case MARKERS_BY_ID -> {
                 queryBuilder.setTables(MarkerColumns.TABLE_NAME);
                 queryBuilder.appendWhere(MarkerColumns._ID + "=" + ContentUris.parseId(url));
-                break;
-            case MARKERS_BY_TRACKID:
+            }
+            case MARKERS_BY_TRACKID -> {
                 queryBuilder.setTables(MarkerColumns.TABLE_NAME);
                 queryBuilder.appendWhere(MarkerColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown url " + url);
+            }
+            default -> throw new IllegalArgumentException("Unknown url " + url);
         }
         Cursor cursor = queryBuilder.query(db, projection, selection, selectionArgs, null, null, sortOrder);
         cursor.setNotificationUri(getContext().getContentResolver(), url);
@@ -304,41 +287,40 @@ public class CustomContentProvider extends ContentProvider {
         String table;
         String whereClause;
         switch (getUrlType(url)) {
-            case TRACKPOINTS:
+            case TRACKPOINTS -> {
                 table = TrackPointsColumns.TABLE_NAME;
                 whereClause = where;
-                break;
-            case TRACKPOINTS_BY_ID:
+            }
+            case TRACKPOINTS_BY_ID -> {
                 table = TrackPointsColumns.TABLE_NAME;
                 whereClause = TrackPointsColumns._ID + "=" + ContentUris.parseId(url);
                 if (!TextUtils.isEmpty(where)) {
                     whereClause += " AND (" + where + ")";
                 }
-                break;
-            case TRACKS:
+            }
+            case TRACKS -> {
                 table = TracksColumns.TABLE_NAME;
                 whereClause = where;
-                break;
-            case TRACKS_BY_ID:
+            }
+            case TRACKS_BY_ID -> {
                 table = TracksColumns.TABLE_NAME;
                 whereClause = TracksColumns._ID + "=" + ContentUris.parseId(url);
                 if (!TextUtils.isEmpty(where)) {
                     whereClause += " AND (" + where + ")";
                 }
-                break;
-            case MARKERS:
+            }
+            case MARKERS -> {
                 table = MarkerColumns.TABLE_NAME;
                 whereClause = where;
-                break;
-            case MARKERS_BY_ID:
+            }
+            case MARKERS_BY_ID -> {
                 table = MarkerColumns.TABLE_NAME;
                 whereClause = MarkerColumns._ID + "=" + ContentUris.parseId(url);
                 if (!TextUtils.isEmpty(where)) {
                     whereClause += " AND (" + where + ")";
                 }
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown url " + url);
+            }
+            default -> throw new IllegalArgumentException("Unknown url " + url);
         }
         int count;
         try {
@@ -371,16 +353,12 @@ public class CustomContentProvider extends ContentProvider {
      * @param contentValues the content values
      */
     private Uri insertContentValues(Uri url, UrlType urlType, ContentValues contentValues) {
-        switch (urlType) {
-            case TRACKPOINTS:
-                return insertTrackPoint(url, contentValues);
-            case TRACKS:
-                return insertTrack(url, contentValues);
-            case MARKERS:
-                return insertMarker(url, contentValues);
-            default:
-                throw new IllegalArgumentException("Unknown url " + url);
-        }
+        return switch (urlType) {
+            case TRACKPOINTS -> insertTrackPoint(url, contentValues);
+            case TRACKS -> insertTrack(url, contentValues);
+            case MARKERS -> insertMarker(url, contentValues);
+            default -> throw new IllegalArgumentException("Unknown url " + url);
+        };
     }
 
     private Uri insertTrackPoint(Uri url, ContentValues values) {

src/main/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelper.java

@@ -61,42 +61,18 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
         for (int toVersion = oldVersion + 1; toVersion <= newVersion; toVersion++) {
             Log.i(TAG, "Upgrade from " + oldVersion + " to " + toVersion);
             switch (toVersion) {
-                case 24:
-                    upgradeFrom23to24(db);
-                    break;
-                case 25:
-                    upgradeFrom24to25(db);
-                    break;
-                case 26:
-                    upgradeFrom25to26(db);
-                    break;
-                case 27:
-                    upgradeFrom26to27(db);
-                    break;
-                case 28:
-                    upgradeFrom27to28(db);
-                    break;
-                case 29:
-                    upgradeFrom28to29(db);
-                    break;
-                case 30:
-                    upgradeFrom29to30(db);
-                    break;
-                case 31:
-                    upgradeFrom30to31(db);
-                    break;
-                case 32:
-                    upgradeFrom31to32(db);
-                    break;
-                case 33:
-                    upgradeFrom32to33(db);
-                    break;
-                case 34:
-                    upgradeFrom33to34(db);
-                    break;
-
-                default:
-                    throw new RuntimeException("Not implemented: upgrade to " + toVersion);
+                case 24 -> upgradeFrom23to24(db);
+                case 25 -> upgradeFrom24to25(db);
+                case 26 -> upgradeFrom25to26(db);
+                case 27 -> upgradeFrom26to27(db);
+                case 28 -> upgradeFrom27to28(db);
+                case 29 -> upgradeFrom28to29(db);
+                case 30 -> upgradeFrom29to30(db);
+                case 31 -> upgradeFrom30to31(db);
+                case 32 -> upgradeFrom31to32(db);
+                case 33 -> upgradeFrom32to33(db);
+                case 34 -> upgradeFrom33to34(db);
+                default -> throw new RuntimeException("Not implemented: upgrade to " + toVersion);
             }
         }
     }
@@ -106,41 +82,18 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
         for (int toVersion = oldVersion - 1; toVersion >= newVersion; toVersion--) {
             Log.i(TAG, "Downgrade from " + oldVersion + " to " + toVersion);
             switch (toVersion) {
-                case 23:
-                    downgradeFrom24to23(db);
-                    break;
-                case 24:
-                    downgradeFrom25to24(db);
-                    break;
-                case 25:
-                    downgradeFrom26to25(db);
-                    break;
-                case 26:
-                    downgradeFrom27to26(db);
-                    break;
-                case 27:
-                    downgradeFrom28to27(db);
-                    break;
-                case 28:
-                    downgradeFrom29to28(db);
-                    break;
-                case 29:
-                    downgradeFrom30to29(db);
-                    break;
-                case 30:
-                    downgradeFrom31to30(db);
-                    break;
-                case 31:
-                    downgradeFrom32to31(db);
-                    break;
-                case 32:
-                    downgradeFrom33to32(db);
-                    break;
-                case 33:
-                    downgradeFrom34to33(db);
-                    break;
-                default:
-                    throw new RuntimeException("Not implemented: downgrade to " + toVersion);
+                case 23 -> downgradeFrom24to23(db);
+                case 24 -> downgradeFrom25to24(db);
+                case 25 -> downgradeFrom26to25(db);
+                case 26 -> downgradeFrom27to26(db);
+                case 27 -> downgradeFrom28to27(db);
+                case 28 -> downgradeFrom29to28(db);
+                case 29 -> downgradeFrom30to29(db);
+                case 30 -> downgradeFrom31to30(db);
+                case 31 -> downgradeFrom32to31(db);
+                case 32 -> downgradeFrom33to32(db);
+                case 33 -> downgradeFrom34to33(db);
+                default -> throw new RuntimeException("Not implemented: downgrade to " + toVersion);
             }
         }
     }

src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java

@@ -129,24 +129,18 @@ public class ShareContentProvider extends CustomContentProvider {
     }
 
     private static TrackFileFormat getTrackFileFormat(@NonNull Uri uri) {
-        switch (uriMatcher.match(uri)) {
-            case URI_GPX:
-                return TrackFileFormat.GPX;
-
-            case URI_KML_WITH_TRACKDETAIL_SENSORDATA:
-                return TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA;
-
-            case URI_KMZ_WITH_TRACKDETAIL_AND_SENSORDATA:
-                return TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA;
-            case URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES:
-                return TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES;
-
-            case URI_CSV:
-                return TrackFileFormat.CSV;
-
-            default:
-                throw new RuntimeException("Could not derive TrackFileFormat from Uri " + uri);
-        }
+        return switch (uriMatcher.match(uri)) {
+            case URI_GPX -> TrackFileFormat.GPX;
+            case URI_KML_WITH_TRACKDETAIL_SENSORDATA ->
+                    TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA;
+            case URI_KMZ_WITH_TRACKDETAIL_AND_SENSORDATA ->
+                    TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA;
+            case URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES ->
+                    TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES;
+            case URI_CSV -> TrackFileFormat.CSV;
+            default ->
+                    throw new RuntimeException("Could not derive TrackFileFormat from Uri " + uri);
+        };
     }
 
     @Nullable
@@ -170,14 +164,14 @@ public class ShareContentProvider extends CustomContentProvider {
         int i = 0;
         for (String col : projection) {
             switch (col) {
-                case OpenableColumns.DISPLAY_NAME:
+                case OpenableColumns.DISPLAY_NAME -> {
                     cols[i] = OpenableColumns.DISPLAY_NAME;
                     values[i++] = uri.getLastPathSegment();
-                    break;
-                case OpenableColumns.SIZE:
+                }
+                case OpenableColumns.SIZE -> {
                     cols[i] = OpenableColumns.SIZE;
                     values[i++] = -1; //Report unknown size; if applications need to know, one need to generate the file here also (count bytes that are written to OutputStream.
-                    break;
+                }
             }
         }
 
@@ -214,7 +208,7 @@ public class ShareContentProvider extends CustomContentProvider {
             }
         }
 
-        final TrackExporter trackExporter = getTrackFileFormat(uri).createTrackExporter(getContext());
+        final TrackExporter trackExporter = getTrackFileFormat(uri).createTrackExporter(getContext(), new ContentProviderUtils(getContext()));
 
         PipeDataWriter<String> pipeDataWriter = (output, uri1, mimeType, opts, args) -> {
             try (FileOutputStream fileOutputStream = new FileOutputStream(output.getFileDescriptor())) {

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

@@ -0,0 +1,79 @@
+package de.dennisguse.opentracks.data.models;
+
+import android.content.Context;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import de.dennisguse.opentracks.R;
+
+public enum ActivityType {
+    AIRPLANE("AIRPLANE", R.drawable.ic_activity_flight_24dp, true, R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane),
+    BIKE("BIKE", R.drawable.ic_activity_bike_24dp, true, R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_road_biking, R.string.activity_type_track_cycling),
+    MOUNTAIN_BIKE("MOUNTAIN_BIKE", R.drawable.ic_activity_mtb_24dp, true, R.string.activity_type_mountain_biking),
+    MOTOR_BIKE("MOTOR_BIKE", R.drawable.ic_activity_motorbike_24dp, true, R.string.activity_type_motor_bike),
+    KAYAK("KAYAK", R.drawable.ic_activity_kayaking_24dp, true, R.string.activity_type_kayaking),
+    BOAT("BOAT", R.drawable.ic_activity_boat_24dp, true, R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat),
+    SAILING("SAILING", R.drawable.ic_activity_sailing_24dp, true, R.string.activity_type_sailing),
+    DRIVE("DRIVE", R.drawable.ic_activity_drive_24dp, true, R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car),
+    RUN("RUN", R.drawable.ic_activity_run_24dp, false, R.string.activity_type_running, R.string.activity_type_street_running, R.string.activity_type_track_running, R.string.activity_type_trail_running),
+    SKI("SKI", R.drawable.ic_activity_skiing_24dp, true, R.string.activity_type_cross_country_skiing, R.string.activity_type_skiing),
+    SNOW_BOARDING("SNOW_BOARDING", R.drawable.ic_activity_snowboarding_24dp, true, R.string.activity_type_snow_boarding),
+    UNKNOWN("UNKNOWN", R.drawable.ic_logo_24dp, true, R.string.activity_type_unknown),
+    WALK("WALK", R.drawable.ic_activity_walk_24dp, false, R.string.activity_type_hiking, R.string.activity_type_off_trail_hiking, R.string.activity_type_speed_walking, R.string.activity_type_trail_hiking, R.string.activity_type_walking),
+    ESCOOTER("ESCOOTER", R.drawable.ic_activity_escooter_24dp, true, R.string.activity_type_escooter),
+    INLINE_SKATING("INLINES_SKATING", R.drawable.ic_activity_inline_skating_24dp, true, R.string.activity_type_inline_skating),
+    SKATE_BOARDING("SKATE_BOARDING", R.drawable.ic_activity_skateboarding_24dp, true, R.string.activity_type_skate_boarding),
+    CLIMBING("CLIMBING", R.drawable.ic_activity_climbing_24dp, false, R.string.activity_type_climbing),
+    SWIMMING("SWIMMING", R.drawable.ic_activity_swimming_24dp, false, R.string.activity_type_swimming),
+    SWIMMING_OPEN("SWIMMING_OPEN", R.drawable.ic_activity_swimming_open_24dp, false, R.string.activity_type_swimming_open),
+    WORKOUT("WORKOUT", R.drawable.ic_activity_workout_24dp, false, R.string.activity_type_workout);
+
+    final String id;
+    final int iconId;
+    final boolean showSpeedPreferred;
+    final int[] localizedStringIds;
+
+    //isSpeed?
+
+    ActivityType(String id, int iconId, boolean showSpeedPreferred, int... localizedStringIds) {
+        this.id = id;
+        this.iconId = iconId;
+        this.showSpeedPreferred = showSpeedPreferred;
+        this.localizedStringIds = localizedStringIds;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public int getIconId() {
+        return iconId;
+    }
+
+    public boolean isShowSpeedPreferred() {
+        return showSpeedPreferred;
+    }
+
+    public int[] getLocalizedStringIds() {
+        return localizedStringIds;
+    }
+
+    public int getFirstLocalizedStringId() {
+        return localizedStringIds[0];
+    }
+
+    public static List<String> getLocalizedStrings(Context context) {
+        List<String> result = new ArrayList<>();
+        for (ActivityType activityType : values()) {
+            List<String> strings = Arrays.stream(activityType.localizedStringIds)
+                    .mapToObj(context::getString)
+                    .collect(Collectors.toList());
+            result.addAll(strings);
+        }
+
+        return result;
+    }
+}

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

@@ -58,16 +58,11 @@ public class Distance {
     }
 
     public static Distance one(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return Distance.ofKilometer(1);
-            case IMPERIAL:
-                return Distance.ofMile(1);
-            case NAUTICAL_IMPERIAL:
-                return Distance.ofNauticalMile(1);
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> Distance.ofKilometer(1);
+            case IMPERIAL -> Distance.ofMile(1);
+            case NAUTICAL_IMPERIAL -> Distance.ofNauticalMile(1);
+        };
     }
 
     private final double distance_m;
@@ -133,28 +128,18 @@ public class Distance {
     }
 
     public double toKM_Miles(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return toKM();
-            case IMPERIAL:
-                return toMI();
-            case NAUTICAL_IMPERIAL:
-                return toNauticalMiles();
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> toKM();
+            case IMPERIAL -> toMI();
+            case NAUTICAL_IMPERIAL -> toNauticalMiles();
+        };
     }
 
     public double toM_FT(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return toM();
-            case NAUTICAL_IMPERIAL:
-            case IMPERIAL:
-                return toFT();
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> toM();
+            case NAUTICAL_IMPERIAL, IMPERIAL -> toFT();
+        };
     }
 
     @Override

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

@@ -46,38 +46,36 @@ public class DistanceFormatter {
     public Pair<String, String> getDistanceParts(Distance distance) {
         if (distance.isInvalid()) {
             String valueUnknown = resources.getString(R.string.value_unknown);
-            switch (unitSystem) {
-                case METRIC:
-                    return new Pair<>(valueUnknown, resources.getString(R.string.unit_meter));
-                case IMPERIAL:
-                case NAUTICAL_IMPERIAL:
-                    return new Pair<>(valueUnknown, resources.getString(R.string.unit_feet));
-                default:
-                    throw new RuntimeException("Not implemented");
-            }
+            return switch (unitSystem) {
+                case METRIC -> new Pair<>(valueUnknown, resources.getString(R.string.unit_meter));
+                case IMPERIAL, NAUTICAL_IMPERIAL ->
+                        new Pair<>(valueUnknown, resources.getString(R.string.unit_feet));
+            };
         }
 
         switch (unitSystem) {
-            case METRIC:
+            case METRIC -> {
                 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:
+            }
+            case IMPERIAL -> {
                 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:
+            }
+            case NAUTICAL_IMPERIAL -> {
                 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));
                 }
-            default:
-                throw new RuntimeException("Not implemented");
+            }
+            default -> throw new RuntimeException("Not implemented");
         }
     }
 

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

@@ -1,8 +1,12 @@
 package de.dennisguse.opentracks.data.models;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.ui.util.ThemeUtils;
 
 public class HeartRateZones {
 
@@ -12,22 +16,23 @@ public class HeartRateZones {
         this.max = max;
     }
 
-    public int getColorForZone(HeartRate current) {
+    public int getTextColorForZone(Context context, HeartRate current) {
         if (current != null) {
             if (current.getBPM() >= max.getBPM() * 0.9) {
-                return R.color.heart_rate_zone_textcolor_5;
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_5);
             }
             if (current.getBPM() >= max.getBPM() * 0.8) {
-                return R.color.heart_rate_zone_textcolor_4;
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_4);
             }
             if (current.getBPM() >= max.getBPM() * 0.7) {
-                return R.color.heart_rate_zone_textcolor_3;
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_3);
             }
             if (current.getBPM() >= max.getBPM() * 0.6) {
-                return R.color.heart_rate_zone_textcolor_2;
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_2);
             }
         }
 
-        return R.color.heart_rate_zone_textcolor_1;
+        // Zone 1
+        return ThemeUtils.getTextColorPrimary(context);
     }
 }

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

@@ -115,16 +115,11 @@ public class Speed {
     }
 
     public double to(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return toKMH();
-            case IMPERIAL:
-                return toMPH();
-            case NAUTICAL_IMPERIAL:
-                return toKnots();
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> toKMH();
+            case IMPERIAL -> toMPH();
+            case NAUTICAL_IMPERIAL -> toKnots();
+        };
     }
 
     @Override

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

@@ -39,20 +39,14 @@ public class SpeedFormatter {
      * @return the formatted speed (or null) and it's unit as {@link Pair}
      */
     public Pair<String, String> getSpeedParts(Speed speed) {
-        int unitId;
-        switch (unitSystem) {
-            case METRIC:
-                unitId = reportSpeedOrPace ? R.string.unit_kilometer_per_hour : R.string.unit_minute_per_kilometer;
-                break;
-            case IMPERIAL:
-                unitId = reportSpeedOrPace ? R.string.unit_mile_per_hour : R.string.unit_minute_per_mile;
-                break;
-            case NAUTICAL_IMPERIAL:
-                unitId = reportSpeedOrPace ? R.string.unit_knots : R.string.unit_minute_per_nautical_mile;
-                break;
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        int unitId = switch (unitSystem) {
+            case METRIC ->
+                    reportSpeedOrPace ? R.string.unit_kilometer_per_hour : R.string.unit_minute_per_kilometer;
+            case IMPERIAL ->
+                    reportSpeedOrPace ? R.string.unit_mile_per_hour : R.string.unit_minute_per_mile;
+            case NAUTICAL_IMPERIAL ->
+                    reportSpeedOrPace ? R.string.unit_knots : R.string.unit_minute_per_nautical_mile;
+        };
 
         String unitString = resources.getString(unitId);
 

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

@@ -122,17 +122,15 @@ public class StatisticsRecordingFragment extends Fragment {
         }
         recordingLayout = newRecordingLayout;
 
-        viewBinding.statsLayout.setColumnCount(recordingLayout.getColumnsPerRow());
-
         viewBinding.statsLayout.removeAllViews(); //Let's start from scratch
+        viewBinding.statsLayout.setColumnCount(recordingLayout.getColumnsPerRow());
         viewHolders.clear();
 
         Map<String, Callable<StatisticViewHolder<?>>> m = Mapping.create(getContext());
 
         int rowIndex = 0;
         int columnIndex = 0;
-        for (int i = 0; i < recordingLayout.getFields().size(); i++) {
-            DataField dataField = recordingLayout.getFields().get(i);
+        for (DataField dataField : recordingLayout.toRecordingLayout(true).getFields()) {
             GridLayout.LayoutParams param = new GridLayout.LayoutParams();
             param.setGravity(Gravity.FILL_HORIZONTAL);
             param.width = 0;
@@ -162,7 +160,7 @@ public class StatisticsRecordingFragment extends Fragment {
 
                 viewBinding.statsLayout.addView(viewHolder.getView(), param);
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                throw new RuntimeException("Could not add " + dataField.getKey(), e);
             }
         }
     }

src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java

@@ -3,6 +3,8 @@ package de.dennisguse.opentracks.io.file;
 import android.content.Context;
 import android.content.res.Resources;
 
+import androidx.annotation.NonNull;
+
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Locale;
@@ -25,8 +27,8 @@ public enum TrackFileFormat {
 
     KML_WITH_TRACKDETAIL_AND_SENSORDATA("KML_WITH_TRACKDETAIL_AND_SENSORDATA") {
         @Override
-        public TrackExporter createTrackExporter(Context context) {
-            return new KMLTrackExporter(context, false);
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            return new KMLTrackExporter(context, contentProviderUtils, false);
         }
 
         @Override
@@ -45,9 +47,9 @@ public enum TrackFileFormat {
         private static final boolean exportPhotos = false;
 
         @Override
-        public TrackExporter createTrackExporter(Context context) {
-            KMLTrackExporter exporter = new KMLTrackExporter(context, exportPhotos);
-            return new KmzTrackExporter(context, new ContentProviderUtils(context), exporter, exportPhotos);
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            KMLTrackExporter exporter = new KMLTrackExporter(context, contentProviderUtils, exportPhotos);
+            return new KmzTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
         }
 
         @Override
@@ -70,9 +72,9 @@ public enum TrackFileFormat {
         private static final boolean exportPhotos = true;
 
         @Override
-        public TrackExporter createTrackExporter(Context context) {
-            KMLTrackExporter exporter = new KMLTrackExporter(context, exportPhotos);
-            return new KmzTrackExporter(context, new ContentProviderUtils(context), exporter, exportPhotos);
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            KMLTrackExporter exporter = new KMLTrackExporter(context, contentProviderUtils, exportPhotos);
+            return new KmzTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
         }
 
         @Override
@@ -93,8 +95,8 @@ public enum TrackFileFormat {
 
     GPX("GPX") {
         @Override
-        public TrackExporter createTrackExporter(Context context) {
-            return new GPXTrackExporter(new ContentProviderUtils(context), context.getString(R.string.app_name));
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            return new GPXTrackExporter(contentProviderUtils, context.getString(R.string.app_name));
         }
 
         @Override
@@ -109,8 +111,8 @@ public enum TrackFileFormat {
 
     CSV("CSV") {
         @Override
-        public TrackExporter createTrackExporter(Context context) {
-            return new CSVTrackExporter(new ContentProviderUtils(context));
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            return new CSVTrackExporter(contentProviderUtils);
         }
 
         @Override
@@ -161,7 +163,7 @@ public enum TrackFileFormat {
      *
      * @param context the context
      */
-    public abstract TrackExporter createTrackExporter(Context context);
+    public abstract TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils);
 
     /**
      * Returns the file extension for each format.

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

@@ -93,23 +93,9 @@ public class CSVTrackExporter implements TrackExporter {
 
     @Override
     public boolean writeTrack(Track[] tracks, @NonNull OutputStream outputStream) {
-        List<Column> columns = Collections.unmodifiableList(Arrays.asList(
-                new Column("time", null),
-                new Column("trackpoint_type", t -> quote(t.getType().name())),
-                new Column("latitude", t -> t.hasLocation() ? COORDINATE_FORMAT.format(t.getLatitude()) : ""),
-                new Column("longitude", t -> t.hasLocation() ? COORDINATE_FORMAT.format(t.getLongitude()) : ""),
-                new Column("altitude", t -> t.hasAltitude() ? COORDINATE_FORMAT.format(t.getAltitude().toM()) : ""),
-                new Column("accuracy_horizontal", t -> t.hasHorizontalAccuracy() ? DISTANCE_FORMAT.format(t.getHorizontalAccuracy().toM()) : ""),
-                new Column("accuracy_vertical", t -> t.hasVerticalAccuracy() ? DISTANCE_FORMAT.format(t.getVerticalAccuracy().toM()) : ""),
+        List<Column> columns = Collections.unmodifiableList(Arrays.asList(new Column("time", null), new Column("trackpoint_type", t -> quote(t.getType().name())), new Column("latitude", t -> t.hasLocation() ? COORDINATE_FORMAT.format(t.getLatitude()) : ""), new Column("longitude", t -> t.hasLocation() ? COORDINATE_FORMAT.format(t.getLongitude()) : ""), new Column("altitude", t -> t.hasAltitude() ? COORDINATE_FORMAT.format(t.getAltitude().toM()) : ""), new Column("accuracy_horizontal", t -> t.hasHorizontalAccuracy() ? DISTANCE_FORMAT.format(t.getHorizontalAccuracy().toM()) : ""), new Column("accuracy_vertical", t -> t.hasVerticalAccuracy() ? DISTANCE_FORMAT.format(t.getVerticalAccuracy().toM()) : ""),
 
-                new Column("speed", t -> t.hasSpeed() ? SPEED_FORMAT.format(t.getSpeed().toKMH()) : ""),
-                new Column("altitude_gain", t -> t.hasAltitudeGain() ? DISTANCE_FORMAT.format(t.getAltitudeGain()) : ""),
-                new Column("altitude_loss", t -> t.hasAltitudeLoss() ? DISTANCE_FORMAT.format(t.getAltitudeLoss()) : ""),
-                new Column("sensor_distance", t -> t.hasSensorDistance() ? DISTANCE_FORMAT.format(t.getSensorDistance().toM()) : ""),
-                new Column("heartrate", t -> t.hasHeartRate() ? HEARTRATE_FORMAT.format(t.getHeartRate().getBPM()) : ""),
-                new Column("cadence", t -> t.hasCadence() ? CADENCE_FORMAT.format(t.getCadence().getRPM()) : ""),
-                new Column("power", t -> t.hasPower() ? ALTITUDE_FORMAT.format(t.getPower().getW()) : "")
-        ));
+                new Column("speed", t -> t.hasSpeed() ? SPEED_FORMAT.format(t.getSpeed().toKMH()) : ""), new Column("altitude_gain", t -> t.hasAltitudeGain() ? DISTANCE_FORMAT.format(t.getAltitudeGain()) : ""), new Column("altitude_loss", t -> t.hasAltitudeLoss() ? DISTANCE_FORMAT.format(t.getAltitudeLoss()) : ""), new Column("sensor_distance", t -> t.hasSensorDistance() ? DISTANCE_FORMAT.format(t.getSensorDistance().toM()) : ""), new Column("heartrate", t -> t.hasHeartRate() ? HEARTRATE_FORMAT.format(t.getHeartRate().getBPM()) : ""), new Column("cadence", t -> t.hasCadence() ? CADENCE_FORMAT.format(t.getCadence().getRPM()) : ""), new Column("power", t -> t.hasPower() ? ALTITUDE_FORMAT.format(t.getPower().getW()) : "")));
 
         try {
             prepare(outputStream);
@@ -144,15 +130,10 @@ public class CSVTrackExporter implements TrackExporter {
                 TrackPoint trackPoint = trackPointIterator.next();
 
                 switch (trackPoint.getType()) {
-                    case SEGMENT_START_MANUAL:
-                    case SEGMENT_END_MANUAL:
-                    case SEGMENT_START_AUTOMATIC:
-                    case SENSORPOINT:
-                    case TRACKPOINT:
-                        writeTrackPoint(columns, trackPoint);
-                        break;
-                    default:
-                        throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
+                    case SEGMENT_START_MANUAL, SEGMENT_END_MANUAL, SEGMENT_START_AUTOMATIC, SENSORPOINT, TRACKPOINT ->
+                            writeTrackPoint(columns, trackPoint);
+                    default ->
+                            throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
                 }
             }
         }
@@ -171,18 +152,14 @@ public class CSVTrackExporter implements TrackExporter {
 
     public void writeHeader(List<Column> columns) {
         if (printWriter != null) {
-            String columnNames = columns.stream().map(c -> c.columnName)
-                    .reduce((s, s2) -> s + "," + s2)
-                    .orElseThrow(() -> new RuntimeException("No columns defined"));
+            String columnNames = columns.stream().map(c -> c.columnName).reduce((s, s2) -> s + "," + s2).orElseThrow(() -> new RuntimeException("No columns defined"));
             printWriter.println("#" + columnNames);
         }
     }
 
     public void writeTrackPoint(List<Column> columns, TrackPoint trackPoint) {
         if (printWriter != null) {
-            String columnNames = columns.stream().map(c -> c.extractor.apply(trackPoint))
-                    .reduce((s, s2) -> s + "," + s2)
-                    .orElseThrow(() -> new RuntimeException("No columns defined"));
+            String columnNames = columns.stream().map(c -> c.extractor.apply(trackPoint)).reduce((s, s2) -> s + "," + s2).orElseThrow(() -> new RuntimeException("No columns defined"));
             printWriter.println(columnNames);
         }
     }

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

@@ -30,14 +30,9 @@ public class ExportServiceResultReceiver extends ResultReceiver {
     protected void onReceiveResult(int resultCode, Bundle resultData) {
         Track.Id trackId = resultData.getParcelable(ExportServiceResultReceiver.RESULT_EXTRA_TRACK_ID);
         switch (resultCode) {
-            case RESULT_CODE_SUCCESS:
-                receiver.onExportSuccess(trackId);
-                break;
-            case RESULT_CODE_ERROR:
-                receiver.onExportError(trackId);
-                break;
-            default:
-                throw new RuntimeException("Unknown resultCode.");
+            case RESULT_CODE_SUCCESS -> receiver.onExportSuccess(trackId);
+            case RESULT_CODE_ERROR -> receiver.onExportError(trackId);
+            default -> throw new RuntimeException("Unknown resultCode.");
         }
     }
 

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

@@ -145,37 +145,32 @@ public class GPXTrackExporter implements TrackExporter {
                 }
 
                 switch (trackPoint.getType()) {
-                    case SEGMENT_START_MANUAL:
-                        Log.i(TAG, "Exporting " + TrackPoint.Type.SEGMENT_START_MANUAL.name() + " is not supported.");
-                        break;
-                    case SEGMENT_END_MANUAL:
+                    case SEGMENT_START_MANUAL ->
+                            Log.i(TAG, "Exporting " + TrackPoint.Type.SEGMENT_START_MANUAL.name() + " is not supported.");
+                    case SEGMENT_END_MANUAL -> {
                         if (wroteSegment) writeCloseSegment();
                         wroteSegment = false;
                         Log.i(TAG, "Exporting " + TrackPoint.Type.SEGMENT_END_MANUAL.name() + " is not supported.");
-                        break;
-                    case SEGMENT_START_AUTOMATIC:
+                    }
+                    case SEGMENT_START_AUTOMATIC -> {
                         if (wroteSegment) writeCloseSegment();
                         writeOpenSegment();
                         wroteSegment = true;
-
                         trackDistance = trackDistance.plus(writeTrackPoint(track.getZoneOffset(), trackPoint, sensorPoints, trackDistance));
                         sensorPoints.clear();
-                        break;
-                    case SENSORPOINT:
-                        sensorPoints.add(trackPoint);
-                        break;
-                    case TRACKPOINT:
+                    }
+                    case SENSORPOINT -> sensorPoints.add(trackPoint);
+                    case TRACKPOINT -> {
                         if (!wroteSegment) {
                             // Might happen for older data (pre v3.15.0)
                             writeOpenSegment();
                             wroteSegment = true;
                         }
-
                         trackDistance = trackDistance.plus(writeTrackPoint(track.getZoneOffset(), trackPoint, sensorPoints, trackDistance));
                         sensorPoints.clear();
-                        break;
-                    default:
-                        throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
+                    }
+                    default ->
+                            throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
                 }
             }
 

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

@@ -93,10 +93,10 @@ public class KMLTrackExporter implements TrackExporter {
     private final List<Float> accuracyHorizontal = new ArrayList<>();
     private final List<Float> accuracyVertical = new ArrayList<>();
 
-    public KMLTrackExporter(Context context, boolean exportPhotos) {
+    public KMLTrackExporter(Context context, ContentProviderUtils contentProviderUtils, boolean exportPhotos) {
         this.context = context;
         this.exportPhotos = exportPhotos;
-        this.contentProviderUtils = new ContentProviderUtils(context);
+        this.contentProviderUtils = contentProviderUtils;
     }
 
     public boolean writeTrack(Track track, @NonNull OutputStream outputStream) {
@@ -169,30 +169,28 @@ public class KMLTrackExporter implements TrackExporter {
                 }
 
                 switch (trackPoint.getType()) {
-                    case SEGMENT_START_MANUAL:
-                    case SEGMENT_START_AUTOMATIC:
+                    case SEGMENT_START_MANUAL, SEGMENT_START_AUTOMATIC -> {
                         if (wroteSegment) writeCloseSegment();
                         writeOpenSegment();
                         writeTrackPoint(track.getZoneOffset(), trackPoint);
                         wroteSegment = true;
-                        break;
-                    case SEGMENT_END_MANUAL:
+                    }
+                    case SEGMENT_END_MANUAL -> {
                         if (!wroteSegment) writeOpenSegment();
                         writeTrackPoint(track.getZoneOffset(), trackPoint);
                         writeCloseSegment();
                         wroteSegment = false;
-                        break;
-                    case SENSORPOINT:
-                    case TRACKPOINT:
+                    }
+                    case SENSORPOINT, TRACKPOINT -> {
                         if (!wroteSegment) {
                             // Might happen for older data (pre v3.15.0)
                             writeOpenSegment();
                             wroteSegment = true;
                         }
                         writeTrackPoint(track.getZoneOffset(), trackPoint);
-                        break;
-                    default:
-                        throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
+                    }
+                    default ->
+                            throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
                 }
             }
 
@@ -226,15 +224,19 @@ 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.3\"");
-            printWriter.println("xmlns:atom=\"http://www.w3.org/2005/Atom\"");
-            printWriter.println("xmlns:opentracks=\"http://opentracksapp.com/xmlschemas/v1\">");
-            //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(
+                    """
+                            <?xml version="1.0" encoding="UTF-8"?>
+                            """);
+            printWriter.println(
+                    """
+                            <kml xmlns="http://www.opengis.net/kml/2.3"
+                                xmlns:atom="http://www.w3.org/2005/Atom"
+                                xmlns:opentracks="http://opentracksapp.com/xmlschemas/v1"
+                                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                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">
+                            """); //TODO ADD xsi:schemaLocation for atom
             printWriter.println("<Document>");
             printWriter.println("<open>1</open>");
             printWriter.println("<visibility>1</visibility>");

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

@@ -156,103 +156,94 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
     @Override
     public void endElement(String uri, String localName, String tag) {
         switch (tag) {
-            case TAG_GPX:
-                onFileEnd();
-                break;
-            case TAG_MARKER:
-                onMarkerEnd();
-                break;
-            case TAG_TRACK:
+            case TAG_GPX -> onFileEnd();
+            case TAG_MARKER -> onMarkerEnd();
+            case TAG_TRACK -> {
                 trackImporter.setTrack(context, name, uuid, description, category, null, zoneOffset);
                 zoneOffset = null;
-                break;
-            case TAG_TRACK_SEGMENT:
-                onTrackSegmentEnd();
-                break;
-            case TAG_TRACK_POINT:
-                currentSegment.add(createTrackPoint());
-                break;
-            case TAG_NAME:
+            }
+            case TAG_TRACK_SEGMENT -> onTrackSegmentEnd();
+            case TAG_TRACK_POINT -> currentSegment.add(createTrackPoint());
+            case TAG_NAME -> {
                 if (content != null) {
                     name = content.trim();
                 }
-                break;
-            case TAG_DESCRIPTION:
+            }
+            case TAG_DESCRIPTION -> {
                 if (content != null) {
                     description = content.trim();
                 }
-                break;
-            case TAG_TYPE:
+            }
+            case TAG_TYPE -> {
                 if (content != null) {
                     category = content.trim();
                 }
-                break;
-            case TAG_TIME:
+            }
+            case TAG_TIME -> {
                 if (content != null) {
                     time = content.trim();
                 }
-                break;
-            case TAG_ALTITUDE:
+            }
+            case TAG_ALTITUDE -> {
                 if (content != null) {
                     altitude = content.trim();
                 }
-                break;
-            case TAG_COMMENT:
+            }
+            case TAG_COMMENT -> {
                 if (content != null) {
                     markerType = content.trim();
                 }
-                break;
-            case TAG_EXTENSION_SPEED:
-            case TAG_EXTENSION_SPEED_COMPAT:
+            }
+            case TAG_EXTENSION_SPEED, TAG_EXTENSION_SPEED_COMPAT -> {
                 if (content != null) {
                     speed = content.trim();
                 }
-                break;
-            case TAG_EXTENSION_HEARTRATE:
+            }
+            case TAG_EXTENSION_HEARTRATE -> {
                 if (content != null) {
                     heartrate = content.trim();
                 }
-                break;
-            case TAG_EXTENSION_CADENCE:
+            }
+            case TAG_EXTENSION_CADENCE -> {
                 if (content != null) {
                     cadence = content.trim();
                 }
-                break;
-            case TAG_EXTENSION_POWER:
+            }
+            case TAG_EXTENSION_POWER -> {
                 if (content != null) {
                     power = content.trim();
                 }
-                break;
-            case TAG_ID:
+            }
+            case TAG_ID -> {
                 if (content != null) {
                     uuid = content.trim();
                 }
-                break;
-            case TAG_EXTENSION_GAIN:
+            }
+            case TAG_EXTENSION_GAIN -> {
                 if (content != null) {
                     gain = content.trim();
                 }
-                break;
-            case TAG_EXTENSION_LOSS:
+            }
+            case TAG_EXTENSION_LOSS -> {
                 if (content != null) {
                     loss = content.trim();
                 }
-                break;
-            case TAG_EXTENSION_DISTANCE:
+            }
+            case TAG_EXTENSION_DISTANCE -> {
                 if (content != null) {
                     sensorDistance = content.trim();
                 }
-                break;
-            case TAG_EXTENSION_ACCURACY_HORIZONTAL:
+            }
+            case TAG_EXTENSION_ACCURACY_HORIZONTAL -> {
                 if (content != null) {
                     accuracyHorizontal = content.trim();
                 }
-                break;
-            case TAG_EXTENSION_ACCURACY_VERTICAL:
+            }
+            case TAG_EXTENSION_ACCURACY_VERTICAL -> {
                 if (content != null) {
                     accuracyVertical = content.trim();
                 }
-                break;
+            }
         }
 
         content = "";

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

@@ -79,19 +79,17 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe
         String message = resultData.getString(ImportServiceResultReceiver.RESULT_EXTRA_MESSAGE);
 
         switch (resultCode) {
-            case ImportServiceResultReceiver.RESULT_CODE_ERROR:
+            case ImportServiceResultReceiver.RESULT_CODE_ERROR -> {
                 summary.errorCount++;
                 summary.fileErrors.add(getApplication().getString(R.string.import_error_info, fileName, message));
-                break;
-            case ImportServiceResultReceiver.RESULT_CODE_IMPORTED:
+            }
+            case ImportServiceResultReceiver.RESULT_CODE_IMPORTED -> {
                 summary.importedTrackIds.addAll(trackIds);
                 summary.successCount++;
-                break;
-            case ImportServiceResultReceiver.RESULT_CODE_ALREADY_EXISTS:
-                summary.existsCount++;
-                break;
-            default:
-                throw new RuntimeException(TAG + ": import service result code invalid: " + resultCode);
+            }
+            case ImportServiceResultReceiver.RESULT_CODE_ALREADY_EXISTS -> summary.existsCount++;
+            default ->
+                    throw new RuntimeException(TAG + ": import service result code invalid: " + resultCode);
         }
 
         importData.postValue(summary);

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

@@ -136,27 +136,18 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
     @Override
     public void startElement(String uri, String localName, String tag, Attributes attributes) throws SAXException {
         switch (tag) {
-            case TAG_PLACEMARK:
-            case TAG_PHOTO_OVERLAY:
+            case TAG_PLACEMARK, TAG_PHOTO_OVERLAY ->
                 // 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_MULTI_TRACK:
-            case TAG_KML22_MULTI_TRACK:
-                trackImporter.newTrack();
-                break;
-            case TAG_TRACK:
-            case TAG_KML22_TRACK:
+                    onMarkerStart();
+            case TAG_MULTI_TRACK, TAG_KML22_MULTI_TRACK -> trackImporter.newTrack();
+            case TAG_TRACK, TAG_KML22_TRACK -> {
                 if (trackImporter == null) {
                     throw new SAXException("Missing " + TAG_MULTI_TRACK);
                 }
                 onTrackSegmentStart();
-                break;
-            case TAG_DATA_CATEGORY:
-            case TAG_SIMPLE_ARRAY_DATA:
-            case TAG_KML22_SIMPLE_ARRAY_DATA:
-                dataType = attributes.getValue(ATTRIBUTE_NAME);
-                break;
+            }
+            case TAG_DATA_CATEGORY, TAG_SIMPLE_ARRAY_DATA, TAG_KML22_SIMPLE_ARRAY_DATA ->
+                    dataType = attributes.getValue(ATTRIBUTE_NAME);
         }
     }
 
@@ -168,32 +159,18 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
     @Override
     public void endElement(String uri, String localName, String tag) throws SAXException {
         switch (tag) {
-            case TAG_KML:
-                onFileEnd();
-                break;
-            case TAG_PLACEMARK:
-            case TAG_PHOTO_OVERLAY:
+            case TAG_KML -> onFileEnd();
+            case TAG_PLACEMARK, TAG_PHOTO_OVERLAY ->
                 // Note that a track is contained in a Placemark, calling onMarkerEnd is save since markerType is not set for a track.
-                onMarkerEnd();
-                break;
-            case TAG_COORDINATES:
-                onMarkerLocationEnd();
-                break;
-            case TAG_MULTI_TRACK:
-            case TAG_KML22_MULTI_TRACK:
+                    onMarkerEnd();
+            case TAG_COORDINATES -> onMarkerLocationEnd();
+            case TAG_MULTI_TRACK, TAG_KML22_MULTI_TRACK -> {
                 trackImporter.setTrack(context, name, uuid, description, category, icon, zoneOffset);
                 zoneOffset = null;
-                break;
-            case TAG_TRACK:
-            case TAG_KML22_TRACK:
-                onTrackSegmentEnd();
-                break;
-            case TAG_COORD:
-            case TAG_KML22_COORD:
-                onCoordEnded();
-                break;
-            case TAG_VALUE:
-            case TAG_KML22_VALUE:
+            }
+            case TAG_TRACK, TAG_KML22_TRACK -> onTrackSegmentEnd();
+            case TAG_COORD, TAG_KML22_COORD -> onCoordEnded();
+            case TAG_VALUE, TAG_KML22_VALUE -> {
                 if (KMLTrackExporter.EXTENDED_DATA_TYPE_CATEGORY.equals(dataType)) {
                     if (content != null) {
                         category = content.trim();
@@ -201,28 +178,28 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                 } else {
                     onExtendedDataValueEnd();
                 }
-                break;
-            case TAG_NAME:
+            }
+            case TAG_NAME -> {
                 if (content != null) {
                     name = content.trim();
                 }
-                break;
-            case TAG_UUID:
+            }
+            case TAG_UUID -> {
                 if (content != null) {
                     uuid = content.trim();
                 }
-                break;
-            case TAG_DESCRIPTION:
+            }
+            case TAG_DESCRIPTION -> {
                 if (content != null) {
                     description = content.trim();
                 }
-                break;
-            case TAG_ICON:
+            }
+            case TAG_ICON -> {
                 if (content != null) {
                     icon = content.trim();
                 }
-                break;
-            case TAG_WHEN:
+            }
+            case TAG_WHEN -> {
                 if (content != null) {
                     try {
                         OffsetDateTime time = StringUtils.parseTime(content.trim());
@@ -234,18 +211,17 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                         throw new ParsingException(createErrorMessage(String.format(Locale.US, "Unable to parse time: %s", content.trim())), e);
                     }
                 }
-
-                break;
-            case TAG_STYLE_URL:
+            }
+            case TAG_STYLE_URL -> {
                 if (content != null) {
                     markerType = content.trim();
                 }
-                break;
-            case TAG_HREF:
+            }
+            case TAG_HREF -> {
                 if (content != null) {
                     photoUrl = content.trim();
                 }
-                break;
+            }
         }
 
         // Reset element content
@@ -436,35 +412,19 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
             }
         }
         switch (dataType) {
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_SPEED:
-                sensorSpeedList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_DISTANCE:
-                sensorDistanceList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_POWER:
-                sensorPowerList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_HEART_RATE:
-                sensorHeartRateList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_CADENCE:
-                sensorCadenceList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_ALTITUDE_GAIN:
-                altitudeGainList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_ALTITUDE_LOSS:
-                altitudeLossList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL:
-                accuracyHorizontal.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_ACCURACY_VERTICAL:
-                accuracyVertical.add(value);
-                break;
-            default:
-                Log.w(TAG, "Data from extended data " + dataType + " is not (yet) supported.");
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_SPEED -> sensorSpeedList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_DISTANCE -> sensorDistanceList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_POWER -> sensorPowerList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_HEART_RATE -> sensorHeartRateList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_CADENCE -> sensorCadenceList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_ALTITUDE_GAIN -> altitudeGainList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_ALTITUDE_LOSS -> altitudeLossList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL ->
+                    accuracyHorizontal.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_ACCURACY_VERTICAL ->
+                    accuracyVertical.add(value);
+            default ->
+                    Log.w(TAG, "Data from extended data " + dataType + " is not (yet) supported.");
         }
     }
 

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

@@ -40,9 +40,9 @@ import de.dennisguse.opentracks.sensors.sensorData.SensorData;
  * Manages connection to a Bluetooth LE sensor and subscribes for onChange-notifications.
  * Also parses the transferred data into {@link SensorDataObserver}.
  */
-public abstract class BluetoothConnectionManager<DataType> {
+public abstract class AbstractBluetoothConnectionManager<DataType> {
 
-    private static final String TAG = BluetoothConnectionManager.class.getSimpleName();
+    private static final String TAG = AbstractBluetoothConnectionManager.class.getSimpleName();
 
     private final SensorDataObserver observer;
 
@@ -53,23 +53,22 @@ public abstract class BluetoothConnectionManager<DataType> {
         @Override
         public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
             switch (newState) {
-                case BluetoothProfile.STATE_CONNECTING:
-                    Log.d(TAG, "Connecting to sensor: " + gatt.getDevice());
-                    break;
-                case BluetoothProfile.STATE_CONNECTED:
-                    Log.d(TAG, "Connected to sensor: " + gatt.getDevice());
-
+                case BluetoothProfile.STATE_CONNECTING ->
+                        Log.i(TAG, "Connecting to sensor: " + gatt.getDevice());
+                case BluetoothProfile.STATE_CONNECTED -> {
+                    Log.i(TAG, "Connected to sensor: " + gatt.getDevice() + "; discovering services.");
                     gatt.discoverServices();
-                    break;
-                case BluetoothProfile.STATE_DISCONNECTING:
-                    Log.d(TAG, "Disconnecting from sensor: " + gatt.getDevice());
-                    break;
-
-                case BluetoothProfile.STATE_DISCONNECTED:
-                    Log.d(TAG, "Disconnected from sensor: " + gatt.getDevice());
-
+                }
+                case BluetoothProfile.STATE_DISCONNECTING ->
+                        Log.i(TAG, "Disconnecting from sensor: " + gatt.getDevice());
+                case BluetoothProfile.STATE_DISCONNECTED -> {
+                    //This is also triggered, if no connection was established (ca. 30s)
+                    Log.i(TAG, "Disconnected from sensor: " + gatt.getDevice() + "; trying to reconnect");
+                    if (gatt.connect()) {
+                        Log.e(TAG, "Could not trigger reconnect for sensor: " + gatt.getDevice());
+                    }
                     clearData();
-                    break;
+                }
             }
         }
 
@@ -133,12 +132,12 @@ public abstract class BluetoothConnectionManager<DataType> {
         }
     };
 
-    BluetoothConnectionManager(ServiceMeasurementUUID serviceUUUID, SensorDataObserver observer) {
+    AbstractBluetoothConnectionManager(ServiceMeasurementUUID serviceUUUID, SensorDataObserver observer) {
         this.serviceMeasurementUUIDs = List.of(serviceUUUID);
         this.observer = observer;
     }
 
-    BluetoothConnectionManager(List<ServiceMeasurementUUID> serviceUUUID, SensorDataObserver observer) {
+    AbstractBluetoothConnectionManager(List<ServiceMeasurementUUID> serviceUUUID, SensorDataObserver observer) {
         this.serviceMeasurementUUIDs = serviceUUUID;
         this.observer = observer;
     }

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

@@ -19,7 +19,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 /**
  * Estimates the altitude gain and altitude loss using the device's pressure sensor (i.e., barometer).
  */
-public class AltitudeSumManager implements SensorEventListener {
+public class AltitudeSumManager implements SensorConnector, SensorEventListener {
 
     private static final String TAG = AltitudeSumManager.class.getSimpleName();
 

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

@@ -8,11 +8,11 @@ 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> {
+public class BluetoothConnectionManagerCyclingCadence extends AbstractBluetoothConnectionManager<Cadence> {
 
-    private static final String TAG = BluetoothRemoteSensorManagerCyclingCadence.class.getSimpleName();
+    private static final String TAG = BluetoothConnectionManagerCyclingCadence.class.getSimpleName();
 
-    BluetoothRemoteSensorManagerCyclingCadence(SensorDataObserver observer) {
+    BluetoothConnectionManagerCyclingCadence(SensorDataObserver observer) {
         super(BluetoothUtils.CYCLING_CADENCE, observer);
     }
 

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

@@ -5,9 +5,9 @@ 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> {
+public class BluetoothConnectionManagerCyclingDistanceSpeed extends AbstractBluetoothConnectionManager<SensorDataCyclingDistanceSpeed.Data> {
 
-    BluetoothRemoteSensorManagerCyclingDistanceSpeed(SensorDataObserver observer) {
+    BluetoothConnectionManagerCyclingDistanceSpeed(SensorDataObserver observer) {
         super(BluetoothUtils.CYCLING_SPEED_CADENCE, observer);
     }
 

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

@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
 import de.dennisguse.opentracks.data.models.Power;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
 
-public class BluetoothRemoteSensorManagerCyclingPower extends BluetoothConnectionManager<Power> {
+public class BluetoothConnectionManagerCyclingPower extends AbstractBluetoothConnectionManager<Power> {
 
-    BluetoothRemoteSensorManagerCyclingPower(@NonNull SensorDataObserver observer) {
+    BluetoothConnectionManagerCyclingPower(@NonNull SensorDataObserver observer) {
         super(BluetoothUtils.CYCLING_POWER, observer);
     }
 

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

@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataHeartRate;
 
-public class BluetoothRemoteSensorManagerHeartRate extends BluetoothConnectionManager<HeartRate> {
+public class BluetoothConnectionManagerHeartRate extends AbstractBluetoothConnectionManager<HeartRate> {
 
-    BluetoothRemoteSensorManagerHeartRate(@NonNull SensorDataObserver observer) {
+    BluetoothConnectionManagerHeartRate(@NonNull SensorDataObserver observer) {
         super(BluetoothUtils.HEARTRATE, observer);
     }
 

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

@@ -6,9 +6,9 @@ import androidx.annotation.NonNull;
 
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;
 
-public class BluetoothRemoteSensorManagerRunningSpeedAndCadence extends BluetoothConnectionManager<SensorDataRunning.Data> {
+public class BluetoothConnectionRunningSpeedAndCadence extends AbstractBluetoothConnectionManager<SensorDataRunning.Data> {
 
-    BluetoothRemoteSensorManagerRunningSpeedAndCadence(@NonNull SensorDataObserver observer) {
+    BluetoothConnectionRunningSpeedAndCadence(@NonNull SensorDataObserver observer) {
         super(BluetoothUtils.RUNNING_SPEED_CADENCE, observer);
     }
 

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

@@ -52,7 +52,7 @@ import de.dennisguse.opentracks.util.PermissionRequester;
  *
  * @author Sandor Dornbush
  */
-public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.SensorDataObserver {
+public class BluetoothRemoteSensorManager implements SensorConnector, AbstractBluetoothConnectionManager.SensorDataObserver {
 
     private static final String TAG = BluetoothRemoteSensorManager.class.getSimpleName();
 
@@ -65,15 +65,15 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
 
     private Distance preferenceWheelCircumference;
 
-    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 BluetoothConnectionManagerHeartRate heartRate = new BluetoothConnectionManagerHeartRate(this);
+    private final BluetoothConnectionManagerCyclingCadence cyclingCadence = new BluetoothConnectionManagerCyclingCadence(this);
+    private final BluetoothConnectionManagerCyclingDistanceSpeed cyclingSpeed = new BluetoothConnectionManagerCyclingDistanceSpeed(this);
+    private final BluetoothConnectionManagerCyclingPower cyclingPower = new BluetoothConnectionManagerCyclingPower(this);
+    private final BluetoothConnectionRunningSpeedAndCadence runningSpeedAndCadence = new BluetoothConnectionRunningSpeedAndCadence(this);
 
     private final SensorDataSet sensorDataSet = new SensorDataSet();
 
-    private final SensorDataSetChangeObserver observer;
+    private final SensorManager.SensorDataSetChangeObserver observer;
 
     private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
         @Override
@@ -114,21 +114,23 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
         }
     };
 
-    public BluetoothRemoteSensorManager(@NonNull Context context, @NonNull Handler handler, @NonNull SensorDataSetChangeObserver observer) {
+    public BluetoothRemoteSensorManager(@NonNull Context context, @NonNull Handler handler, @NonNull SensorManager.SensorDataSetChangeObserver observer) {
         this.context = context;
         this.handler = handler;
         this.observer = observer;
         bluetoothAdapter = BluetoothUtils.getAdapter(context);
     }
 
-    public void start() {
+    @Override
+    public void start(Context context, Handler handler) {
         started = true;
 
         //Registering triggers connection startup
         PreferencesUtils.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
     }
 
-    public synchronized void stop() {
+    @Override
+    public synchronized void stop(Context context) {
         heartRate.disconnect();
         cyclingCadence.disconnect();
         cyclingSpeed.disconnect();
@@ -145,7 +147,7 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
         return bluetoothAdapter != null && bluetoothAdapter.isEnabled();
     }
 
-    private synchronized void connect(BluetoothConnectionManager<?> connectionManager, String address) {
+    private synchronized void connect(AbstractBluetoothConnectionManager<?> connectionManager, String address) {
         if (!isEnabled()) {
             Log.w(TAG, "Bluetooth not enabled.");
             return;
@@ -230,8 +232,4 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
     public Handler getHandler() {
         return handler;
     }
-
-    public interface SensorDataSetChangeObserver {
-        void onChange(SensorDataSet sensorDataSet);
-    }
 }

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

@@ -0,0 +1,11 @@
+package de.dennisguse.opentracks.sensors;
+
+import android.content.Context;
+import android.os.Handler;
+
+public interface SensorConnector {
+
+    void start(Context context, Handler handler);
+
+    void stop(Context context);
+}

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

@@ -0,0 +1,85 @@
+package de.dennisguse.opentracks.sensors;
+
+import android.content.Context;
+import android.os.Handler;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.sensors.sensorData.SensorData;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
+
+public class SensorManager {
+
+    private static final String TAG = SensorManager.class.getSimpleName();
+
+    private BluetoothRemoteSensorManager bluetoothSensorManager;
+
+    private AltitudeSumManager altitudeSumManager;
+
+    public SensorManager(Context context, Handler handler, SensorDataSetChangeObserver observer) {
+        bluetoothSensorManager = new BluetoothRemoteSensorManager(context, handler, observer);
+        altitudeSumManager = new AltitudeSumManager();
+    }
+
+    public void start(Context context, Handler handler) {
+        bluetoothSensorManager.start(context, handler);
+        altitudeSumManager.start(context, handler);
+    }
+
+    public void stop(Context context) {
+        if (bluetoothSensorManager != null) {
+            bluetoothSensorManager.stop(context);
+            bluetoothSensorManager = null;
+        }
+
+        if (altitudeSumManager != null) {
+            altitudeSumManager.stop(context);
+            altitudeSumManager = null;
+        }
+    }
+
+    public SensorDataSet fill(TrackPoint trackPoint) {
+        altitudeSumManager.fill(trackPoint);
+        return bluetoothSensorManager.fill(trackPoint);
+    }
+
+    public void reset() {
+        if (bluetoothSensorManager == null || altitudeSumManager == null) {
+            Log.d(TAG, "No recording running and no reset necessary.");
+            return;
+        }
+        bluetoothSensorManager.reset();
+        altitudeSumManager.reset();
+    }
+
+    @Deprecated
+    @VisibleForTesting
+    public BluetoothRemoteSensorManager getBluetoothSensorManager() {
+        return bluetoothSensorManager;
+    }
+
+    @Deprecated
+    @VisibleForTesting
+    public void setBluetoothSensorManager(BluetoothRemoteSensorManager remoteSensorManager) {
+        this.bluetoothSensorManager = remoteSensorManager;
+    }
+
+    @Deprecated
+    @VisibleForTesting
+    public AltitudeSumManager getAltitudeSumManager() {
+        return altitudeSumManager;
+    }
+
+    @Deprecated
+    @VisibleForTesting
+    public void setAltitudeSumManager(AltitudeSumManager altitudeSumManager) {
+        this.altitudeSumManager = altitudeSumManager;
+    }
+
+    @Deprecated
+    public interface SensorDataSetChangeObserver {
+        void onChange(SensorDataSet sensorDataSet);
+    }
+}

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

@@ -14,6 +14,7 @@ public class UintUtils {
      * @return diff
      */
     public static long diff(long a, long b, final long UINT_MAX) {
+
         if (a < 0 || b < 0) {
             throw new RuntimeException("a or b cannot be less than zero.");
         }
@@ -25,6 +26,6 @@ public class UintUtils {
             return a - b;
         }
 
-        return (UINT_MAX - b) + a;
+        return (UINT_MAX + 1 - b) + a;
     }
 }

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

@@ -1,7 +1,6 @@
 package de.dennisguse.opentracks.sensors.sensorData;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import java.time.Instant;
@@ -32,16 +31,6 @@ public abstract class SensorData<T> {
         this.time = time;
     }
 
-    @NonNull
-    public String getSensorAddress() {
-        return sensorAddress;
-    }
-
-    @Nullable
-    public String getSensorName() {
-        return sensorName;
-    }
-
     public String getSensorNameOrAddress() {
         return sensorName != null ? sensorName : sensorAddress;
     }

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

@@ -76,9 +76,8 @@ public class SensorDataCyclingCadence extends SensorData<Cadence> {
 
     @Override
     public boolean equals(@Nullable Object obj) {
-        if (!(obj instanceof SensorDataCyclingCadence)) return false;
+        if (!(obj instanceof SensorDataCyclingCadence comp)) return false;
 
-        SensorDataCyclingCadence comp = (SensorDataCyclingCadence) obj;
         if (hasData() && comp.hasData() == hasData()) {
             return getCrankRevolutionsCount() == comp.getCrankRevolutionsCount() && getCrankRevolutionsTime() == comp.getCrankRevolutionsTime();
         } else {

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

@@ -93,9 +93,8 @@ public class SensorDataCyclingDistanceSpeed extends SensorData<SensorDataCycling
 
     @Override
     public boolean equals(@Nullable Object obj) {
-        if (!(obj instanceof SensorDataCyclingDistanceSpeed)) return false;
+        if (!(obj instanceof SensorDataCyclingDistanceSpeed comp)) return false;
 
-        SensorDataCyclingDistanceSpeed comp = (SensorDataCyclingDistanceSpeed) obj;
         if (!(hasData() && comp.hasData())) {
             return false;
         }

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

@@ -111,7 +111,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         egm2008CorrectionManager = new EGM2008CorrectionManager();
         trackRecordingManager = new TrackRecordingManager(this);
         trackRecordingManager.start();
-        trackPointCreator = new TrackPointCreator(this);
+        trackPointCreator = new TrackPointCreator(this, this, handler);
 
         voiceAnnouncementManager = new VoiceAnnouncementManager(this);
         notificationManager = new TrackRecordingServiceNotificationManager(this);
@@ -177,7 +177,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     }
 
     public void resumeTrack(Track.Id trackId) {
-        trackPointCreator.reset();
         if (!trackRecordingManager.resumeExistingTrack(trackId, trackPointCreator)) {
             Log.w(TAG, "Cannot resume a non-existing track.");
             return;
@@ -328,7 +327,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         TrackPoint trackPoint = data.second.first;
         egm2008CorrectionManager.correctAltitude(this, trackPoint);
 
-        localVoiceAnnouncementManager.update(data.first);
+        localVoiceAnnouncementManager.update(this, data.first);
 
         recordingDataObservable.postValue(new RecordingData(data.first, trackPoint, data.second.second));
     }

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

@@ -28,6 +28,7 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 
 import de.dennisguse.opentracks.R;
@@ -67,17 +68,8 @@ public class VoiceAnnouncement {
         public void onAudioFocusChange(int focusChange) {
             Log.d(TAG, "Audio focus changed to " + focusChange);
 
-            boolean stop = false;
-            switch (focusChange) {
-                case AudioManager.AUDIOFOCUS_GAIN:
-                    stop = false;
-                    break;
-                case AudioManager.AUDIOFOCUS_LOSS:
-                case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
-                case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
-                    stop = true;
-                    break;
-            }
+            boolean stop = List.of(AudioManager.AUDIOFOCUS_LOSS, AudioManager.AUDIOFOCUS_LOSS_TRANSIENT, AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK)
+                    .contains(focusChange);
 
             if (stop && tts != null && tts.isSpeaking()) {
                 tts.stop();

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

@@ -15,12 +15,14 @@
  */
 package de.dennisguse.opentracks.services.announcement;
 
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.mediarouter.media.MediaRouter;
 
 import java.time.Duration;
 
@@ -73,12 +75,20 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
         updateNextTaskDistance();
     }
 
-    public void update(@NonNull Track track) {
+    public void update(@NonNull Context context, @NonNull Track track) {
         if (voiceAnnouncement == null) {
             Log.e(TAG, "Cannot update when in status shutdown.");
             return;
         }
 
+        if (!PreferencesUtils.shouldVoiceAnnouncementOnDeviceSpeaker()
+                && MediaRouter.getInstance(context)
+                .getSelectedRoute()
+                .isDeviceSpeaker()) {
+            Log.i(TAG, "No voice announcement on device speaker.");
+            return;
+        }
+
         boolean announce = false;
         this.trackStatistics = track.getTrackStatistics();
         if (trackStatistics.getTotalDistance().greaterThan(nextTotalDistance)) {

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

@@ -43,29 +43,28 @@ class VoiceAnnouncementUtils {
         String unitDistanceTTS;
         String unitSpeedTTS;
         switch (unitSystem) {
-            case METRIC:
+            case METRIC -> {
                 perUnitStringId = R.string.voice_per_kilometer;
                 distanceId = R.plurals.voiceDistanceKilometers;
                 speedId = R.plurals.voiceSpeedKilometersPerHour;
                 unitDistanceTTS = "kilometer";
                 unitSpeedTTS = "kilometer per hour";
-                break;
-            case IMPERIAL:
+            }
+            case IMPERIAL -> {
                 perUnitStringId = R.string.voice_per_mile;
                 distanceId = R.plurals.voiceDistanceMiles;
                 speedId = R.plurals.voiceSpeedMilesPerHour;
                 unitDistanceTTS = "mile";
                 unitSpeedTTS = "mile per hour";
-                break;
-            case NAUTICAL_IMPERIAL:
+            }
+            case NAUTICAL_IMPERIAL -> {
                 perUnitStringId = R.string.voice_per_nautical_mile;
                 distanceId = R.plurals.voiceDistanceNauticalMiles;
                 speedId = R.plurals.voiceSpeedMKnots;
                 unitDistanceTTS = "nautical mile";
                 unitSpeedTTS = "knots";
-                break;
-            default:
-                throw new RuntimeException("Not implemented");
+            }
+            default -> throw new RuntimeException("Not implemented");
         }
 
         double distanceInUnit = totalDistance.toKM_Miles(unitSystem);

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

@@ -20,14 +20,15 @@ import java.time.Instant;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.sensors.SensorConnector;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PermissionRequester;
 
 @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-public class GPSHandler implements LocationListenerCompat, GpsStatus.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
+public class GPSManager implements SensorConnector, LocationListenerCompat, GpsStatus.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private final String TAG = GPSHandler.class.getSimpleName();
+    private final String TAG = GPSManager.class.getSimpleName();
 
     public static final String LOCATION_PROVIDER = LocationManager.GPS_PROVIDER;
 
@@ -40,11 +41,11 @@ public class GPSHandler implements LocationListenerCompat, GpsStatus.GpsStatusLi
     private Duration gpsInterval;
     private Distance thresholdHorizontalAccuracy;
 
-    public GPSHandler(TrackPointCreator trackPointCreator) {
+    public GPSManager(TrackPointCreator trackPointCreator) {
         this.trackPointCreator = trackPointCreator;
     }
 
-    public void onStart(@NonNull Context context, @NonNull Handler handler) {
+    public void start(@NonNull Context context, @NonNull Handler handler) {
         this.context = context;
         this.handler = handler;
 
@@ -61,7 +62,7 @@ public class GPSHandler implements LocationListenerCompat, GpsStatus.GpsStatusLi
 
     @SuppressWarnings({"MissingPermission"})
     //TODO upgrade to AGP7.0.0/API31 started complaining about removeUpdates.
-    public void onStop() {
+    public void stop(Context context) {
         if (locationManager != null && context != null) {
             if (PermissionRequester.GPS.hasPermission(context)) {
                 LocationManagerCompat.removeUpdates(locationManager, this);

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

@@ -16,14 +16,13 @@ import java.time.ZoneId;
 
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.sensors.AltitudeSumManager;
-import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
+import de.dennisguse.opentracks.sensors.SensorManager;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 
 /**
  * Creates TrackPoints while recording by fusing data from different sensors (e.g., GNSS, barometer, BLE sensors).
  */
-public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDataSetChangeObserver {
+public class TrackPointCreator implements SensorManager.SensorDataSetChangeObserver {
 
     private static final String TAG = TrackPointCreator.class.getSimpleName();
 
@@ -34,45 +33,34 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
     @NonNull
     private Clock clock = new MonotonicClock();
 
-    private final GPSHandler gpsHandler;
-    private BluetoothRemoteSensorManager remoteSensorManager;
-    private AltitudeSumManager altitudeSumManager;
+    private final GPSManager gpsManager;
+    private SensorManager sensorManager;
 
-    public TrackPointCreator(Callback service) {
+    public TrackPointCreator(Callback service, Context context, Handler handler) {
         this.service = service;
-        this.gpsHandler = new GPSHandler(this);
+        this.gpsManager = new GPSManager(this);
+        this.sensorManager = new SensorManager(context, handler, this);
     }
 
     @VisibleForTesting
-    TrackPointCreator(GPSHandler gpsHandler, Callback service) {
+    TrackPointCreator(GPSManager gpsManager, Callback service) {
         this.service = service;
-        this.gpsHandler = gpsHandler;
+        this.gpsManager = gpsManager;
     }
 
     public synchronized void start(@NonNull Context context, @NonNull Handler handler) {
         this.context = context;
 
-        gpsHandler.onStart(context, handler);
-
-        remoteSensorManager = new BluetoothRemoteSensorManager(context, handler, this);
-        altitudeSumManager = new AltitudeSumManager();
-
-        remoteSensorManager.start();
-        altitudeSumManager.start(context, handler);
-
+        gpsManager.start(context, handler);
+        sensorManager.start(context, handler);
     }
 
     private boolean isStarted() {
         return context != null;
     }
 
-    public synchronized void reset() {
-        if (remoteSensorManager == null || altitudeSumManager == null) {
-            Log.d(TAG, "No recording running and no reset necessary.");
-            return;
-        }
-        remoteSensorManager.reset();
-        altitudeSumManager.reset();
+    private synchronized void reset() {
+        sensorManager.reset();
     }
 
     private SensorDataSet addSensorData(TrackPoint trackPoint) {
@@ -80,31 +68,12 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
             Log.w(TAG, "Not started, should not be called.");
             return null;
         }
-        SensorDataSet sensorDataSet = null;
-        BluetoothRemoteSensorManager localRemoteSensorManager = remoteSensorManager;
-        if (localRemoteSensorManager != null) {
-            sensorDataSet = localRemoteSensorManager.fill(trackPoint);
-        }
-        AltitudeSumManager localAltitudeSumManager = altitudeSumManager;
-        if (localAltitudeSumManager != null) {
-            localAltitudeSumManager.fill(trackPoint);
-        }
 
-        return sensorDataSet;
+        return sensorManager.fill(trackPoint);
     }
 
     public synchronized void stop() {
-        gpsHandler.onStop();
-
-        if (remoteSensorManager != null) {
-            remoteSensorManager.stop();
-            remoteSensorManager = null;
-        }
-
-        if (altitudeSumManager != null) {
-            altitudeSumManager.stop(context);
-            altitudeSumManager = null;
-        }
+        gpsManager.stop(context);
 
         this.context = null;
     }
@@ -125,7 +94,7 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
     public void onNewTrackPoint(@NonNull TrackPoint trackPoint) {
         addSensorData(trackPoint);
 
-        boolean stored = service.newTrackPoint(trackPoint, gpsHandler.getThresholdHorizontalAccuracy());
+        boolean stored = service.newTrackPoint(trackPoint, gpsManager.getThresholdHorizontalAccuracy());
         if (stored) {
             reset();
         }
@@ -169,26 +138,8 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
     }
 
     @VisibleForTesting
-    public AltitudeSumManager getAltitudeSumManager() {
-        return altitudeSumManager;
-    }
-
-    @Deprecated
-    @VisibleForTesting
-    public void setAltitudeSumManager(AltitudeSumManager altitudeSumManager) {
-        this.altitudeSumManager = altitudeSumManager;
-    }
-
-    @Deprecated
-    @VisibleForTesting
-    public BluetoothRemoteSensorManager getRemoteSensorManager() {
-        return remoteSensorManager;
-    }
-
-    @Deprecated
-    @VisibleForTesting
-    public void setRemoteSensorManager(BluetoothRemoteSensorManager remoteSensorManager) {
-        this.remoteSensorManager = remoteSensorManager;
+    public SensorManager getSensorManager() {
+        return sensorManager;
     }
 
     @VisibleForTesting
@@ -202,8 +153,8 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
     }
 
     @VisibleForTesting
-    public GPSHandler getGpsHandler() {
-        return gpsHandler;
+    public GPSManager getGpsHandler() {
+        return gpsManager;
     }
 
     void sendGpsStatus(GpsStatusValue gpsStatusValue) {

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

@@ -28,6 +28,7 @@ import androidx.preference.DialogPreference;
 import androidx.preference.PreferenceDialogFragmentCompat;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 
@@ -79,7 +80,7 @@ public class ActivityTypePreference extends DialogPreference {
             textView = view.findViewById(R.id.activity_type_preference_text_view);
             String category = PreferencesUtils.getDefaultActivity();
             textView.setText(category);
-            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(context, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+            ArrayAdapter<String> adapter = new ArrayAdapter<>(context, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(context));
             textView.setAdapter(adapter);
             textView.setOnItemClickListener((parent, v, position, id) -> {
                 String iconValue = TrackIconUtils.getIconValue(context, (String) textView.getAdapter().getItem(position));

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

@@ -68,18 +68,10 @@ public class DefaultsSettingsFragment extends PreferenceFragmentCompat implement
 
         ListPreference statsRatePreferences = findPreference(getString(R.string.stats_rate_key));
 
-        int entriesId;
-        switch (unitSystem) {
-            case METRIC:
-                entriesId = R.array.stats_rate_metric_options;
-                break;
-            case IMPERIAL:
-            case NAUTICAL_IMPERIAL:
-                entriesId = R.array.stats_rate_imperial_options;
-                break;
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        int entriesId = switch (unitSystem) {
+            case METRIC -> R.array.stats_rate_metric_options;
+            case IMPERIAL, NAUTICAL_IMPERIAL -> R.array.stats_rate_imperial_options;
+        };
 
         String[] entries = getResources().getStringArray(entriesId);
         statsRatePreferences.setEntries(entries);

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

@@ -64,7 +64,7 @@ public class ImportExportSettingsFragment extends PreferenceFragmentCompat {
             DocumentFile directory = IntentUtils.toDocumentFile(getContext(), directoryUri);
             //Use same value for not set as Androidx ListPreference and EditTextPreference
             if (directory == null) {
-                return getString(R.string.not_set);
+                return getString(androidx.preference.R.string.not_set);
             }
 
             return directoryUri + (directory.canWrite() ? "" : getString(R.string.export_dir_not_writable));

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

@@ -32,14 +32,9 @@ class PreferencesOpenHelper {
         PreferencesUtils.setInt(R.string.prefs_last_version_key, version);
         for (int i = 1; i <= version; i++) {
             switch (i) {
-                case 1:
-                    upgradeFrom0to1();
-                    break;
-                case 2:
-                    upgradeFrom1to2();
-                    break;
-                default:
-                    throw new RuntimeException("Not implemented: upgrade to " + version);
+                case 1 -> upgradeFrom0to1();
+                case 2 -> upgradeFrom1to2();
+                default -> throw new RuntimeException("Not implemented: upgrade to " + version);
             }
         }
     }

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

@@ -302,6 +302,11 @@ public class PreferencesUtils {
         return getBoolean(R.string.stats_fullscreen_while_recording_key, DEFAULT);
     }
 
+    public static boolean shouldVoiceAnnouncementOnDeviceSpeaker() {
+        final boolean DEFAULT = resources.getBoolean(R.bool.voice_on_device_speaker_default);
+        return getBoolean(R.string.voice_on_device_speaker_key, DEFAULT);
+    }
+
     public static Duration getVoiceAnnouncementFrequency() {
         final int DEFAULT = Integer.parseInt(resources.getString(R.string.voice_announcement_frequency_default));
         int value = getInt(R.string.voice_announcement_frequency_key, DEFAULT);
@@ -443,23 +448,21 @@ public class PreferencesUtils {
 
             String displayValue = formatter.formatDistance(distance);
             switch (unitSystem) {
-                case METRIC:
+                case METRIC -> {
                     if (value == recordingDistanceIntervalDefault) {
                         entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
                     } else {
                         entries[i] = displayValue;
                     }
-                    break;
-                case IMPERIAL:
-                case NAUTICAL_IMPERIAL:
+                }
+                case IMPERIAL, NAUTICAL_IMPERIAL -> {
                     if (value == recordingDistanceIntervalDefault) {
                         entries[i] = resources.getString(R.string.value_integer_feet_recommended, (int) distance.toFT());
                     } else {
                         entries[i] = displayValue;
                     }
-                    break;
-                default:
-                    throw new RuntimeException("Not implemented");
+                }
+                default -> throw new RuntimeException("Not implemented");
             }
         }
 
@@ -489,23 +492,21 @@ public class PreferencesUtils {
 
             String displayValue = formatter.formatDistance(distance);
             switch (unitSystem) {
-                case METRIC:
+                case METRIC -> {
                     if (value == maxRecordingDistanceDefault) {
                         entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
                     } else {
                         entries[i] = displayValue;
                     }
-                    break;
-                case IMPERIAL:
-                case NAUTICAL_IMPERIAL:
+                }
+                case IMPERIAL, NAUTICAL_IMPERIAL -> {
                     if (value == maxRecordingDistanceDefault) {
                         entries[i] = resources.getString(R.string.value_integer_feet_recommended, (int) distance.toFT());
                     } else {
                         entries[i] = displayValue;
                     }
-                    break;
-                default:
-                    throw new RuntimeException("Not implemented");
+                }
+                default -> throw new RuntimeException("Not implemented");
             }
         }
 
@@ -564,7 +565,7 @@ public class PreferencesUtils {
 
             String displayValue = formatter.formatDistance(distance);
             switch (unitSystem) {
-                case METRIC:
+                case METRIC -> {
                     if (value == recordingGPSAccuracyDefault) {
                         entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
                     } else if (value == recordingGPSAccuracyExcellent) {
@@ -574,9 +575,8 @@ public class PreferencesUtils {
                     } else {
                         entries[i] = displayValue;
                     }
-                    break;
-                case IMPERIAL:
-                case NAUTICAL_IMPERIAL:
+                }
+                case IMPERIAL, NAUTICAL_IMPERIAL -> {
                     if (value == recordingGPSAccuracyDefault) {
                         entries[i] = resources.getString(R.string.value_integer_feet_recommended, (int) distance.toFT());
                     } else if (value == recordingGPSAccuracyExcellent) {
@@ -584,9 +584,8 @@ public class PreferencesUtils {
                     } else {
                         entries[i] = displayValue;
                     }
-                    break;
-                default:
-                    throw new RuntimeException("Not implemented");
+                }
+                default -> throw new RuntimeException("Not implemented");
             }
         }
 
@@ -612,32 +611,30 @@ public class PreferencesUtils {
             float value = Float.parseFloat(entryValues[i]);
 
             switch (unitSystem) {
-                case METRIC:
+                case METRIC -> {
                     if (value == idleSpeedDefault) {
                         entries[i] = resources.getString(R.string.value_float_kilometer_hour_recommended, value);
                     } else {
                         entries[i] = resources.getString(R.string.value_float_kilometer_hour, value);
                     }
-                    break;
-                case IMPERIAL:
+                }
+                case IMPERIAL -> {
                     double valueMPH = Speed.ofKMH(value).toMPH();
-
                     if (value == idleSpeedDefault) {
                         entries[i] = resources.getString(R.string.value_float_mile_hour_recommended, valueMPH);
                     } else {
                         entries[i] = resources.getString(R.string.value_float_mile_hour, valueMPH);
                     }
-                    break;
-                case NAUTICAL_IMPERIAL:
+                }
+                case NAUTICAL_IMPERIAL -> {
                     double valueKnots = Speed.ofKMH(value).toKnots();
                     if (value == idleSpeedDefault) {
                         entries[i] = resources.getString(R.string.value_float_knots_recommended, valueKnots);
                     } else {
                         entries[i] = resources.getString(R.string.value_float_knots, valueKnots);
                     }
-                    break;
-                default:
-                    throw new RuntimeException("Not implemented");
+                }
+                default -> throw new RuntimeException("Not implemented");
             }
         }
 

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

@@ -45,7 +45,7 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
             if (newValue instanceof String) {
                 try {
                     int newValueInt = Integer.parseInt((String) newValue);
-                    return newValueInt > 500 && newValueInt < 4000;
+                    return newValueInt >= 100 && newValueInt < 4000;
                 } catch (NumberFormatException e) {
                     Log.w(TAG, "Entered string is no number.");
                 }

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

@@ -20,7 +20,6 @@ import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
 import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
 import de.dennisguse.opentracks.ui.customRecordingLayout.SettingsCustomLayoutEditAdapter;
 import de.dennisguse.opentracks.ui.util.ArrayAdapterFilterDisabled;
-import de.dennisguse.opentracks.util.StatisticsUtils;
 
 public class SettingsCustomLayoutEditActivity extends AbstractActivity implements SettingsCustomLayoutEditAdapter.SettingsCustomLayoutItemClickListener {
 
@@ -41,7 +40,7 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
         // Recycler view with visible stats.
         RecordingLayout recordingLayout = getIntent().getParcelableExtra(EXTRA_LAYOUT);
         profile = recordingLayout.getName();
-        recordingLayoutFieldsVisible = StatisticsUtils.filterVisible(recordingLayout, true);
+        recordingLayoutFieldsVisible = recordingLayout.toRecordingLayout(true);
         adapterFieldsVisible = new SettingsCustomLayoutEditAdapter(this, this, recordingLayoutFieldsVisible);
 
         numColumns = recordingLayout.getColumnsPerRow();
@@ -90,7 +89,7 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
         viewBinding.rowsOptions.setText(rowsOptionAdapter.getItem(numColumns - 1).toString(), false);
 
         // Recycler view with not visible stats.
-        recordingLayoutFieldsHidden = StatisticsUtils.filterVisible(recordingLayout, false);
+        recordingLayoutFieldsHidden = recordingLayout.toRecordingLayout(false);
         adapterFieldsHidden = new SettingsCustomLayoutEditAdapter(this, this, recordingLayoutFieldsHidden);
         RecyclerView recyclerViewNotVisible = viewBinding.recyclerViewNotVisible;
         recyclerViewNotVisible.setLayoutManager(new LinearLayoutManager(this));

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

@@ -96,8 +96,7 @@ public class BluetoothLeAdapter extends BaseAdapter {
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
-            if (!(o instanceof Device)) return false;
-            Device device = (Device) o;
+            if (!(o instanceof Device device)) return false;
             return address.equals(device.address);
         }
 

src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/DataField.java

@@ -87,4 +87,14 @@ public class DataField implements Parcelable {
     public int hashCode() {
         return Objects.hash(key, isVisible, isPrimary, isWide);
     }
+
+    @Override
+    public String toString() {
+        return "DataField{" +
+                "key='" + key + '\'' +
+                ", isVisible=" + isVisible +
+                ", isPrimary=" + isPrimary +
+                ", isWide=" + isWide +
+                '}';
+    }
 }

src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayout.java

@@ -66,6 +66,12 @@ public class RecordingLayout implements Parcelable {
         return new ArrayList<>(dataFields);
     }
 
+    public RecordingLayout toRecordingLayout(boolean visibility) {
+        RecordingLayout result = new RecordingLayout(this.getName());
+        result.addFields(dataFields.stream().filter(f -> f.isVisible() == visibility).collect(Collectors.toList()));
+        return result;
+    }
+
     public void moveField(int from, int to) {
         DataField dataFieldToMove = dataFields.remove(from);
         dataFields.add(to, dataFieldToMove);

src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java

@@ -16,6 +16,7 @@
 
 package de.dennisguse.opentracks.ui.markers;
 
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ -244,7 +245,12 @@ public class MarkerEditActivity extends AbstractActivity {
     private void createMarkerWithPicture() {
         Pair<Intent, Uri> intentAndPhotoUri = MarkerUtils.createTakePictureIntent(this, getTrackId());
         cameraPhotoUri = intentAndPhotoUri.second;
-        takePictureFromCamera.launch(intentAndPhotoUri.first);
+
+        try {
+            takePictureFromCamera.launch(intentAndPhotoUri.first);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this, R.string.no_compatible_camera_installed, Toast.LENGTH_LONG).show();
+        }
     }
 
     private void createMarkerWithGalleryImage() {
@@ -256,6 +262,10 @@ public class MarkerEditActivity extends AbstractActivity {
             intent = new Intent(Intent.ACTION_GET_CONTENT);
         }
         intent.setType("image/*");
-        takePictureFromGallery.launch(intent);
+        try {
+            takePictureFromGallery.launch(intent);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this, R.string.no_compatible_gallery_installed, Toast.LENGTH_LONG).show();
+        }
     }
 }

src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java

@@ -31,6 +31,8 @@ import androidx.loader.app.LoaderManager;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 
+import java.util.Objects;
+
 import de.dennisguse.opentracks.AbstractActivity;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -309,11 +311,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
         public void setSearch(String searchQuery) {
             this.searchQuery = searchQuery;
             restart();
-            if (searchQuery != null) {
-                viewBinding.bottomAppBarLayout.bottomAppBarTitle.setText(searchQuery);
-            } else {
-                viewBinding.bottomAppBarLayout.bottomAppBarTitle.setText(getString(R.string.menu_markers));
-            }
+            viewBinding.bottomAppBarLayout.bottomAppBarTitle.setText(Objects.requireNonNullElseGet(searchQuery, () -> getString(R.string.menu_markers)));
         }
 
         public void restart() {

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

@@ -7,8 +7,6 @@ import android.util.TypedValue;
 
 import androidx.core.content.ContextCompat;
 
-import de.dennisguse.opentracks.R;
-
 public class ThemeUtils {
 
     private ThemeUtils() {
@@ -42,14 +40,14 @@ public class ThemeUtils {
     }
 
     public static int getFontSizeSmallInPx(Context context) {
-        TypedArray typedArray = context.obtainStyledAttributes(R.style.TextAppearance_MaterialComponents_Body2, new int[]{android.R.attr.textSize});
+        TypedArray typedArray = context.obtainStyledAttributes(com.google.android.material.R.style.TextAppearance_MaterialComponents_Body2, new int[]{android.R.attr.textSize});
         int fontSize = typedArray.getDimensionPixelSize(0, 12);
         typedArray.recycle();
         return fontSize;
     }
 
     public static int getFontSizeMediumInPx(Context context) {
-        TypedArray typedArray = context.obtainStyledAttributes(R.style.TextAppearance_MaterialComponents_Body1, new int[]{android.R.attr.textSize});
+        TypedArray typedArray = context.obtainStyledAttributes(com.google.android.material.R.style.TextAppearance_MaterialComponents_Body1, new int[]{android.R.attr.textSize});
         int fontSize = typedArray.getDimensionPixelSize(0, 15);
         typedArray.recycle();
         return fontSize;

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

@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.ExportService;
@@ -56,7 +57,7 @@ public class ExportUtils {
     }
 
     public static boolean exportTrack(Context context, TrackFileFormat trackFileFormat, DocumentFile directory, Track track) {
-        TrackExporter trackExporter = trackFileFormat.createTrackExporter(context);
+        TrackExporter trackExporter = trackFileFormat.createTrackExporter(context, new ContentProviderUtils(context));
 
         Uri exportDocumentFileUri = getExportDocumentFileUri(context, track, trackFileFormat, directory);
         if (exportDocumentFileUri == null) {

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

@@ -29,6 +29,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.nio.channels.FileChannel;
 import java.util.ArrayList;
+import java.util.List;
 
 import de.dennisguse.opentracks.BuildConfig;
 import de.dennisguse.opentracks.data.models.Track;
@@ -162,34 +163,8 @@ public class FileUtils {
      * @param character the character
      */
     private static boolean isSpecialFat32(char character) {
-        switch (character) {
-            case '$':
-            case '%':
-            case '\'':
-            case '-':
-            case '_':
-            case '@':
-            case '~':
-            case '`':
-            case '!':
-            case '(':
-            case ')':
-            case '{':
-            case '}':
-            case '^':
-            case '#':
-            case '&':
-            case '+':
-            case ',':
-            case ';':
-            case '=':
-            case '[':
-            case ']':
-            case ' ':
-                return true;
-            default:
-                return false;
-        }
+        return List.of('$', '%', '\'', '-', '_', '@', '~', '`', '!', '(', ')', '{', '}', '^', '#', '&', '+', ',', ';', '=', '[', ']', ' ')
+                .contains(character);
     }
 
     /**

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

@@ -4,11 +4,8 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 
-import java.util.stream.Collectors;
-
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
 
 public class StatisticsUtils {
 
@@ -24,11 +21,4 @@ public class StatisticsUtils {
             return context.getString(R.string.stats_empty_value_integer);
         }
     }
-
-    @Deprecated //Add to Layout?
-    public static RecordingLayout filterVisible(RecordingLayout recordingLayout, boolean visible) {
-        RecordingLayout result = new RecordingLayout(recordingLayout.getName());
-        result.addFields(recordingLayout.getFields().stream().filter(f -> f.isVisible() == visible).collect(Collectors.toList()));
-        return result;
-    }
 }

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

@@ -18,15 +18,15 @@ package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.util.Pair;
 
 import androidx.annotation.NonNull;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
-import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 
 /**
  * Utilities for track icon.
@@ -35,219 +35,65 @@ import de.dennisguse.opentracks.R;
  */
 public class TrackIconUtils {
 
-    private static final String AIRPLANE = "AIRPLANE";
-    private static final String BIKE = "BIKE";
-    private static final String MOUNTAIN_BIKE = "MOUNTAIN_BIKE";
-    private static final String MOTOR_BIKE = "MOTOR_BIKE";
-    private static final String KAYAK = "KAYAK";
-    private static final String BOAT = "BOAT";
-    private static final String SAILING = "SAILING";
-    private static final String DRIVE = "DRIVE";
-    private static final String RUN = "RUN";
-    private static final String SKI = "SKI";
-    private static final String SNOW_BOARDING = "SNOW_BOARDING";
-    private static final String UNKNOWN = "UNKNOWN";
-    private static final String WALK = "WALK";
-    private static final String ESCOOTER = "ESCOOTER";
-    private static final String INLINE_SKATING = "INLINES_SKATING";
-    private static final String SKATE_BOARDING = "SKATE_BOARDING";
-    private static final String CLIMBING = "CLIMBING";
-    private static final String SWIMMING = "SWIMMING";
-    private static final String SWIMMING_OPEN = "SWIMMING_OPEN";
-    private static final String WORKOUT = "WORKOUT";
+    public static int getIconDrawable(String activityTypeId) {
+        Optional<ActivityType> found = Arrays.stream(ActivityType.values()).filter(
+                it -> it.getId().equals(activityTypeId)
+        ).findFirst();
 
-    private static final int ACTIVITY_UNKNOWN_LOGO = R.drawable.ic_logo_24dp;
+        return found.map(ActivityType::getIconId)
+                .orElseGet(ActivityType.UNKNOWN::getIconId);
 
-    private static final int[] AIRPLANE_LIST = new int[]{R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane};
-    private static final int[] BIKE_LIST = new int[]{R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_road_biking, R.string.activity_type_track_cycling};
-    private static final int[] BOAT_LIST = new int[]{R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat};
-    private static final int[] CLIMBING_LIST = new int[]{R.string.activity_type_climbing};
-    private static final int[] DRIVE_LIST = new int[]{R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car};
-    private static final int[] MOTOR_BIKE_LIST = new int[]{R.string.activity_type_motor_bike};
-    private static final int[] MOUNTAIN_BIKE_LIST = new int[]{R.string.activity_type_mountain_biking};
-    private static final int[] ESCOOTER_LIST = new int[]{R.string.activity_type_escooter};
-    private static final int[] INLINE_SKATING_LIST = new int[]{R.string.activity_type_inline_skating};
-    private static final int[] RUN_LIST = new int[]{R.string.activity_type_running, R.string.activity_type_street_running, R.string.activity_type_track_running, R.string.activity_type_trail_running};
-    private static final int[] SAILING_LIST = new int[]{R.string.activity_type_sailing};
-    private static final int[] SKI_LIST = new int[]{R.string.activity_type_cross_country_skiing, R.string.activity_type_skiing};
-    private static final int[] SNOW_BOARDING_LIST = new int[]{R.string.activity_type_snow_boarding};
-    private static final int[] SKATE_BOARDING_LIST = new int[]{R.string.activity_type_skate_boarding};
-    private static final int[] KAYAKING_LIST = new int[]{R.string.activity_type_kayaking};
-    private static final int[] WALK_LIST = new int[]{R.string.activity_type_hiking, R.string.activity_type_off_trail_hiking, R.string.activity_type_speed_walking, R.string.activity_type_trail_hiking, R.string.activity_type_walking};
-    private static final int[] SWIM_LIST = new int[]{R.string.activity_type_swimming, R.string.activity_type_swimming_open};
-    private static final int[] WORKOUT_LIST = new int[]{R.string.activity_type_workout};
-
-    // List of icons whose sports associated use speed (in km/h or mi/h).
-    private static final int[] SPEED_ICON = {
-            // Unknown.
-            R.string.activity_type_unknown,
-            // All airplane categories.
-            R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane,
-            // All bike categories.
-            R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_motor_bike, R.string.activity_type_mountain_biking, R.string.activity_type_road_biking, R.string.activity_type_track_cycling, R.string.activity_type_inline_skating,
-            // All boat categories.
-            R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat, R.string.activity_type_sailing, R.string.activity_type_kayaking,
-            // All drive categories.
-            R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car, R.string.activity_type_escooter, R.string.activity_type_skate_boarding,
-            // All wintersport categories
-            R.string.activity_type_skiing, R.string.activity_type_snow_boarding
-
-    };
-
-    //TODO Use Map.of()
-    private static final LinkedHashMap<String, Pair<Integer, Integer>> MAP = new LinkedHashMap<>();
-
-    static {
-        //Reflects order in ChooseActivityTypeDialogFragmentActivity
-        MAP.put(UNKNOWN, new Pair<>(R.string.activity_type_unknown, ACTIVITY_UNKNOWN_LOGO));
-        MAP.put(RUN, new Pair<>(R.string.activity_type_running, R.drawable.ic_activity_run_24dp));
-        MAP.put(WALK, new Pair<>(R.string.activity_type_walking, R.drawable.ic_activity_walk_24dp));
-        MAP.put(CLIMBING, new Pair<>(R.string.activity_type_climbing, R.drawable.ic_activity_climbing_24dp));
-        MAP.put(SKATE_BOARDING, new Pair<>(R.string.activity_type_skate_boarding, R.drawable.ic_activity_skateboarding_24dp));
-        MAP.put(INLINE_SKATING, new Pair<>(R.string.activity_type_inline_skating, R.drawable.ic_activity_inline_skating_24dp));
-        MAP.put(SNOW_BOARDING, new Pair<>(R.string.activity_type_snow_boarding, R.drawable.ic_activity_snowboarding_24dp));
-        MAP.put(SKI, new Pair<>(R.string.activity_type_skiing, R.drawable.ic_activity_skiing_24dp));
-        MAP.put(ESCOOTER, new Pair<>(R.string.activity_type_escooter, R.drawable.ic_activity_escooter_24dp));
-        MAP.put(BIKE, new Pair<>(R.string.activity_type_biking, R.drawable.ic_activity_bike_24dp));
-        MAP.put(MOUNTAIN_BIKE, new Pair<>(R.string.activity_type_mountain_biking, R.drawable.ic_activity_mtb_24dp));
-        MAP.put(MOTOR_BIKE, new Pair<>(R.string.activity_type_motor_bike, R.drawable.ic_activity_motorbike_24dp));
-        MAP.put(DRIVE, new Pair<>(R.string.activity_type_driving, R.drawable.ic_activity_drive_24dp));
-        MAP.put(AIRPLANE, new Pair<>(R.string.activity_type_airplane, R.drawable.ic_activity_flight_24dp));
-        MAP.put(KAYAK, new Pair<>(R.string.activity_type_kayaking, R.drawable.ic_activity_kayaking_24dp));
-        MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_activity_boat_24dp));
-        MAP.put(SAILING, new Pair<>(R.string.activity_type_sailing, R.drawable.ic_activity_sailing_24dp));
-        MAP.put(SWIMMING, new Pair<>(R.string.activity_type_swimming, R.drawable.ic_activity_swimming_24dp));
-        MAP.put(SWIMMING_OPEN, new Pair<>(R.string.activity_type_swimming_open, R.drawable.ic_activity_swimming_open_24dp));
-        MAP.put(WORKOUT, new Pair<>(R.string.activity_type_workout, R.drawable.ic_activity_workout_24dp));
     }
 
-    private TrackIconUtils() {
-    }
+    public static int getIconActivityType(String activityTypeId) {
+        Optional<ActivityType> found = Arrays.stream(ActivityType.values()).filter(
+                it -> it.getId().equals(activityTypeId)
+        ).findFirst();
 
-    /**
-     * Gets the icon drawable.
-     *
-     * @param iconValue the icon value
-     */
-    public static int getIconDrawable(String iconValue) {
-        if (iconValue == null || iconValue.equals("")) {
-            return ACTIVITY_UNKNOWN_LOGO;
-        }
-        Pair<Integer, Integer> pair = MAP.get(iconValue);
-        return pair == null ? ACTIVITY_UNKNOWN_LOGO : pair.second;
-    }
+        return found.map(ActivityType::getFirstLocalizedStringId)
+                .orElseGet(ActivityType.UNKNOWN::getFirstLocalizedStringId);
 
-    /**
-     * Gets the icon activity type.
-     *
-     * @param iconValue the icon value
-     */
-    public static int getIconActivityType(String iconValue) {
-        if (iconValue == null || iconValue.equals("")) {
-            return R.string.activity_type_unknown;
-        }
-        Pair<Integer, Integer> pair = MAP.get(iconValue);
-        return pair == null ? R.string.activity_type_unknown : pair.first;
     }
 
     /**
      * Gets all icon values.
      */
     public static List<String> getAllIconValues() {
-        return new ArrayList<>(MAP.keySet());
+        return Arrays.stream(ActivityType.values())
+                .map(ActivityType::getId)
+                .collect(Collectors.toList());
     }
 
     /**
      * Gets the icon value.
      *
-     * @param context      the context
-     * @param activityType the activity type
+     * @param context        the context
+     * @param activityTypeId the activity type
      */
     @NonNull
-    public static String getIconValue(Context context, String activityType) {
-        Resources resources = context.getResources();
-        if (activityType == null || activityType.equals("")) {
-            return UNKNOWN;
+    public static String getIconValue(Context context, String activityTypeId) {
+        Optional<ActivityType> selected = Arrays.stream(ActivityType.values())
+                .filter(
+                        it -> Arrays.stream(it.getLocalizedStringIds())
+                                .anyMatch(id -> context.getString(id).equals(activityTypeId))
+                )
+                .findFirst();
+        if (selected.isEmpty()) {
+            return ActivityType.UNKNOWN.getId();
         }
-        if (inList(resources, activityType, AIRPLANE_LIST)) {
-            return AIRPLANE;
-        }
-        if (inList(resources, activityType, BIKE_LIST)) {
-            return BIKE;
-        }
-        if (inList(resources, activityType, MOUNTAIN_BIKE_LIST)) {
-            return MOUNTAIN_BIKE;
-        }
-        if (inList(resources, activityType, CLIMBING_LIST)) {
-            return CLIMBING;
-        }
-        if (inList(resources, activityType, MOTOR_BIKE_LIST)) {
-            return MOTOR_BIKE;
-        }
-        if (inList(resources, activityType, KAYAKING_LIST)) {
-            return KAYAK;
-        }
-        if (inList(resources, activityType, BOAT_LIST)) {
-            return BOAT;
-        }
-        if (inList(resources, activityType, SAILING_LIST)) {
-            return SAILING;
-        }
-        if (inList(resources, activityType, DRIVE_LIST)) {
-            return DRIVE;
-        }
-        if (inList(resources, activityType, INLINE_SKATING_LIST)) {
-            return INLINE_SKATING;
-        }
-        if (inList(resources, activityType, ESCOOTER_LIST)) {
-            return ESCOOTER;
-        }
-        if (inList(resources, activityType, RUN_LIST)) {
-            return RUN;
-        }
-        if (inList(resources, activityType, SKI_LIST)) {
-            return SKI;
-        }
-        if (inList(resources, activityType, SNOW_BOARDING_LIST)) {
-            return SNOW_BOARDING;
-        }
-        if (inList(resources, activityType, SKATE_BOARDING_LIST)) {
-            return SKATE_BOARDING;
-        }
-        if (inList(resources, activityType, WALK_LIST)) {
-            return WALK;
-        }
-        if (inList(resources, activityType, SWIM_LIST)) {
-            return SWIMMING;
-        }
-        if (inList(resources, activityType, WORKOUT_LIST)) {
-            return WORKOUT;
-        }
-        return UNKNOWN;
+        return selected.get().getId();
     }
 
-    /**
-     * Returns true if the activity type is in the list.
-     *
-     * @param context      the context
-     * @param activityType the activity type
-     * @param list         the list
-     */
-    private static boolean inList(Resources context, String activityType, int[] list) {
-        for (int i : list) {
-            if (context.getString(i).equals(activityType)) {
-                return true;
-            }
-        }
-        return false;
-    }
+    public static boolean isSpeedIcon(Resources resources, String activityTypeId) {
+        Optional<ActivityType> selected = Arrays.stream(ActivityType.values())
+                .filter(
+                        it -> Arrays.stream(it.getLocalizedStringIds())
+                                .anyMatch(id -> resources.getString(id).equals(activityTypeId))
+                )
+                .findFirst();
+
+        return selected.map(ActivityType::isShowSpeedPreferred)
+                .orElse(false);
 
-    /**
-     * Returns true if category is in the SPEED_ICON array. Otherwise returns false.
-     *
-     * @param category the name of the category, activity type.
-     */
-    public static boolean isSpeedIcon(Resources resources, String category) {
-        return inList(resources, category, SPEED_ICON);
     }
 }

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

@@ -2,20 +2,15 @@ package de.dennisguse.opentracks.viewmodels;
 
 import android.util.Pair;
 import android.view.LayoutInflater;
-import android.view.View;
-
-import androidx.core.content.ContextCompat;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
-import de.dennisguse.opentracks.data.models.HeartRateZones;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.databinding.StatsGenericItemBinding;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.services.RecordingData;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
 import de.dennisguse.opentracks.util.StringUtils;
@@ -70,15 +65,20 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
         }
     }
 
-    public static class SpeedOrPace extends GenericStatisticsViewHolder {
+    public abstract static class SpeedOrPace extends GenericStatisticsViewHolder {
+
+        private final boolean reportSpeed;
+
+        public SpeedOrPace(boolean reportSpeed) {
+            this.reportSpeed = reportSpeed;
+        }
 
         @Override
         public void onChanged(UnitSystem unitSystem, RecordingData data) {
-            // TODO Pace wont work for now
-            boolean reportSpeed = true;
             SpeedFormatter localSpeedFormatter = SpeedFormatter.Builder()
                     .setUnit(unitSystem)
-                    .setReportSpeedOrPace(reportSpeed).build(getContext());
+                    .setReportSpeedOrPace(reportSpeed)
+                    .build(getContext());
 
             Pair<String, String> valueAndUnit;
 
@@ -90,7 +90,9 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
             } else {
                 Speed speed = latestTrackPoint != null && latestTrackPoint.hasSpeed() ? latestTrackPoint.getSpeed() : null;
                 valueAndUnit = localSpeedFormatter.getSpeedParts(speed);
-                getBinding().statsDescriptionMain.setText(getContext().getString(R.string.description_speed_source_gps));
+
+                String title = reportSpeed ? getContext().getString(R.string.stats_speed) : getContext().getString(R.string.stats_pace);
+                getBinding().statsDescriptionMain.setText(title);
             }
 
             getBinding().statsValue.setText(valueAndUnit.first);
@@ -98,6 +100,20 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
         }
     }
 
+    public static class SpeedVH extends SpeedOrPace {
+
+        public SpeedVH() {
+            super(true);
+        }
+    }
+
+    public static class PaceVH extends SpeedOrPace {
+
+        public PaceVH() {
+            super(false);
+        }
+    }
+
     public static class AverageMovingSpeed extends GenericStatisticsViewHolder {
 
         @Override
@@ -258,84 +274,4 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
             getBinding().statsDescriptionMain.setText(R.string.stats_coordinates);
         }
     }
-
-    public static class SensorHeartRate extends GenericStatisticsViewHolder {
-
-        @Override
-        public void onChanged(UnitSystem unitSystem, RecordingData data) {
-            SensorDataSet sensorDataSet = data.getSensorDataSet();
-            String sensorName = getContext().getString(R.string.value_unknown);
-
-            //TODO Loads preference every time
-            HeartRateZones zones = PreferencesUtils.getHeartRateZones();
-            int textColor;
-
-            Pair<String, String> valueAndUnit;
-            if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
-                valueAndUnit = StringUtils.getHeartRateParts(getContext(), sensorDataSet.getHeartRate().first);
-                sensorName = sensorDataSet.getHeartRate().second;
-                textColor = zones.getColorForZone(sensorDataSet.getHeartRate().first);
-            } else {
-                valueAndUnit = StringUtils.getHeartRateParts(getContext(), null);
-                textColor = zones.getColorForZone(null);
-            }
-
-            getBinding().statsValue.setText(valueAndUnit.first);
-            getBinding().statsUnit.setText(valueAndUnit.second);
-            getBinding().statsDescriptionMain.setText(R.string.stats_sensors_heart_rate);
-
-            getBinding().statsDescriptionSecondary.setVisibility(View.VISIBLE);
-            getBinding().statsDescriptionSecondary.setText(sensorName);
-
-            getBinding().statsValue.setTextColor(ContextCompat.getColor(getContext(), textColor));
-        }
-    }
-
-    public static class SensorCadence extends GenericStatisticsViewHolder {
-
-        @Override
-        public void onChanged(UnitSystem unitSystem, RecordingData data) {
-            SensorDataSet sensorDataSet = data.getSensorDataSet();
-            String sensorName = getContext().getString(R.string.value_unknown);
-
-            Pair<String, String> valueAndUnit;
-            if (sensorDataSet != null && sensorDataSet.getCadence() != null) {
-                valueAndUnit = StringUtils.getCadenceParts(getContext(), sensorDataSet.getCadence().first);
-                sensorName = sensorDataSet.getCadence().second;
-            } else {
-                valueAndUnit = StringUtils.getCadenceParts(getContext(), null);
-            }
-
-            getBinding().statsValue.setText(valueAndUnit.first);
-            getBinding().statsUnit.setText(valueAndUnit.second);
-            getBinding().statsDescriptionMain.setText(R.string.stats_sensors_cadence);
-
-            getBinding().statsDescriptionSecondary.setVisibility(View.VISIBLE);
-            getBinding().statsDescriptionSecondary.setText(sensorName);
-        }
-    }
-
-    public static class SensorPower extends GenericStatisticsViewHolder {
-
-        @Override
-        public void onChanged(UnitSystem unitSystem, RecordingData data) {
-            SensorDataSet sensorDataSet = data.getSensorDataSet();
-            String sensorName = getContext().getString(R.string.value_unknown);
-
-            Pair<String, String> valueAndUnit;
-            if (sensorDataSet != null && sensorDataSet.getCyclingPower() != null) {
-                valueAndUnit = StringUtils.getPowerParts(getContext(), sensorDataSet.getCyclingPower().getValue());
-                sensorName = sensorDataSet.getCyclingPower().getSensorNameOrAddress();
-            } else {
-                valueAndUnit = StringUtils.getCadenceParts(getContext(), null);
-            }
-
-            getBinding().statsValue.setText(valueAndUnit.first);
-            getBinding().statsUnit.setText(valueAndUnit.second);
-            getBinding().statsDescriptionMain.setText(R.string.stats_sensors_power);
-
-            getBinding().statsDescriptionSecondary.setVisibility(View.VISIBLE);
-            getBinding().statsDescriptionSecondary.setText(sensorName);
-        }
-    }
 }

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

@@ -17,8 +17,8 @@ public class Mapping {
 
         m.put(context.getString(R.string.stats_custom_layout_distance_key), GenericStatisticsViewHolder.Distance::new);
 
-        m.put(context.getString(R.string.stats_custom_layout_speed_key), GenericStatisticsViewHolder.SpeedOrPace::new);
-        m.put(context.getString(R.string.stats_custom_layout_pace_key), GenericStatisticsViewHolder.SpeedOrPace::new);
+        m.put(context.getString(R.string.stats_custom_layout_speed_key), GenericStatisticsViewHolder.SpeedVH::new);
+        m.put(context.getString(R.string.stats_custom_layout_pace_key), GenericStatisticsViewHolder.PaceVH::new);
         m.put(context.getString(R.string.stats_custom_layout_average_moving_speed_key), GenericStatisticsViewHolder.AverageMovingSpeed::new);
         m.put(context.getString(R.string.stats_custom_layout_average_speed_key), GenericStatisticsViewHolder.AverageSpeed::new);
         m.put(context.getString(R.string.stats_custom_layout_max_speed_key), GenericStatisticsViewHolder.MaxSpeed::new);
@@ -31,9 +31,9 @@ public class Mapping {
         m.put(context.getString(R.string.stats_custom_layout_loss_key), GenericStatisticsViewHolder.Loss::new);
         m.put(context.getString(R.string.stats_custom_layout_coordinates_key), GenericStatisticsViewHolder.Coordinates::new);
 
-        m.put(context.getString(R.string.stats_custom_layout_heart_rate_key), GenericStatisticsViewHolder.SensorHeartRate::new);
-        m.put(context.getString(R.string.stats_custom_layout_cadence_key), GenericStatisticsViewHolder.SensorCadence::new);
-        m.put(context.getString(R.string.stats_custom_layout_power_key), GenericStatisticsViewHolder.SensorPower::new);
+        m.put(context.getString(R.string.stats_custom_layout_heart_rate_key), SensorStatisticsViewHolder.SensorHeartRate::new);
+        m.put(context.getString(R.string.stats_custom_layout_cadence_key), SensorStatisticsViewHolder.SensorCadence::new);
+        m.put(context.getString(R.string.stats_custom_layout_power_key), SensorStatisticsViewHolder.SensorPower::new);
         m.put(context.getString(R.string.stats_custom_layout_clock_key), ClockViewHolder::new);
 
         return m;

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

@@ -0,0 +1,108 @@
+package de.dennisguse.opentracks.viewmodels;
+
+import android.util.Pair;
+import android.view.LayoutInflater;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.HeartRateZones;
+import de.dennisguse.opentracks.databinding.StatsSensorItemBinding;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
+import de.dennisguse.opentracks.services.RecordingData;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.settings.UnitSystem;
+import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
+import de.dennisguse.opentracks.util.StringUtils;
+
+public abstract class SensorStatisticsViewHolder extends StatisticViewHolder<StatsSensorItemBinding> {
+
+    @Override
+    protected StatsSensorItemBinding createViewBinding(LayoutInflater inflater) {
+        return StatsSensorItemBinding.inflate(inflater);
+    }
+
+    @Override
+    public void configureUI(DataField dataField) {
+        getBinding().statsValue.setTextAppearance(getContext(), dataField.isPrimary() ? R.style.TextAppearance_OpenTracks_PrimaryValue : R.style.TextAppearance_OpenTracks_SecondaryValue);
+        getBinding().statsDescriptionMain.setTextAppearance(getContext(), dataField.isPrimary() ? R.style.TextAppearance_OpenTracks_PrimaryHeader : R.style.TextAppearance_OpenTracks_SecondaryHeader);
+    }
+
+    public static class SensorHeartRate extends SensorStatisticsViewHolder {
+
+        @Override
+        public void onChanged(UnitSystem unitSystem, RecordingData data) {
+            SensorDataSet sensorDataSet = data.getSensorDataSet();
+            String sensorName = getContext().getString(R.string.value_unknown);
+
+            Pair<String, String> valueAndUnit;
+            if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
+                valueAndUnit = StringUtils.getHeartRateParts(getContext(), sensorDataSet.getHeartRate().first);
+                sensorName = sensorDataSet.getHeartRate().second;
+            } else {
+                valueAndUnit = StringUtils.getHeartRateParts(getContext(), null);
+            }
+
+            //TODO Loads preference every time
+            HeartRateZones zones = PreferencesUtils.getHeartRateZones();
+            int textColor;
+            if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
+                textColor = zones.getTextColorForZone(getContext(), sensorDataSet.getHeartRate().first);
+            } else {
+                textColor = zones.getTextColorForZone(getContext(), null);
+            }
+
+            getBinding().statsValue.setText(valueAndUnit.first);
+            getBinding().statsUnit.setText(valueAndUnit.second);
+            getBinding().statsDescriptionMain.setText(R.string.stats_sensors_heart_rate);
+
+            getBinding().statsDescriptionSecondary.setText(sensorName);
+
+            getBinding().statsValue.setTextColor(textColor);
+        }
+    }
+
+    public static class SensorCadence extends SensorStatisticsViewHolder {
+
+        @Override
+        public void onChanged(UnitSystem unitSystem, RecordingData data) {
+            SensorDataSet sensorDataSet = data.getSensorDataSet();
+            String sensorName = getContext().getString(R.string.value_unknown);
+
+            Pair<String, String> valueAndUnit;
+            if (sensorDataSet != null && sensorDataSet.getCadence() != null) {
+                valueAndUnit = StringUtils.getCadenceParts(getContext(), sensorDataSet.getCadence().first);
+                sensorName = sensorDataSet.getCadence().second;
+            } else {
+                valueAndUnit = StringUtils.getCadenceParts(getContext(), null);
+            }
+
+            getBinding().statsValue.setText(valueAndUnit.first);
+            getBinding().statsUnit.setText(valueAndUnit.second);
+            getBinding().statsDescriptionMain.setText(R.string.stats_sensors_cadence);
+
+            getBinding().statsDescriptionSecondary.setText(sensorName);
+        }
+    }
+
+    public static class SensorPower extends SensorStatisticsViewHolder {
+
+        @Override
+        public void onChanged(UnitSystem unitSystem, RecordingData data) {
+            SensorDataSet sensorDataSet = data.getSensorDataSet();
+            String sensorName = getContext().getString(R.string.value_unknown);
+
+            Pair<String, String> valueAndUnit;
+            if (sensorDataSet != null && sensorDataSet.getCyclingPower() != null) {
+                valueAndUnit = StringUtils.getPowerParts(getContext(), sensorDataSet.getCyclingPower().getValue());
+                sensorName = sensorDataSet.getCyclingPower().getSensorNameOrAddress();
+            } else {
+                valueAndUnit = StringUtils.getCadenceParts(getContext(), null);
+            }
+
+            getBinding().statsValue.setText(valueAndUnit.first);
+            getBinding().statsUnit.setText(valueAndUnit.second);
+            getBinding().statsDescriptionMain.setText(R.string.stats_sensors_power);
+
+            getBinding().statsDescriptionSecondary.setText(sensorName);
+        }
+    }
+}

src/main/res/layout/stats_sensor_item.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp">
+
+    <TextView
+        android:id="@+id/stats_value"
+        style="@style/TextAppearance.OpenTracks.PrimaryValue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:value="@string/value_unknown"
+        app:layout_constraintEnd_toStartOf="@id/stats_unit"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="90" />
+
+    <TextView
+        android:id="@+id/stats_unit"
+        style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="@id/stats_value"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/stats_value"
+        tools:text="@string/sensor_unit_beats_per_minute" />
+
+    <TextView
+        android:id="@+id/stats_description_main"
+        style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/stats_value"
+        tools:text="@string/sensor_state_heart_rate" />
+
+    <TextView
+        android:id="@+id/stats_description_secondary"
+        style="@style/TextAppearance.OpenTracks.SecondaryHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/stats_description_main"
+        tools:text="90" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>