Release: v4.5.0

mode.

.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

.github/workflows/test.yml.disabled

@@ -1,3 +1,6 @@
+# We have flaky test results due to performance limitations in Github Actions.
+# Happens too often nowadays; See https://github.com/OpenTracksApp/OpenTracks/issues/1409
+
 #https://github.com/marketplace/actions/android-emulator-runner
 name: Test
 on:

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>
 
-<a href="https://weblate.bubu1.eu/engage/OpenTracks/">
-	<img src="https://weblate.bubu1.eu/widgets/OpenTracks/-/opentracks/horizontal-auto.svg" alt="Translation status" />
+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" />
 </a>
 
 ## Screenshots
@@ -129,6 +131,7 @@ The Public API is disabled by default to protect the user's privacy, but it can
 | [Golden Cheetah 3.5](https://www.goldencheetah.org/) | ?                                              | [no](https://github.com/GoldenCheetah/GoldenCheetah/issues/4271)     | [no](https://github.com/GoldenCheetah/GoldenCheetah/issues/4271)     |
 | [GpxPod](https://apps.nextcloud.com/apps/gpxpod)     | ?                                              | ?                                                                    | ?                                                                    |
 | [OsmAnd](https://github.com/osmandapp/OsmAnd)        | ?                                              | [no](https://github.com/osmandapp/OsmAnd/issues/15271)               | [no](https://github.com/osmandapp/OsmAnd/issues/15271)               |
+| [FitTrackee](https://github.com/SamR1/FitTrackee)    | yes                                            | n/a                                                                  | n/a                                                                  |
 
 ## Dashboard API (incl. map)
 
@@ -149,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,10 +17,10 @@ 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
+Application id: `de.dennisguse.opentracks.playstore`
 
 Requirement: `gem install fastlane`
 
@@ -35,4 +35,6 @@ Supported languages: https://support.google.com/googleplay/android-developer/tab
 
 ## Translations (localization)
 
-Translations of the OpenTracks are handled in Weblate: [https://weblate.bubu1.eu/projects/OpenTracks/](https://weblate.bubu1.eu/projects/OpenTracks/).
+Translations of the OpenTracks are handled in
+Weblate: [https://hosted.weblate.org/projects/opentracks/](https://hosted.weblate.org/projects/opentracks)
+.

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.1.0-beta04'
     }
 }
 
@@ -47,25 +47,30 @@ android {
     compileOptions {
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    compileSdk 33
+    compileSdk 34
 
     buildFeatures {
         viewBinding true
+        buildConfig true
+    }
+
+    androidResources {
+        generateLocaleConfig = true
     }
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 5051
-        versionName "v4.1.1"
+        versionCode 5262
+        versionName "v4.5.0"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
         minSdk 21
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "de.dennisguse.opentracks.TestRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -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,23 +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.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.gridlayout:gridlayout:1.0.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.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'org.mockito:mockito-android:4.8.0'
+    androidTestImplementation 'androidx.test:core:1.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test:rules:1.5.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'org.mockito:mockito-android:5.4.0'
 
-    androidTestUtil 'androidx.test:orchestrator:1.4.1'
+    androidTestUtil 'androidx.test:orchestrator:1.4.2'
 }

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

@@ -7,5 +7,5 @@ Changes:
 Bugfix:
 - Speech announcements use MAY_DUCK (again)
 - ChartView shows markers (again)
-- Fixed landscape layout of TrackListActivity
+- Fixed landscape recordingLayout of TrackListActivity
 - Request legacy file API behavior (necessary for Android 10)

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

@@ -0,0 +1,11 @@
+v4.1.2: OpenTracks
+
+Changes:
+- Voice announcements only use on decimal for distance
+
+Bugfix:
+- Crash when stopping (race condition)
+
+Developer:
+- Github actions: disabled instrumentation testing (too slow)
+- Tests are done with only fake GPS data

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

@@ -0,0 +1,8 @@
+v4.2.0: OpenTracks
+
+Changes:
+- Show heartrate zone information
+
+Developer:
+- Migrated to hosted.weblate.org
+- Recording UI uses Views directly

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/en-US/changelogs/5222.txt

@@ -0,0 +1,4 @@
+v4.4.0: OpenTracks
+
+Changes:
+- Export all tracks as one file

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

@@ -0,0 +1,14 @@
+v4.5.0: OpenTracks
+
+Changes:
+- Material3 
+- App shortcut for aggregated statistics
+- New Unit: miles with meters
+
+Bugfix:
+- GPS disabled warnings shown repeatedly (#1429)
+
+Developer:
+- Use Java Records
+- Target API34
+- Refactor sensor handling

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

@@ -0,0 +1,16 @@
+v3.18.6: OpenTracks
+
+Athruithe:
+- "Taispeáin ar léarscáil" - feidhmiúlacht trí KML in ionad KMZ
+- Ní chuimsíonn fógra gutha ainm na haipe
+- Agus é ag taifeadadh: déantar gnóthachan/caillteanas ingearchló a nuashonrú gach soicind
+- Tuairiscí an tsiopa aistrithe
+
+Maoláin:
+- Aistriúcháin fógartha gutha seasta neamhbhailí
+
+Forbróir:
+- ceadanna Android12 (BLUETOOTH_SCAN)
+- ceadanna Android12 (ACCESS_COARSE_LOCATION)
+- Ag dearbhú do Trackpoints (tástáil)
+- Aistriúcháin neamhúsáidte bainte

fastlane/metadata/android/ga/changelogs/4396.txt

@@ -0,0 +1,8 @@
+v3.19.1: OpenTracks
+
+Athruithe:
+- Aistriúcháin nuashonraithe.
+
+Ceartúchán Bug:
+- Easpórtáil Gach Rianta fabht seasta.
+- Lean bug Track socraithe.

fastlane/metadata/android/ga/changelogs/4410.txt

@@ -0,0 +1,7 @@
+v3.20.0: OpenTracks
+
+Athruithe:
+- Agus tú ag taifeadadh: tá UI staitisticí inchumraithe anois
+
+Ceartúchán Bug:
+- Níor tugadh aird ar athrú ainm/catagóir an traic le linn an taifeadta (a tugadh isteach i v3.19.0)

fastlane/metadata/android/ga/changelogs/4441.txt

@@ -0,0 +1,6 @@
+v3.20.1: OpenTracks
+
+Athruithe:
+- Is féidir fógraí a úsáid anois de réir achair agus ama
+- Bíp fógraí mura bhfuil aon bhogearraí Téacs-go-hurlabhra suiteáilte
+- Baineadh minicíocht oiriúnaitheach suíomh GPS

fastlane/metadata/android/ga/changelogs/4519.txt

@@ -0,0 +1,11 @@
+v3.22.0: OpenTracks
+
+Athruithe:
+- Ní stórálfar láithreacha ach amháin má thaistilítear > an t-eatramh faid a thaifeadtar
+   (feidhmiúlacht fágtha bainte den bhrath díomhaoin/neamhdhíomhaoin)
+- Is féidir Chomhéadain a chumrú chun clog a thaispeáint
+- Is féidir luas díomhaoin a chumrú anois
+
+Ceartúchán Bug:
+- Eatraimh: tuairteála nuair a stóráiltear gnóthachan ach ní caillteanas
+- Agus tú ag taifeadadh: seachain tuairteáil agus fógraí gutha á ndíchumasú

fastlane/metadata/android/ga/changelogs/4580.txt

@@ -0,0 +1,10 @@
+v3.23.0: OpenTracks
+
+Athruithe:
+- Cuireadh próifílí Chomhéadain leis
+- Staitisticí comhiomlánaithe le haghaidh rianta roghnaithe
+- TrackPoints díomhaoin/neamhdhomhaoin athfhorfheidhmithe de réir mar a stop an t-am bogtha ag obair (tugtha isteach in v3.22.0)
+
+Ceartúcháin fhabht:
+- Braiteoirí BLE: sonraí soiléire maidir le dínascadh
+- Ní mór an t-easpórtáil uathoibríoch a cheadú go fóill

fastlane/metadata/android/ga/changelogs/4752.txt

@@ -0,0 +1,11 @@
+v3.25.0: OpenTracks
+
+Athruithe:
+- Tá GPS roghnach anois lena n-áirítear. Rabhadh GPS díchumasaithe
+- PublicAPI: is féidir le feidhmchláir eile sonraí taifeadta a fháil anois má thosaíonn siad ar thaifeadadh (curtha i bhfeidhm do Gadgetbridge)
+- Gníomhaíochtaí nua: snámh, snámh oscailte, agus workout
+- Baineadh feidhmiúlacht pic sciar
+
+Ceartúchán Bug:
+- Chomhéadain: luas / airde nuair a léim idir 0.0 agus an luach iarbhír
+- Is féidir rianta le emojis a onnmhairiú

fastlane/metadata/android/ga/changelogs/4755.txt

@@ -0,0 +1,5 @@
+v3.25.1: OpenTracks
+
+Ceartúchán Bug:
+- Easpórtáil uathoibríoch: tá súil againn teipeanna ciúine a chosc
+- Easpórtáil uathoibríoch: cosc tuairteála

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

@@ -0,0 +1,8 @@
+v3.26.0: OpenTracks
+
+Athruithe:
+- Is féidir fógraí gutha a chumrú
+- Fógraí gutha faoi ráta croí
+
+Ceartúchán Bug:
+- Tuairteála mar gheall ar riocht cine

fastlane/metadata/android/ga/changelogs/4775.txt

@@ -0,0 +1,4 @@
+v3.26.1: OpenTracks
+
+Ceartúchán Bug:
+- Níor sháraigh barra gníomhaíochta comhthéacsúla an barra uirlisí i dtéama na hoíche.

fastlane/metadata/android/ga/changelogs/4926.txt

@@ -0,0 +1,13 @@
+v4.0.1: OpenTracks
+
+Athruithe:
+- Is féidir fógraí gutha a chumrú anois
+- Folaíonn mód lánscáileáin anois barra nascleanúna Android freisin
+- Ba cheart go mbeadh nasc le braiteoirí BLE níos tapúla anois
+- Ceadaigh socruithe a athshocrú agus tú ag taifeadadh
+- Ceadaigh socruithe iompórtála/easpórtála a athrú agus tú ag taifeadadh
+- KML/KMZ: ná húsáid deilbhíní le luchtú ó Google
+
+Ceartúchán Bug:
+- Oibríonn TrackStoppedActivity ar scáileáin níos lú anois
+- Iarratas ar cheadanna ar an rianliosta

fastlane/metadata/android/ga/changelogs/4938.txt

@@ -0,0 +1,10 @@
+v4. 0. 2: OpenTracks
+
+Athruithe:
+- - Agus muirmhíle 
+- Is féidir socruithe a athshocrú agus taifeadadh á dhéanamh
+
+Ceartúcháin:
+- Fógra gutha slánú
+- Cairt: bhí ingearchló smoothed weirdly
+- Ní raibh easpórtáil ag seiceáil an bhfuil an comhad ann

fastlane/metadata/android/ga/changelogs/4951.txt

@@ -0,0 +1,8 @@
+v4.0. 3: OpenTracks
+
+Athruithe:
+ Sonraíocht: Max. luas mar a thuairiscigh braiteoir (GPS nó BLE)
+
+Ceartúcháin:
+- Cosc ar thuairteáil mura bhfuil Painéal Na Nionstraimí OSM suiteáilte
+- Easpórtáil rian GPX: ná heaspórtáil deighleáin an amhráin folamh

fastlane/metadata/android/ga/changelogs/4981.txt

@@ -0,0 +1,13 @@
+v4. 0. 4: OpenTracks
+
+Athruithe:
+- Stóráil sonraí braiteoir BLE fiú gan achar (gach 10s)
+- PUBLIC API: ceadaíonn leagan ainm, catagóir, agus cur síos
+
+Ceartúcháin:
+- Tuairteála nuair a ghlacadh pictiúr agus rothlach an fón
+- 
+
+Forbróir:
+ Sprioc-SDK 33
+- Baraiméadar úsáideann eatramh de 5s

fastlane/metadata/android/ga/changelogs/4986.txt

@@ -0,0 +1,7 @@
+v4. 0. 5: OpenTracks
+
+Athruithe:
+- - PlayStore release faigh lógó eile
+
+Ceartúcháin:
+- Taispeánann liosta eatramh " - " mura bhfuil gnóthachan/caillteanas i láthair

fastlane/metadata/android/ga/changelogs/4993.txt

@@ -0,0 +1,5 @@
+v4.0. 6: OpenTracks 
+
+Ceartúcháin:
+- Egm2008 fhritháireamh mícheart ríomh le haghaidh domhanfhad diúltach
+- - Crashed API poiblí má Bhí Rianta Oscailte sa chúlra (26 AIBREÁN+)

fastlane/metadata/android/ga/changelogs/5004.txt

@@ -0,0 +1,10 @@
+v4. 0. 7: OpenTracks
+
+Athruithe:
+- Gps comhartha caillte teorainn ama: 30s
+- - Android 13: cead a iarraidh chun fógraí a thaispeáint
+- Scrios rianta níos tapúla (bunachar sonraí folúis amháin más gá)
+
+Ceartúcháin:
+- PublicAPI stop ordú mar thoradh ar tuairteála (a tugadh isteach i v4. 0. 6)
+- Ceadanna: ceadanna a iarraidh le linn tosaithe

fastlane/metadata/android/ga/changelogs/5017.txt

@@ -0,0 +1,11 @@
+v4. 0. 8: OpenTracks
+
+Athruithe:
+- Airde a thaispeántar i gcónaí i m/ft
+- Taispeáin crios ama an riain mura bhfuil sé éagsúil le crios ama na feiste
+- PublicAPI: tacaíocht deilbhín an riain a shocrú go sainráite
+
+Forbróir:
+- A Tugadh Isteach Cianfhormáideoir
+- Uasghrádú GO AGP 7.3/desugar Ar Feadh Ré.aicme
+- Android12+: déan splancscáileán trí Androidx

fastlane/metadata/android/ga/changelogs/5042.txt

@@ -0,0 +1,8 @@
+v4. 1. 0: OpenTracks
+
+Athruithe:
+- Easpórtáil leagan KML/KMZ 2. 3 amháin (2. 2)
+- Le haghaidh crank-bhunaithe powermeters: faigh cadence
+
+Ceartúcháin:
+- Workaround do tuairteála ar "iompórtáil gach rud"

fastlane/metadata/android/ga/changelogs/5051.txt

@@ -0,0 +1,7 @@
+v4.1. 1: OpenTracks
+
+Athruithe:
+- Cuir scáileán réamhrá leis (taispeáin uair amháin)
+
+Ceartúcháin:
+- Ná tuairteála mura bhfuil gléas GPS i láthair

fastlane/metadata/android/ga/full_description.txt

@@ -0,0 +1,22 @@
+Cairde rianaithe spóirt a bhfuil meas aige ar do phríobháideachas.
+
+Tugann gníomhaíochtaí spóirt agus lasmuigh sonas, scil agus muinín.
+
+Cuir luach ar do shláinte trí súil a choinneáil ar d'oiliúint.
+Taifeadann tú de réir mar a théann tú ag rith nó ag siúl, agus tugann sé ríomhaire rothar duit le scáileán níos mó le haghaidh rothaíochta.
+Marcáil láithreacha suimiúla ar do bhealach le pictiúir.
+Coinnigh staitisticí taifeadta go mion go leor le haghaidh anailíse.
+Comhroinn ach na sonraí a theastaíonn uait a bheith ag daoine eile.
+
+* Fógraí gutha.
+* Tacaíonn braiteoirí Bluetooth LE: ráta croí, luas agus fad (rothaíocht), deireadh (rothaíocht), agus méadar cumhachta (rothaíocht).
+* Gnóthachan agus caillteanas airde: trí bhraiteoir barometric.
+* Airde léirithe in EGM2008 (os cionn meánleibhéal na farraige); onnmhairiú mar WGS84.
+* Easpórtáil sonraí mar rianta mar KMZ (grianghraif san áireamh), KML, nó GPX.
+* Gan rochtain ar an Idirlíon nó ceadanna breise.
+* Téama dorcha agus éadrom, ag urramú socruithe an chórais.
+* Gan fógraí.
+
+Bogearraí Libre / Bogearraí Saor in Aisce / Foinse Oscailte
+rud a chiallaíonn gur féidir leat an cód foinse a úsáid, a staidéar, a athrú agus a roinnt.
+Ceadúnaithe Apache 2.0

fastlane/metadata/android/ga/short_description.txt

@@ -0,0 +1 @@
+Cairde rianaithe spóirt a bhfuil meas aige ar do phríobháideachas.

fastlane/metadata/android/ga/title.txt

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

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 +1,2 @@
-android.useAndroidX=true
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx1024m

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 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.1.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,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,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,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 +76,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/EspressoDeleteTrackTest.java

@@ -11,6 +11,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anything;
+import static de.dennisguse.opentracks.util.EspressoUtils.childAtPosition;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
@@ -30,7 +31,7 @@ public class EspressoDeleteTrackTest {
     public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
 
     @Rule
-    public GrantPermissionRule mGrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
+    public GrantPermissionRule mGrantPermissionRule = TestUtil.createGrantPermissionRule();
 
     @Test
     public void espressoDeleteTrackTest() {
@@ -51,7 +52,15 @@ public class EspressoDeleteTrackTest {
         onData(anything()).inAdapterView(withId(R.id.track_list)).atPosition(0).perform(longClick());
 
         // open menu and delete selected track
-        onView(allOf(withContentDescription("More options"), isDisplayed()))
+        //TODO openActionBarOverflowOrOptionsMenu(); doesn't work
+        onView(
+                allOf(withContentDescription("More options"),
+                        childAtPosition(
+                                childAtPosition(
+                                        withId(androidx.appcompat.R.id.action_mode_bar),
+                                        1),
+                                2),
+                        isDisplayed()))
                 .perform(click());
 
         onView(withText("Delete")).perform(click());

src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java

@@ -15,6 +15,8 @@ import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 
+import android.Manifest;
+
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -38,7 +40,7 @@ public class EspressoEditTrackRecordingTest {
     public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
 
     @Rule
-    public GrantPermissionRule mGrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
+    public GrantPermissionRule mGrantPermissionRule = TestUtil.createGrantPermissionRule();
 
     @LargeTest
     @Test

src/androidTest/java/de/dennisguse/opentracks/EspressoUITest.java

@@ -13,6 +13,8 @@ import static org.hamcrest.Matchers.anything;
 import static de.dennisguse.opentracks.util.EspressoUtils.selectTabAtIndex;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 
+import android.Manifest;
+
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -31,8 +33,7 @@ public class EspressoUITest {
     public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
 
     @Rule
-    public GrantPermissionRule mGrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
+    public GrantPermissionRule mGrantPermissionRule = TestUtil.createGrantPermissionRule();
     @LargeTest
     @Test
     public void record_stop_resume_stop_finish() {

src/androidTest/java/de/dennisguse/opentracks/TestUtil.java

@@ -0,0 +1,18 @@
+package de.dennisguse.opentracks;
+
+import android.Manifest;
+import android.os.Build;
+
+import androidx.test.rule.GrantPermissionRule;
+
+import de.dennisguse.opentracks.test.BuildConfig;
+
+public class TestUtil {
+
+    public static GrantPermissionRule createGrantPermissionRule() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.POST_NOTIFICATIONS);
+        }
+        return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT);
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java

@@ -27,7 +27,7 @@ public class ChartPointTest {
         statistics.setTotalTime(Duration.ofSeconds(1000));
 
         // when
-        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), false, UnitSystem.IMPERIAL);
+        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), false, UnitSystem.IMPERIAL_FEET);
 
         // then
         assertEquals(1000000, (long) point.getTimeOrDistance());

src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java

@@ -96,16 +96,7 @@ public class TestDataUtil {
         return new TrackData(track, trackPoints, markers);
     }
 
-    public static class TrackData {
-        public final Track track;
-        public final List<TrackPoint> trackPoints;
-        public final List<Marker> markers;
-
-        public TrackData(Track track, List<TrackPoint> trackPoints, List<Marker> markers) {
-            this.track = track;
-            this.trackPoints = trackPoints;
-            this.markers = markers;
-        }
+    public record TrackData(Track track, List<TrackPoint> trackPoints, List<Marker> markers) {
     }
 
 

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

@@ -424,7 +424,7 @@ public class CustomContentProviderUtilsTest {
         Marker.Id markerId = new Marker.Id(System.currentTimeMillis());
         marker.setId(markerId);
         ContentValues contentValues = contentProviderUtils.createContentValues(marker);
-        assertEquals(markerId.getId(), contentValues.get(MarkerColumns._ID));
+        assertEquals(markerId.id(), contentValues.get(MarkerColumns._ID));
         assertEquals((int) (TestDataUtil.INITIAL_LONGITUDE * 1000000), contentValues.get(MarkerColumns.LONGITUDE));
         assertEquals(TEST_DESC, contentValues.get(MarkerColumns.DESCRIPTION));
     }
@@ -458,7 +458,7 @@ public class CustomContentProviderUtilsTest {
         when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);
 
         Marker marker = contentProviderUtils.createMarker(cursorMock);
-        assertEquals(id, marker.getId().getId());
+        assertEquals(id, marker.getId().id());
         assertEquals(name, marker.getName());
         assertEquals(trackId, marker.getTrackId().getId());
     }

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

@@ -67,7 +67,7 @@ public class TrackSelectionTest extends TestCase {
     @Test
     public void testFilterBuildSelection_onlyOneCategory() {
         // given
-        TrackSelection filter = new TrackSelection().addCategory("running");
+        TrackSelection filter = new TrackSelection().addActivityType("running");
 
         // when
         SelectionData selection = filter.buildSelection();
@@ -82,10 +82,10 @@ public class TrackSelectionTest extends TestCase {
     public void testFilterBuildSelection_severalCategories() {
         // given
         TrackSelection filter = new TrackSelection()
-                .addCategory("running")
-                .addCategory("road biking")
-                .addCategory("mountain biking")
-                .addCategory("trail walking");
+                .addActivityType("running")
+                .addActivityType("road biking")
+                .addActivityType("mountain biking")
+                .addActivityType("trail walking");
 
         // when
         SelectionData selection = filter.buildSelection();
@@ -136,8 +136,8 @@ public class TrackSelectionTest extends TestCase {
                 .addTrackId(trackId1)
                 .addTrackId(trackId2)
                 .addTrackId(trackId3)
-                .addCategory("running")
-                .addCategory("road biking");
+                .addActivityType("running")
+                .addActivityType("road biking");
 
         // when
         SelectionData selection = filter.buildSelection();
@@ -188,8 +188,8 @@ public class TrackSelectionTest extends TestCase {
         long oneDay = 24 * 60 * 60 * 1000;
 
         TrackSelection filter = new TrackSelection()
-                .addCategory("running")
-                .addCategory("road biking")
+                .addActivityType("running")
+                .addActivityType("road biking")
                 .addDateRange(instant, instant.plusMillis(oneDay));
 
         // when

src/androidTest/java/de/dennisguse/opentracks/data/models/DistanceFormatterTest.java

@@ -35,7 +35,7 @@ public class DistanceFormatterTest {
     public void testFormatDistance_imperial() {
         DistanceFormatter formatter = DistanceFormatter.Builder()
                 .setDecimalCount(2)
-                .setUnit(UnitSystem.IMPERIAL)
+                .setUnit(UnitSystem.IMPERIAL_FEET)
                 .build(context);
 
         // A large number in imperial

src/androidTest/java/de/dennisguse/opentracks/data/models/SpeedFormatterTest.java

@@ -36,7 +36,7 @@ public class SpeedFormatterTest {
     public void testGetSpeedParts_pace_imperial() {
         SpeedFormatter formatter = SpeedFormatter.Builder()
                 .setDecimalCount(2)
-                .setUnit(UnitSystem.IMPERIAL)
+                .setUnit(UnitSystem.IMPERIAL_FEET)
                 .setReportSpeedOrPace(false)
                 .build(context);
 
@@ -72,7 +72,7 @@ public class SpeedFormatterTest {
     public void testGetSpeedParts_speed_imperial() {
         SpeedFormatter formatter = SpeedFormatter.Builder()
                 .setDecimalCount(2)
-                .setUnit(UnitSystem.IMPERIAL)
+                .setUnit(UnitSystem.IMPERIAL_FEET)
                 .setReportSpeedOrPace(true)
                 .build(context);
 

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

@@ -12,19 +12,16 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Looper;
 
-import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,7 +57,6 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
 import de.dennisguse.opentracks.sensors.AltitudeSumManager;
-import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadence;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
@@ -73,6 +69,9 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
 
 /**
  * Export a track to {@link TrackFileFormat} and verify that the import is identical.
+ * <p>
+ * Note: those tests are affected by {@link de.dennisguse.opentracks.sensors.sensorData.SensorData}.isRecent().
+ * If the test device is too slow (like in a CI) these are likely to fail as the sensor data will be omitted from actual.
  */
 @RunWith(AndroidJUnit4.class)
 public class ExportImportTest {
@@ -82,9 +81,6 @@ public class ExportImportTest {
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
 
-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
     //For csv_export_only() as we the timezone is hardcoded in the expectation.
     @Rule
     public TimezoneRule timezoneRule = new TimezoneRule(TimeZone.getTimeZone("Europe/Berlin"));
@@ -100,7 +96,7 @@ public class ExportImportTest {
     private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
 
     private static final String TRACK_ICON = "the track icon";
-    private static final String TRACK_CATEGORY = "the category";
+    private static final String TRACK_ACTIVITY_TYPE = "the activity type";
     private static final String TRACK_DESCRIPTION = "the description";
 
     private File tmpFile;
@@ -157,18 +153,18 @@ public class ExportImportTest {
         mockBLESensorData(trackPointCreator, 15f, sensorDistance, 66f, 3f, 50f);
 
         trackPointCreator.setClock("2020-02-02T02:02:14Z");
-        mockBLESensorData(trackPointCreator, 15f, null, 66f, 3f, 50f);
+        mockBLESensorData(trackPointCreator, 15f, null, 67f, 3f, 50f);
         trackPointCreator.setClock("2020-02-02T02:02:15Z");
-        mockBLESensorData(trackPointCreator, null, null, 66f, 3f, 50f);
+        mockBLESensorData(trackPointCreator, null, null, 68f, 3f, 50f);
 
         trackPointCreator.setClock("2020-02-02T02:02:16Z");
-        mockBLESensorData(trackPointCreator, 5f, Distance.of(2), 66f, 3f, 50f); // Distance will be added to next TrackPoint
+        mockBLESensorData(trackPointCreator, 5f, Distance.of(2), 69f, 3f, 50f); // Distance will be added to next TrackPoint
 
         sendLocation(trackPointCreator, "2020-02-02T02:02:17Z", 3, 14.001, 10, 13, 15, 10, 0);
         service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);
 
         trackPointCreator.setClock("2020-02-02T02:02:18Z");
-        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, null, trackPointCreator));
+        trackPointCreator.getSensorManager().sensorDataSet = new SensorDataSet();
         service.endCurrentTrack();
 
         trackPointCreator.setClock("2020-02-02T02:03:20Z");
@@ -181,12 +177,11 @@ 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(new BluetoothRemoteSensorManager(context, null, trackPointCreator));
         service.endCurrentTrack();
 
         Track track = contentProviderUtils.getTrack(trackId);
         track.setIcon(TRACK_ICON);
-        track.setCategory(TRACK_CATEGORY);
+        track.setActivityType(TRACK_ACTIVITY_TYPE);
         track.setDescription(TRACK_DESCRIPTION);
         contentProviderUtils.updateTrack(track);
 
@@ -206,11 +201,11 @@ 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
-        trackExporter.writeTrack(track, context.getContentResolver().openOutputStream(tmpFileUri));
+        trackExporter.writeTrack(List.of(track), context.getContentResolver().openOutputStream(tmpFileUri));
         contentProviderUtils.deleteTrack(context, trackId);
 
         // 2. import
@@ -221,7 +216,7 @@ public class ExportImportTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals(track.getCategory(), importedTrack.getCategory());
+        assertEquals(track.getActivityType(), importedTrack.getActivityType());
         assertEquals(track.getDescription(), importedTrack.getDescription());
         assertEquals(track.getName(), importedTrack.getName());
         assertEquals(track.getIcon(), importedTrack.getIcon());
@@ -289,10 +284,10 @@ 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));
+        trackExporter.writeTrack(List.of(track), context.getContentResolver().openOutputStream(tmpFileUri));
 
         // 2. import
         InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri);
@@ -312,11 +307,11 @@ 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
-        trackExporter.writeTrack(track, context.getContentResolver().openOutputStream(tmpFileUri));
+        trackExporter.writeTrack(List.of(track), context.getContentResolver().openOutputStream(tmpFileUri));
         contentProviderUtils.deleteTrack(context, trackId);
 
         // 2. import
@@ -328,7 +323,7 @@ public class ExportImportTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals(track.getCategory(), importedTrack.getCategory());
+        assertEquals(track.getActivityType(), importedTrack.getActivityType());
         assertEquals(track.getDescription(), importedTrack.getDescription());
         assertEquals(track.getName(), importedTrack.getName());
 
@@ -359,7 +354,7 @@ public class ExportImportTest {
                         .setAltitudeLoss(1f)
                         .setAltitudeGain(1f)
                         .setSensorDistance(Distance.of(14))
-                        .setHeartRate(66f)
+                        .setHeartRate(69)
                         .setPower(50f)
                         .setCadence(3f)
                         .setHorizontalAccuracy(Distance.of(10)),
@@ -430,11 +425,11 @@ 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
-        trackExporter.writeTrack(track, context.getContentResolver().openOutputStream(tmpFileUri));
+        trackExporter.writeTrack(List.of(track), context.getContentResolver().openOutputStream(tmpFileUri));
 
         // 2. import
         InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri);
@@ -447,7 +442,6 @@ public class ExportImportTest {
         assertNull(trackImported);
     }
 
-    @Ignore(value = "TODO Fails on CI; works on API24 and API30 locally")
     @LargeTest
     @Test
     public void csv_export_only() throws TimeoutException, IOException {
@@ -456,11 +450,11 @@ 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
-        trackExporter.writeTrack(track, context.getContentResolver().openOutputStream(tmpFileUri));
+        trackExporter.writeTrack(List.of(track), context.getContentResolver().openOutputStream(tmpFileUri));
         contentProviderUtils.deleteTrack(context, trackId);
 
         // then
@@ -498,37 +492,34 @@ public class ExportImportTest {
     }
 
     private void mockBLESensorData(TrackPointCreator trackPointCreator, Float speed, Distance distance, float heartRate, float cadence, Float power) {
-        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, null, trackPointCreator) {
-            @Override
-            public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
-                SensorDataSet sensorDataSet = new SensorDataSet();
-                sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
-                sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));
 
-                SensorDataCyclingCadence cyclingCadence = Mockito.mock(SensorDataCyclingCadence.class);
-                Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
-                Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
-                sensorDataSet.set(cyclingCadence);
+            SensorDataSet sensorDataSet = new SensorDataSet();
+            sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
+            sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));
 
-                if (distance != null && speed != null) {
-                    SensorDataCyclingDistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCyclingDistanceSpeed.Data.class);
-                    Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
-                    Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
-                    SensorDataCyclingDistanceSpeed distanceSpeed = Mockito.mock(SensorDataCyclingDistanceSpeed.class);
-                    Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
-                    Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
-                    sensorDataSet.set(distanceSpeed);
-                }
+            SensorDataCyclingCadence cyclingCadence = Mockito.mock(SensorDataCyclingCadence.class);
+            Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
+            Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
+            sensorDataSet.set(cyclingCadence);
 
-                sensorDataSet.fillTrackPoint(trackPoint);
-                return sensorDataSet;
-            }
-        });
-        trackPointCreator.onChange(new SensorDataSet());
+        if (distance != null && speed != null) {
+            SensorDataCyclingDistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCyclingDistanceSpeed.Data.class);
+            Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
+            Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
+            SensorDataCyclingDistanceSpeed distanceSpeed = Mockito.mock(SensorDataCyclingDistanceSpeed.class);
+            Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
+            Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
+            sensorDataSet.set(distanceSpeed);
+        }
+
+        trackPointCreator.getSensorManager().sensorDataSet = sensorDataSet;
+        trackPointCreator.onChange(sensorDataSet);
+
+        //TODO Might require: getSensorManager().sensorDataSet = 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);
     }
@@ -547,6 +538,6 @@ public class ExportImportTest {
         mockAltitudeChange(trackPointCreator, altitudeGain);
 
         trackPointCreator.setClock(time);
-        trackPointCreator.getGpsHandler().onLocationChanged(location);
+        trackPointCreator.onChange(location);
     }
 }

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

@@ -79,7 +79,7 @@ public class GPXTrackImporterTest {
         // 2. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("the category", importedTrack.getCategory());
+        assertEquals("the category", importedTrack.getActivityType());
         assertEquals("the description", importedTrack.getDescription());
         assertEquals("2021-01-07 22:51", importedTrack.getName());
         assertEquals("UNKNOWN", importedTrack.getIcon());
@@ -133,7 +133,7 @@ public class GPXTrackImporterTest {
         // 2. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getCategory());
+        assertEquals("", importedTrack.getActivityType());
         assertEquals("", importedTrack.getDescription());
         assertEquals("20210907_213924.gpx", importedTrack.getName());
         assertEquals("", importedTrack.getIcon());
@@ -181,7 +181,7 @@ public class GPXTrackImporterTest {
         // 2. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getCategory());
+        assertEquals("", importedTrack.getActivityType());
         assertEquals("", importedTrack.getDescription());
         assertEquals("20210907_213924.gpx", importedTrack.getName());
         assertEquals("", importedTrack.getIcon());
@@ -231,8 +231,8 @@ public class GPXTrackImporterTest {
         importTrackId = importer.importFile(inputStream).get(0);
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
 
-        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
-        trackExporter.writeTrack(importedTrack, outputStream);
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context, contentProviderUtils);
+        trackExporter.writeTrack(List.of(importedTrack), outputStream);
 
         // then
         String expected = new BufferedReader(

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

@@ -70,7 +70,7 @@ public class KMLTrackImporterTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getCategory());
+        assertEquals("", importedTrack.getActivityType());
         assertEquals("", importedTrack.getDescription());
         assertEquals("", importedTrack.getName());
         assertEquals("", importedTrack.getIcon());
@@ -119,7 +119,7 @@ public class KMLTrackImporterTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getCategory());
+        assertEquals("", importedTrack.getActivityType());
         assertEquals("", importedTrack.getDescription());
         assertEquals("", importedTrack.getName());
         assertEquals("", importedTrack.getIcon());
@@ -159,7 +159,7 @@ public class KMLTrackImporterTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("unknown", importedTrack.getCategory());
+        assertEquals("unknown", importedTrack.getActivityType());
         assertEquals("Test Track", importedTrack.getDescription());
         assertEquals("2020-11-28 18:06", importedTrack.getName());
         assertEquals("UNKNOWN", importedTrack.getIcon());

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

@@ -1,47 +1,55 @@
 package de.dennisguse.opentracks.sensors;
 
+import static org.mockito.Mockito.when;
+
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import de.dennisguse.opentracks.data.models.AtmosphericPressure;
+import de.dennisguse.opentracks.sensors.driver.BarometerInternal;
 
 /**
  * NOTE: Test data is completely artificial.
  */
+@RunWith(MockitoJUnitRunner.class)
 public class AltitudeSumManagerTest {
 
-    private final AltitudeSumManager subject = new AltitudeSumManager();
-
     private static void addSensorValue(AltitudeSumManager altitudeSumManager, float[] values) {
         for (float f : values) {
-            altitudeSumManager.onSensorValueChanged(f);
+            altitudeSumManager.onSensorValueChanged(AtmosphericPressure.ofHPA(f));
         }
     }
 
-    @Before
-    public void setUp() {
-        subject.reset();
-    }
+    @Mock
+    BarometerInternal driver;
 
     @Test
     public void getAltitudeGainLoss_downhill() {
         // given
-        subject.setConnected(true);
+        AltitudeSumManager subject = new AltitudeSumManager(driver);
+
+        when(driver.isConnected()).thenReturn(true);
 
         // then
-        addSensorValue(subject, new float[]{1015f, 1015.01f, 1015.02f, 1015.03f, 1015.04f, 1015.05f, 1015.06f, 1015.07f, 1015.08f, 1015.09f, 1015.10f, 1015.11f, 1015.12f, 1015.13f, 1015.14f, 1015.15f});
+        addSensorValue(subject, new float[]{1015f, 1015.01f, 1015.02f, 1015.03f, 1015.04f, 1015.05f, 1015.06f, 1015.07f, 1015.08f, 1015.09f, 1015.10f, 1015.11f, 1015.12f, 1015.13f, 1018f, 1018.1f, 1018.1f, 1018.1f, 1018.1f});
 
         // then
         Assert.assertEquals(0f, subject.getAltitudeGain_m(), 0.01);
-        Assert.assertEquals(48.0, subject.getAltitudeLoss_m(), 0.01);
+        Assert.assertEquals(15f, subject.getAltitudeLoss_m(), 0.01);
     }
 
     @Test
     public void sensorUnavailable() {
         // given
-        subject.setConnected(false);
+        AltitudeSumManager subject = new AltitudeSumManager(driver);
+
+        when(driver.isConnected()).thenReturn(true);
 
         // then
-        subject.onSensorValueChanged(999f);
+        subject.onSensorValueChanged(AtmosphericPressure.ofHPA(999f));
 
         // then
         Assert.assertNull(subject.getAltitudeGain_m());

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

@@ -7,8 +7,10 @@ import android.bluetooth.BluetoothGattCharacteristic;
 
 import org.junit.Test;
 
+import de.dennisguse.opentracks.data.models.AtmosphericPressure;
 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
@@ -19,32 +21,45 @@ public class BluetoothUtilsTest {
     @Test
     public void parseHeartRate_uint8() {
         // given
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEARTRATE.getServiceUUID(), 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEARTRATE.serviceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x02, 0x3C});
 
         // when
-        int heartRate = BluetoothUtils.parseHeartRate(characteristic);
+        HeartRate heartRate = BluetoothUtils.parseHeartRate(characteristic);
 
         // then
-        assertEquals(60, heartRate);
+        assertEquals(HeartRate.of(60), heartRate);
     }
 
     @Test
     public void parseHeartRate_uint16() {
         // given
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEARTRATE.getServiceUUID(), 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEARTRATE.serviceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x01, 0x01, 0x01});
 
         // when
-        int heartRate = BluetoothUtils.parseHeartRate(characteristic);
+        HeartRate heartRate = BluetoothUtils.parseHeartRate(characteristic);
 
         // then
-        assertEquals(257, heartRate);
+        assertEquals(HeartRate.of(257), heartRate);
+    }
+
+    @Test
+    public void parseEnvironmentalSensing_Pa() {
+        // given
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.BAROMETRIC_PRESSURE.serviceUUID(), 0, 0);
+        characteristic.setValue(new byte[]{(byte) 0xB2, (byte) 0x48, (byte) 0x0F, (byte) 0x00});
+
+        // when
+        AtmosphericPressure pressure = BluetoothUtils.parseEnvironmentalSensing(characteristic);
+
+        // then
+        assertEquals(AtmosphericPressure.ofPA(100165), pressure);
     }
 
     @Test
     public void parseCyclingSpeedCadence_crankOnly() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.getServiceUUID(), 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.serviceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x02, (byte) 0xC8, 0x00, 0x00, 0x00, 0x06, (byte) 0x99});
 
         // when
@@ -57,7 +72,7 @@ public class BluetoothUtilsTest {
 
     @Test
     public void parseCyclingSpeedCadence_wheelOnly() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.getServiceUUID(), 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.serviceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x01, (byte) 0xFF, (byte) 0xFF, 0, 1, 0x45, (byte) 0x99});
 
         // when
@@ -70,7 +85,7 @@ public class BluetoothUtilsTest {
 
     @Test
     public void parseCyclingSpeedCadence_crankWheel() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.getServiceUUID(), 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.serviceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x03, (byte) 0xC8, 0x00, 0x00, 0x01, 0x06, (byte) 0x99, (byte) 0xE1, 0x00, 0x45, (byte) 0x99});
 
         // when
@@ -83,34 +98,34 @@ public class BluetoothUtilsTest {
 
     @Test
     public void parseCyclingPower_power() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER.getServiceUUID(), 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER.serviceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0, 0, 40, 0});
 
         // when
         SensorDataCyclingPower.Data powerCadence = BluetoothUtils.parseCyclingPower("", "", characteristic);
 
         // then
-        assertEquals(40, powerCadence.getPower().getValue().getW(), 0.01);
+        assertEquals(40, powerCadence.power().getValue().getW(), 0.01);
     }
 
     @Test
     public void parseCyclingPower_power_with_cadence() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER.getServiceUUID(), 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER.serviceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x2C, 0x00, 0x00, 0x00, (byte) 0x9F, 0x00, 0x0C, 0x00, (byte) 0xE5, 0x42});
 
         // when
         SensorDataCyclingPower.Data powerCadence = BluetoothUtils.parseCyclingPower("", "", characteristic);
 
         // then
-        assertEquals(0, powerCadence.getPower().getValue().getW(), 0.01);
+        assertEquals(0, powerCadence.power().getValue().getW(), 0.01);
 
-        assertEquals(12, powerCadence.getCadence().getCrankRevolutionsCount());
-        assertEquals(17125, powerCadence.getCadence().getCrankRevolutionsTime());
+        assertEquals(12, powerCadence.cadence().getCrankRevolutionsCount());
+        assertEquals(17125, powerCadence.cadence().getCrankRevolutionsTime());
     }
 
     @Test
     public void parseRunningSpeedAndCadence_with_distance() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.RUNNING_SPEED_CADENCE.getServiceUUID(), 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.RUNNING_SPEED_CADENCE.serviceUUID(), 0, 0);
         characteristic.setValue(new byte[]{2, 0, 5, 80, (byte) 0xFF, (byte) 0xFF, 0, 1});
 
         // when

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

@@ -5,6 +5,8 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 
+import de.dennisguse.opentracks.data.models.AtmosphericPressure;
+
 public class PressureSensorUtilsTest {
 
     // real data at 500Hz stationary
@@ -12,11 +14,11 @@ public class PressureSensorUtilsTest {
     public void altitudeChanges_none() {
         // given
         float[] sensorValues_hPa = new float[]{1015.6876f, 1015.699f, 1015.70905f, 1015.71075f, 1015.7224f, 1015.72f, 1015.7373f, 1015.7481f, 1015.74133f, 1015.73553f, 1015.7462f, 1015.74896f, 1015.752f, 1015.754f, 1015.7456f, 1015.73303f, 1015.7288f, 1015.7239f, 1015.7298f, 1015.7387f, 1015.72534f, 1015.72577f, 1015.72797f, 1015.71796f, 1015.7113f, 1015.7097f, 1015.7096f, 1015.7013f, 1015.7072f, 1015.71063f, 1015.7088f, 1015.7115f, 1015.713f, 1015.7121f, 1015.7062f, 1015.7062f, 1015.6994f, 1015.69617f, 1015.68945f, 1015.698f, 1015.6913f, 1015.69696f, 1015.69293f, 1015.6955f, 1015.6928f, 1015.6939f, 1015.68787f, 1015.6881f, 1015.68536f, 1015.68726f, 1015.6879f, 1015.6904f, 1015.6937f, 1015.69476f, 1015.7046f, 1015.7019f, 1015.7079f, 1015.71124f, 1015.71216f, 1015.71436f, 1015.7171f, 1015.7186f, 1015.7186f, 1015.7246f, 1015.72046f, 1015.7211f, 1015.72375f, 1015.7194f, 1015.72125f, 1015.7161f, 1015.71185f, 1015.7188f, 1015.721f, 1015.7252f, 1015.72266f, 1015.7236f, 1015.72614f, 1015.7266f, 1015.7344f, 1015.7376f, 1015.7337f, 1015.7253f, 1015.71875f, 1015.7219f, 1015.7219f, 1015.7317f, 1015.7284f, 1015.73444f, 1015.73584f, 1015.7369f, 1015.73254f, 1015.7369f, 1015.7336f, 1015.73254f, 1015.73676f, 1015.74176f, 1015.74506f, 1015.7478f, 1015.755f, 1015.7515f, 1015.7543f, 1015.7459f, 1015.7468f, 1015.7492f, 1015.74585f, 1015.74756f, 1015.74756f, 1015.75085f, 1015.754f, 1015.75336f, 1015.7568f, 1015.75165f, 1015.761f, 1015.7527f, 1015.75684f, 1015.7635f, 1015.7585f, 1015.7552f, 1015.7475f, 1015.74506f, 1015.7542f, 1015.75586f, 1015.74176f, 1015.74414f, 1015.7501f, 1015.751f, 1015.7478f, 1015.755f, 1015.75836f, 1015.7592f, 1015.75256f, 1015.7559f, 1015.76654f, 1015.76154f, 1015.766f, 1015.77014f, 1015.76904f, 1015.76013f, 1015.7674f, 1015.76514f, 1015.7674f, 1015.7635f, 1015.76404f, 1015.7607f, 1015.754f, 1015.7574f, 1015.7607f, 1015.7607f, 1015.7607f, 1015.754f, 1015.7567f, 1015.7616f, 1015.7643f, 1015.7666f, 1015.7609f, 1015.766f, 1015.76764f, 1015.755f, 1015.75757f, 1015.74927f, 1015.74927f, 1015.7426f, 1015.745f, 1015.745f, 1015.7409f, 1015.7376f, 1015.7326f, 1015.74164f, 1015.74664f, 1015.745f, 1015.7459f, 1015.7502f, 1015.7493f, 1015.7476f, 1015.7493f, 1015.751f, 1015.7601f, 1015.76434f, 1015.766f, 1015.756f, 1015.7617f, 1015.7623f, 1015.76404f, 1015.76733f, 1015.7607f, 1015.7623f, 1015.76337f, 1015.7584f, 1015.7573f, 1015.7502f, 1015.7534f, 1015.7534f, 1015.7601f, 1015.75684f, 1015.7518f, 1015.75574f, 1015.7524f, 1015.7507f, 1015.7484f, 1015.7502f, 1015.7534f, 1015.7623f, 1015.75903f, 1015.75574f, 1015.75574f, 1015.7573f, 1015.7524f, 1015.75574f, 1015.75574f, 1015.7607f, 1015.7573f, 1015.754f, 1015.74677f, 1015.754f, 1015.75574f, 1015.75903f, 1015.7573f, 1015.7551f, 1015.7573f, 1015.754f, 1015.7507f, 1015.7374f, 1015.739f, 1015.73566f, 1015.73566f, 1015.7367f, 1015.7417f, 1015.7417f, 1015.739f, 1015.74835f, 1015.74567f, 1015.7517f, 1015.74066f, 1015.7374f, 1015.739f, 1015.7417f, 1015.73065f, 1015.72894f, 1015.73505f, 1015.73334f, 1015.74005f, 1015.74005f, 1015.7367f, 1015.7434f, 1015.744f, 1015.7423f, 1015.7384f, 1015.739f, 1015.7374f, 1015.7374f, 1015.7374f, 1015.7341f, 1015.73505f, 1015.7341f, 1015.7267f, 1015.72833f, 1015.7234f, 1015.7167f, 1015.725f, 1015.7217f, 1015.7234f, 1015.73004f, 1015.7324f, 1015.7423f, 1015.74005f, 1015.73505f, 1015.73004f, 1015.739f, 1015.7417f, 1015.74567f, 1015.74066f, 1015.74146f, 1015.74146f, 1015.73816f, 1015.7274f, 1015.72906f, 1015.7274f, 1015.7341f, 1015.739f, 1015.744f, 1015.7417f, 1015.7374f, 1015.7324f, 1015.73816f, 1015.74146f, 1015.7374f, 1015.7341f, 1015.7365f, 1015.7365f, 1015.74146f, 1015.74414f, 1015.7475f, 1015.7448f, 1015.74146f, 1015.74585f, 1015.7475f, 1015.75146f, 1015.75146f, 1015.7591f, 1015.75476f, 1015.7614f, 1015.75476f, 1015.7492f, 1015.74817f, 1015.7498f, 1015.7515f, 1015.75586f, 1015.7509f, 1015.7448f, 1015.7525f, 1015.7581f, 1015.7592f};
-        float firstSensorValue = sensorValues_hPa[0];
+        AtmosphericPressure firstSensorValue = AtmosphericPressure.ofHPA(sensorValues_hPa[0]);
 
         // when // then
         for (float v : sensorValues_hPa) {
-            assertNull(PressureSensorUtils.computeChanges(firstSensorValue, v));
+            assertNull(PressureSensorUtils.computeChanges(firstSensorValue, AtmosphericPressure.ofHPA(v)));
         }
     }
 
@@ -25,25 +27,25 @@ public class PressureSensorUtilsTest {
     @Test
     public void computeChanges_downhill() {
         float[] sensorValues_hPa = new float[]{1015f, 1015.01f, 1015.02f, 1015.03f, 1015.04f, 1015.05f, 1015.06f, 1015.07f, 1015.08f, 1015.09f, 1015.10f, 1015.11f, 1015.12f, 1015.13f, 1018f, 1018.1f, 1018.1f, 1018.1f, 1018.1f};
-        float firstSensorValue = sensorValues_hPa[0];
+        AtmosphericPressure firstSensorValue = AtmosphericPressure.ofHPA(sensorValues_hPa[0]);
 
         // when
         float altitudeGain_m = 0;
         float altitudeLoss = 0;
-        float lastUsedPressureValue_hPa = firstSensorValue;
+        AtmosphericPressure lastUsedPressureValue = firstSensorValue;
 
         for (float v : sensorValues_hPa) {
-            PressureSensorUtils.AltitudeChange altitudeChange = PressureSensorUtils.computeChanges(lastUsedPressureValue_hPa, v);
+            PressureSensorUtils.AltitudeChange altitudeChange = PressureSensorUtils.computeChanges(lastUsedPressureValue, AtmosphericPressure.ofHPA(v));
             if (altitudeChange != null) {
                 altitudeGain_m += altitudeChange.getAltitudeGain_m();
                 altitudeLoss += altitudeChange.getAltitudeLoss_m();
-                lastUsedPressureValue_hPa = altitudeChange.getCurrentSensorValue_hPa();
+                lastUsedPressureValue = altitudeChange.currentSensorValue();
             }
         }
 
         // then
         assertEquals(0f, altitudeGain_m, 0.01);
         assertEquals(15.0f, altitudeLoss, 0.01);
-        assertEquals(1016.80f, lastUsedPressureValue_hPa, 0.01); //Expect exponential smoothing
+        assertEquals(1016.80f, lastUsedPressureValue.getHPA(), 0.01); //Expect exponential smoothing
     }
 }

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/TrackRecordingServiceTestMarker.java

@@ -29,7 +29,6 @@ import android.os.Looper;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;
 
 import org.junit.After;
@@ -57,9 +56,6 @@ public class TrackRecordingServiceTestMarker {
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
 
-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
     private final Context context = ApplicationProvider.getApplicationContext();
     private ContentProviderUtils contentProviderUtils;
 
@@ -128,7 +124,6 @@ public class TrackRecordingServiceTestMarker {
     public void recording_GPSfix_createsMarker() {
         // given
         TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-        trackPointCreator.stopGPS();
 
         trackPointCreator.setClock("2020-02-02T02:02:02Z");
         Track.Id trackId = service.startNewTrack();

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

@@ -11,7 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;
 
 import org.junit.After;
@@ -46,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 {
@@ -53,9 +54,6 @@ public class TrackRecordingServiceTestRecording {
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
 
-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
     private final Context context = ApplicationProvider.getApplicationContext();
     private ContentProviderUtils contentProviderUtils;
 
@@ -95,7 +93,6 @@ public class TrackRecordingServiceTestRecording {
         PreferencesUtils.setString(R.string.idle_speed_key, R.string.idle_speed_default);
 
         service = startService();
-        service.getTrackPointCreator().stopGPS();
     }
 
     @After
@@ -117,8 +114,7 @@ public class TrackRecordingServiceTestRecording {
         String startTime = "2020-02-02T02:02:02Z";
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // then
         assertEquals(new TrackStatistics(startTime, startTime, 0, 0, 0, 0, null, null)
@@ -155,8 +151,7 @@ public class TrackRecordingServiceTestRecording {
 
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // when
         String pauseTime = "2020-02-02T02:02:03Z";
@@ -202,8 +197,7 @@ public class TrackRecordingServiceTestRecording {
         String starTime = "2020-02-02T02:02:02Z";
         trackPointCreator.setClock(starTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         String pauseTime = "2020-02-02T02:02:03Z";
         trackPointCreator.setClock(pauseTime);
@@ -235,8 +229,7 @@ public class TrackRecordingServiceTestRecording {
 
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         String stopTime = "2020-02-02T02:02:03Z";
         trackPointCreator.setClock(stopTime);
@@ -246,8 +239,7 @@ public class TrackRecordingServiceTestRecording {
         String resumeTime = "2020-02-02T02:02:04Z";
         trackPointCreator.setClock(resumeTime);
         service.resumeTrack(trackId);
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
 
         // then
         new TrackPointAssert().assertEquals(List.of(
@@ -268,13 +260,13 @@ public class TrackRecordingServiceTestRecording {
 
         trackPointCreator.setClock(startTime);
         Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        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";
@@ -308,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
@@ -382,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";
@@ -447,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";
@@ -511,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";
@@ -575,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";
@@ -663,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";
@@ -713,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";
@@ -759,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";
@@ -823,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/TrackRecordingServiceTestStateMachine.java

@@ -195,7 +195,7 @@ public class TrackRecordingServiceTestStateMachine {
 
     @MediumTest
     @Test
-    public void cannotResume_non_existing_track() throws InterruptedException {
+    public void cannotResume_non_existing_track() {
         // given
         assertFalse(service.isRecording());
         assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());

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

@@ -1,15 +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 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;
 
@@ -22,14 +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();
-
-        service.getTrackPointCreator().setRemoteSensorManager(new BluetoothRemoteSensorManager(context, null, service.getTrackPointCreator()));
-        service.getTrackPointCreator().setClock(Clock.systemUTC());
-        service.endCurrentTrack();
     }
 
     static void sendGPSLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, long speed) {
@@ -41,6 +30,6 @@ public class TrackRecordingServiceTestUtils {
         location.setSpeed(speed);
 
         trackPointCreator.setClock(time);
-        trackPointCreator.getGpsHandler().onLocationChanged(location);
+        trackPointCreator.getSensorManager().getGpsManager().onLocationChanged(location);
     }
 }

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

@@ -8,7 +8,6 @@ import android.os.Looper;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;
 
 import org.junit.AfterClass;
@@ -31,9 +30,6 @@ public class VoiceAnnouncementManagerTest {
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
 
-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
     @BeforeClass
     public static void preSetUp() {
         // Prepare looper for Android's message queue

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

@@ -64,7 +64,7 @@ public class VoiceAnnouncementUtilsTest {
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
 
         // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement);
+        assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement);
     }
 
     @Test
@@ -80,7 +80,7 @@ public class VoiceAnnouncementUtilsTest {
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
 
         // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement);
+        assertEquals("Total distance 20.0 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement);
     }
 
     @Test
@@ -96,13 +96,13 @@ public class VoiceAnnouncementUtilsTest {
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
 
         // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
+        assertEquals("Total distance 20.0 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
     }
 
     @Test
     public void getAnnouncement_metric_distance_rounding_check_two() {
         TrackStatistics stats = new TrackStatistics();
-        stats.setTotalDistance(Distance.of(19990));
+        stats.setTotalDistance(Distance.of(19900));
         stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
         stats.setMovingTime(Duration.ofHours(1));
         stats.setMaxSpeed(Speed.of(100));
@@ -112,7 +112,7 @@ public class VoiceAnnouncementUtilsTest {
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
 
         // then
-        assertEquals("Total distance 19.99 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
+        assertEquals("Total distance 19.9 kilometers. 1 hour. Average moving speed 19.9 kilometers per hour.", announcement);
     }
 
     @Test
@@ -134,7 +134,7 @@ public class VoiceAnnouncementUtilsTest {
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, null).toString();
 
         // then
-        assertEquals("Total distance 14.21 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement);
+        assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement);
     }
 
     @Test
@@ -150,7 +150,7 @@ public class VoiceAnnouncementUtilsTest {
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, false, null, null).toString();
 
         // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement);
+        assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement);
     }
 
     @Test
@@ -172,7 +172,7 @@ public class VoiceAnnouncementUtilsTest {
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, false, lastInterval, null).toString();
 
         // then
-        assertEquals("Total distance 14.21 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement);
+        assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement);
     }
 
     @Test
@@ -185,10 +185,10 @@ public class VoiceAnnouncementUtilsTest {
         stats.setTotalAltitudeGain(6000f);
 
         // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString();
 
         // then
-        assertEquals("Total distance 12.43 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement);
+        assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement);
     }
 
     @Test
@@ -207,10 +207,10 @@ public class VoiceAnnouncementUtilsTest {
         }
 
         // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, true, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, true, lastInterval, null).toString();
 
         // then
-        assertEquals("Total distance 8.83 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement);
+        assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement);
     }
 
     @Test
@@ -223,10 +223,10 @@ public class VoiceAnnouncementUtilsTest {
         stats.setTotalAltitudeGain(6000f);
 
         // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, false, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, false, null, null).toString();
 
         // then
-        assertEquals("Total distance 12.43 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement);
+        assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement);
     }
 
     @Test
@@ -245,10 +245,10 @@ public class VoiceAnnouncementUtilsTest {
         }
 
         // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, false, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, false, lastInterval, null).toString();
 
         // then
-        assertEquals("Total distance 8.83 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement);
+        assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement);
     }
 
     @Test
@@ -274,7 +274,7 @@ public class VoiceAnnouncementUtilsTest {
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();
 
         // then
-        assertEquals("Total distance 14.21 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour. Average heart rate 180 bpm. Current heart rate 133 bpm.", announcement);
+        assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour. Average heart rate 180 bpm. Current heart rate 133 bpm.", announcement);
     }
 
     @Test

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

@@ -6,6 +6,7 @@ import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.location.Location;
+import android.os.Handler;
 import android.os.Looper;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -25,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();
 
@@ -33,7 +34,7 @@ public class GPSHandlerTest {
     private TrackPointCreator trackPointCreator;
 
     @InjectMocks
-    private GPSHandler locationHandler;
+    private GPSManager locationHandler;
 
     @BeforeClass
     public static void preSetUp() {
@@ -49,7 +50,7 @@ public class GPSHandlerTest {
         Mockito.when(trackPointCreator.createNow())
                 .thenReturn(Instant.now());
 
-        locationHandler.onStart(context);
+        locationHandler.start(context, new Handler());
     }
 
     /**

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

@@ -0,0 +1,146 @@
+package de.dennisguse.opentracks.services.handlers;
+
+import static org.junit.Assert.assertEquals;
+import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_DISABLED;
+import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_ENABLED;
+import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_NONE;
+import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_SIGNAL_BAD;
+import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_SIGNAL_FIX;
+import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_SIGNAL_LOST;
+
+import android.content.Context;
+import android.location.Location;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+
+@RunWith(AndroidJUnit4.class)
+public class GpsStatusTest {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    @BeforeClass
+    public static void preSetUp() {
+        // Prepare looper for Android's message queue
+        if (Looper.myLooper() == null) Looper.prepare();
+    }
+
+    private final static Location badFix = new Location("gps");
+    private final static Location ok = new Location("gps");
+
+    static {
+        badFix.setAccuracy(50);
+
+        ok.setAccuracy(10);
+    }
+
+    @Test
+    public void testStartDisabledEnabledStop() {
+        ArrayList<GpsStatusValue> statusList = new ArrayList<>();
+
+        // given
+        GpsStatusManager subject = new GpsStatusManager(context, statusList::add, new Handler());
+
+        // when / then
+        subject.start();
+        assertEquals(List.of(GPS_ENABLED), statusList);
+
+        subject.onGpsDisabled();
+        assertEquals(List.of(GPS_ENABLED, GPS_DISABLED), statusList);
+
+        subject.onGpsEnabled();
+        assertEquals(List.of(GPS_ENABLED, GPS_DISABLED, GPS_ENABLED), statusList);
+
+        subject.stop();
+        assertEquals(List.of(GPS_ENABLED, GPS_DISABLED, GPS_ENABLED, GPS_NONE), statusList);
+    }
+
+    @Test
+    public void testStartBadfixOk() {
+        ArrayList<GpsStatusValue> statusList = new ArrayList<>();
+
+        // given
+        GpsStatusManager subject = new GpsStatusManager(context, statusList::add, new Handler());
+        subject.onRecordingDistanceChanged(Distance.of(10));
+
+        // when / then
+        subject.start();
+        subject.onNewTrackPoint(new TrackPoint(badFix, Instant.now()));
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_BAD), statusList);
+
+        subject.onNewTrackPoint(new TrackPoint(ok, Instant.now()));
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_BAD, GPS_SIGNAL_FIX), statusList);
+
+        subject.onNewTrackPoint(new TrackPoint(ok, Instant.now()));
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_BAD, GPS_SIGNAL_FIX), statusList);
+
+        subject.onNewTrackPoint(new TrackPoint(badFix, Instant.now()));
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_BAD, GPS_SIGNAL_FIX, GPS_SIGNAL_BAD), statusList);
+    }
+
+    @Test
+    public void testStartSignalLost() {
+        ArrayList<GpsStatusValue> statusList = new ArrayList<>();
+
+        // given
+        GpsStatusManager subject = new GpsStatusManager(context, statusList::add, new Handler());
+        subject.onRecordingDistanceChanged(Distance.of(10));
+        subject.onMinRecordingIntervalChanged(GpsStatusManager.SIGNAL_LOST_THRESHOLD.multipliedBy(-1));
+
+        // when / then
+        subject.start();
+        subject.onNewTrackPoint(new TrackPoint(ok, Instant.now().minusMillis(1000)));
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX), statusList);
+
+        subject.determineGpsStatusByTime(Instant.now());
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX, GPS_SIGNAL_LOST), statusList);
+
+        subject.onNewTrackPoint(new TrackPoint(ok, Instant.now()));
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX, GPS_SIGNAL_LOST, GPS_SIGNAL_FIX), statusList);
+    }
+
+    @Test
+    public void testStartSignalLostByTimer() throws InterruptedException {
+        ArrayList<GpsStatusValue> statusList = new ArrayList<>();
+
+        final HandlerThread handlerThread = new HandlerThread("solution!");
+        handlerThread.start();
+
+        // given
+        GpsStatusManager subject = new GpsStatusManager(context, statusList::add, new Handler(handlerThread.getLooper()));
+        subject.onRecordingDistanceChanged(Distance.of(10));
+        subject.onMinRecordingIntervalChanged(GpsStatusManager.SIGNAL_LOST_THRESHOLD.multipliedBy(-1).plus(Duration.ofMillis(10)));
+
+        // when / then
+        subject.start();
+        Thread.sleep(100);
+        assertEquals(List.of(GPS_ENABLED), statusList);
+
+        subject.onNewTrackPoint(new TrackPoint(ok, Instant.now()));
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX), statusList);
+
+        Thread.sleep(100);
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX, GPS_SIGNAL_LOST), statusList);
+
+        subject.onNewTrackPoint(new TrackPoint(badFix, Instant.now()));
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX, GPS_SIGNAL_LOST, GPS_SIGNAL_BAD), statusList);
+
+        Thread.sleep(100);
+        assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX, GPS_SIGNAL_LOST, GPS_SIGNAL_BAD, GPS_SIGNAL_LOST), statusList);
+    }
+}

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

@@ -1,57 +0,0 @@
-package de.dennisguse.opentracks.services.handlers;
-
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.TrackPoint;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TrackPointCreatorTest {
-
-    @Mock
-    private Context context;
-
-    @Mock
-    private TrackPointCreator.Callback server;
-
-    @Mock
-    private GPSHandler locationHandler;
-
-    private TrackPointCreator subject;
-
-    @Before
-    public void setUp() {
-        subject = new TrackPointCreator(locationHandler, server);
-        subject.start(context, null);
-    }
-
-    @After
-    public void tearDown() {
-        subject.stop();
-    }
-
-    @Ignore("ServiceExecutor disabled for #822")
-    @Test
-    public void sendTrackPoint() throws InterruptedException {
-        // given
-        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, null);
-        Distance horizontalAccuracyThreshold = Distance.of(50);
-
-        // when
-        subject.onNewTrackPoint(trackPoint);
-
-        // then
-        Thread.sleep(10); // Wait for executor service
-        verify(server).newTrackPoint(trackPoint, horizontalAccuracyThreshold);
-    }
-}

src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesOpenHelperTest.java

@@ -17,7 +17,8 @@ import org.junit.runner.RunWith;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO;
 
 @RunWith(AndroidJUnit4.class)
 public class PreferencesOpenHelperTest {
@@ -38,10 +39,10 @@ public class PreferencesOpenHelperTest {
         PreferencesOpenHelper.newInstance(1).check();
 
         // then there should be one layout with old custom layout that has the new CSV value.
-        List<Layout> layouts = PreferencesUtils.getAllCustomLayouts();
-        assertNotNull(layouts);
-        assertEquals(layouts.size(), 1);
-        assertEquals(layouts.get(0).toCsv(), PreferencesUtils.getCustomLayout().toCsv());
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
+        assertNotNull(recordingLayouts);
+        assertEquals(recordingLayouts.size(), 1);
+        assertEquals(recordingLayouts.get(0).toCsv(), PreferencesUtils.getCustomLayout().toCsv());
     }
 
     @Test
@@ -63,10 +64,10 @@ public class PreferencesOpenHelperTest {
                 + PreferencesUtils.getLayoutColumnsByDefault() + ";distance,1,1,0;speed,1,1,0;";
 
         // then there should be one layout with old custom layout that has the new CSV value.
-        List<Layout> layouts = PreferencesUtils.getAllCustomLayouts();
-        assertNotNull(layouts);
-        assertEquals(layouts.size(), 1);
-        assertEquals(layouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
+        assertNotNull(recordingLayouts);
+        assertEquals(recordingLayouts.size(), 1);
+        assertEquals(recordingLayouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
     }
 
     @Test
@@ -87,10 +88,10 @@ public class PreferencesOpenHelperTest {
         String updatedOldCustomLayoutCsv = "whatever;3;distance,1,1,0;speed,1,1,0;";
 
         // then there should be one layout with old custom layout that has the new CSV value.
-        List<Layout> layouts = PreferencesUtils.getAllCustomLayouts();
-        assertNotNull(layouts);
-        assertEquals(layouts.size(), 1);
-        assertEquals(layouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
+        assertNotNull(recordingLayouts);
+        assertEquals(recordingLayouts.size(), 1);
+        assertEquals(recordingLayouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
     }
 
     @Test
@@ -109,10 +110,10 @@ public class PreferencesOpenHelperTest {
         PreferencesOpenHelper.newInstance(1).check();
 
         // then custom layout should be equals to default layout.
-        Layout defaultLayout = Layout.fromCsv(PreferencesUtils.buildDefaultLayout(), resources);
-        List<Layout> customLayout = PreferencesUtils.getAllCustomLayouts();
+        RecordingLayout defaultRecordingLayout = RecordingLayoutIO.fromCsv(PreferencesUtils.buildDefaultLayout(), resources);
+        List<RecordingLayout> customRecordingLayout = PreferencesUtils.getAllCustomLayouts();
 
-        assertEquals(customLayout.size(), 1);
-        assertEquals(defaultLayout.toCsv(), customLayout.get(0).toCsv());
+        assertEquals(customRecordingLayout.size(), 1);
+        assertEquals(defaultRecordingLayout.toCsv(), customRecordingLayout.get(0).toCsv());
     }
 }

src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java

@@ -22,7 +22,8 @@ import java.util.List;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO;
 
 @RunWith(AndroidJUnit4.class)
 public class PreferencesUtilsTest {
@@ -85,13 +86,13 @@ public class PreferencesUtilsTest {
         editor.commit();
 
         // when
-        List<Layout> layouts = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
 
         // then
-        assertEquals(layouts.size(), 1);
-        assertTrue(layouts.get(0).getFields().size() > 0);
-        assertEquals(layouts.get(0).getName(), context.getString(R.string.stats_custom_layout_default_layout));
-        assertTrue(layouts.get(0).getFields().stream().anyMatch(DataField::isVisible));
+        assertEquals(recordingLayouts.size(), 1);
+        assertTrue(recordingLayouts.get(0).getFields().size() > 0);
+        assertEquals(recordingLayouts.get(0).getName(), context.getString(R.string.stats_custom_layout_default_layout));
+        assertTrue(recordingLayouts.get(0).getFields().stream().anyMatch(DataField::isVisible));
     }
 
     @Test
@@ -103,12 +104,12 @@ public class PreferencesUtilsTest {
         editor.commit();
 
         // when
-        Layout layout = PreferencesUtils.getCustomLayout();
+        RecordingLayout recordingLayout = PreferencesUtils.getCustomLayout();
 
         // then
-        assertTrue(layout.getFields().size() > 0);
-        assertEquals(layout.getName(), context.getString(R.string.stats_custom_layout_default_layout));
-        assertTrue(layout.getFields().stream().anyMatch(DataField::isVisible));
+        assertTrue(recordingLayout.getFields().size() > 0);
+        assertEquals(recordingLayout.getName(), context.getString(R.string.stats_custom_layout_default_layout));
+        assertTrue(recordingLayout.getFields().stream().anyMatch(DataField::isVisible));
     }
 
     @Test
@@ -126,28 +127,28 @@ public class PreferencesUtilsTest {
         editor.apply();
 
         // when
-        Layout layout = PreferencesUtils.getCustomLayout();
+        RecordingLayout recordingLayout = PreferencesUtils.getCustomLayout();
 
         // then
-        assertEquals(layout.getFields().size(), 4);
-        assertEquals(layout.getName(), "run");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getFields().size(), 4);
+        assertEquals(recordingLayout.getName(), "run");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
 
-        assertEquals(layout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
-        assertTrue(layout.getFields().get(0).isVisible());
-        assertTrue(layout.getFields().get(0).isPrimary());
+        assertEquals(recordingLayout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
+        assertTrue(recordingLayout.getFields().get(0).isVisible());
+        assertTrue(recordingLayout.getFields().get(0).isPrimary());
 
-        assertEquals(layout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
-        assertTrue(layout.getFields().get(1).isVisible());
-        assertFalse(layout.getFields().get(1).isPrimary());
+        assertEquals(recordingLayout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
+        assertTrue(recordingLayout.getFields().get(1).isVisible());
+        assertFalse(recordingLayout.getFields().get(1).isPrimary());
 
-        assertEquals(layout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_average_moving_speed_key));
-        assertFalse(layout.getFields().get(2).isVisible());
-        assertTrue(layout.getFields().get(2).isPrimary());
+        assertEquals(recordingLayout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_average_moving_speed_key));
+        assertFalse(recordingLayout.getFields().get(2).isVisible());
+        assertTrue(recordingLayout.getFields().get(2).isPrimary());
 
-        assertEquals(layout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
-        assertFalse(layout.getFields().get(3).isVisible());
-        assertFalse(layout.getFields().get(3).isPrimary());
+        assertEquals(recordingLayout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
+        assertFalse(recordingLayout.getFields().get(3).isVisible());
+        assertFalse(recordingLayout.getFields().get(3).isPrimary());
     }
 
     @Test
@@ -165,44 +166,44 @@ public class PreferencesUtilsTest {
         editor.apply();
 
         // when
-        Layout layout = PreferencesUtils.getCustomLayout();
+        RecordingLayout recordingLayout = PreferencesUtils.getCustomLayout();
 
         // then
-        assertEquals(layout.getFields().size(), 4);
-        assertEquals(layout.getName(), "walking");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getFields().size(), 4);
+        assertEquals(recordingLayout.getName(), "walking");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
 
-        assertEquals(layout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
-        assertTrue(layout.getFields().get(0).isVisible());
-        assertTrue(layout.getFields().get(0).isPrimary());
+        assertEquals(recordingLayout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
+        assertTrue(recordingLayout.getFields().get(0).isVisible());
+        assertTrue(recordingLayout.getFields().get(0).isPrimary());
 
-        assertEquals(layout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
-        assertTrue(layout.getFields().get(1).isVisible());
-        assertFalse(layout.getFields().get(1).isPrimary());
+        assertEquals(recordingLayout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
+        assertTrue(recordingLayout.getFields().get(1).isVisible());
+        assertFalse(recordingLayout.getFields().get(1).isPrimary());
 
-        assertEquals(layout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_coordinates_key));
-        assertFalse(layout.getFields().get(2).isVisible());
-        assertTrue(layout.getFields().get(2).isPrimary());
-        assertTrue(layout.getFields().get(2).isWide());
+        assertEquals(recordingLayout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_coordinates_key));
+        assertFalse(recordingLayout.getFields().get(2).isVisible());
+        assertTrue(recordingLayout.getFields().get(2).isPrimary());
+        assertTrue(recordingLayout.getFields().get(2).isWide());
 
-        assertEquals(layout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
-        assertFalse(layout.getFields().get(3).isVisible());
-        assertFalse(layout.getFields().get(3).isPrimary());
+        assertEquals(recordingLayout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
+        assertFalse(recordingLayout.getFields().get(3).isVisible());
+        assertFalse(recordingLayout.getFields().get(3).isPrimary());
     }
 
     @Test
     public void testSetCustomLayout() {
         // given
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        Layout layoutSrc = new Layout("road cycling");
-        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_moving_time_key), context.getString(R.string.stats_moving_time), true, true, false));
-        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_distance_key), context.getString(R.string.stats_distance), true, false, false));
-        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_average_moving_speed_key), context.getString(R.string.stats_average_moving_speed), false, true, false));
-        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_speed_key), context.getString(R.string.stats_speed), false, false, false));
+        RecordingLayout recordingLayoutSrc = new RecordingLayout("road cycling");
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_moving_time_key), true, true, false));
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_distance_key), true, false, false));
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_average_moving_speed_key), false, true, false));
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_speed_key), false, false, false));
 
         // when
         SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putString(context.getString(R.string.stats_custom_layouts_key), layoutSrc.toCsv());
+        editor.putString(context.getString(R.string.stats_custom_layouts_key), recordingLayoutSrc.toCsv());
         editor.commit();
 
         // then
@@ -215,13 +216,13 @@ public class PreferencesUtilsTest {
                 + context.getString(R.string.stats_custom_layout_average_moving_speed_key) + ",0,1,0;"
                 + context.getString(R.string.stats_custom_layout_speed_key) + ",0,0,0;");
 
-        Layout layoutDst = PreferencesUtils.getCustomLayout();
-        assertEquals(layoutSrc.getName(), layoutDst.getName());
-        assertEquals(layoutSrc.getFields().size(), layoutDst.getFields().size());
-        for (int i = 0; i < layoutSrc.getFields().size(); i++) {
-            assertEquals(layoutSrc.getFields().get(i).getKey(), layoutDst.getFields().get(i).getKey());
-            assertEquals(layoutSrc.getFields().get(i).isVisible(), layoutDst.getFields().get(i).isVisible());
-            assertEquals(layoutSrc.getFields().get(i).isPrimary(), layoutDst.getFields().get(i).isPrimary());
+        RecordingLayout recordingLayoutDst = PreferencesUtils.getCustomLayout();
+        assertEquals(recordingLayoutSrc.getName(), recordingLayoutDst.getName());
+        assertEquals(recordingLayoutSrc.getFields().size(), recordingLayoutDst.getFields().size());
+        for (int i = 0; i < recordingLayoutSrc.getFields().size(); i++) {
+            assertEquals(recordingLayoutSrc.getFields().get(i).getKey(), recordingLayoutDst.getFields().get(i).getKey());
+            assertEquals(recordingLayoutSrc.getFields().get(i).isVisible(), recordingLayoutDst.getFields().get(i).isVisible());
+            assertEquals(recordingLayoutSrc.getFields().get(i).isPrimary(), recordingLayoutDst.getFields().get(i).isPrimary());
         }
     }
 
@@ -247,7 +248,7 @@ public class PreferencesUtilsTest {
         editor.putString(context.getString(R.string.stats_custom_layouts_key), cyclingProfile + "\n" + runningProfile);
         editor.apply();
 
-        List<Layout> layoutsBefore = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> layoutsBefore = PreferencesUtils.getAllCustomLayouts();
 
         // when cyling profile is updated
         String cyclingProfileUpdated = "cycling;2;"
@@ -256,14 +257,14 @@ public class PreferencesUtilsTest {
                 + context.getString(R.string.stats_custom_layout_average_moving_speed_key) + ",0,0;"
                 + context.getString(R.string.stats_custom_layout_speed_key) + ",0,0;";
 
-        List<Layout> layoutsToBeUpdated = new ArrayList<>();
-        layoutsToBeUpdated.add(Layout.fromCsv(cyclingProfileUpdated, resources));
-        layoutsToBeUpdated.add(Layout.fromCsv(runningProfile, resources));
+        List<RecordingLayout> layoutsToBeUpdated = new ArrayList<>();
+        layoutsToBeUpdated.add(RecordingLayoutIO.fromCsv(cyclingProfileUpdated, resources));
+        layoutsToBeUpdated.add(RecordingLayoutIO.fromCsv(runningProfile, resources));
 
         PreferencesUtils.updateCustomLayouts(layoutsToBeUpdated);
 
         // then only updated profile is modified in the custom layouts
-        List<Layout> layoutsAfter = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> layoutsAfter = PreferencesUtils.getAllCustomLayouts();
 
         assertEquals(layoutsBefore.size(), 2);
         assertEquals(layoutsAfter.size(), 2);
@@ -294,7 +295,7 @@ public class PreferencesUtilsTest {
         editor.putString(context.getString(R.string.stats_custom_layouts_key), cyclingProfile + "\n" + runningProfile);
         editor.apply();
 
-        List<Layout> layoutsBefore = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> layoutsBefore = PreferencesUtils.getAllCustomLayouts();
 
         // when cyling profile is updated
         String cyclingProfileUpdated = "cycling;2;"
@@ -302,11 +303,11 @@ public class PreferencesUtilsTest {
                 + context.getString(R.string.stats_custom_layout_distance_key) + ",0,0;"
                 + context.getString(R.string.stats_custom_layout_average_moving_speed_key) + ",0,0;"
                 + context.getString(R.string.stats_custom_layout_speed_key) + ",0,0;";
-        Layout layoutToBeUpdated = Layout.fromCsv(cyclingProfileUpdated, resources);
-        PreferencesUtils.updateCustomLayout(layoutToBeUpdated);
+        RecordingLayout recordingLayoutToBeUpdated = RecordingLayoutIO.fromCsv(cyclingProfileUpdated, resources);
+        PreferencesUtils.updateCustomLayout(recordingLayoutToBeUpdated);
 
         // then only updated profile is modified in the custom layouts
-        List<Layout> layoutsAfter = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> layoutsAfter = PreferencesUtils.getAllCustomLayouts();
 
         assertEquals(layoutsBefore.size(), 2);
         assertEquals(layoutsAfter.size(), 2);
@@ -337,9 +338,9 @@ public class PreferencesUtilsTest {
         editor.apply();
 
         // when it gets the custom layout
-        Layout layout = PreferencesUtils.getCustomLayout();
+        RecordingLayout recordingLayout = PreferencesUtils.getCustomLayout();
 
         // then the first one was returned
-        assertEquals(layout.getName(), "cycling");
+        assertEquals(recordingLayout.getName(), "cycling");
     }
 }

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

@@ -80,7 +80,7 @@ public class DescriptionGeneratorTest {
         stats.setTotalAltitudeLoss(6000f);
         stats.setStartTime(START_TIME);
         track.setTrackStatistics(stats);
-        track.setCategory("hiking");
+        track.setActivityType("hiking");
         String expected = //"Created by"
                 "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
                         + "Name: -<br>"
@@ -118,7 +118,7 @@ public class DescriptionGeneratorTest {
         stats.setTotalAltitudeLoss(6000f);
         stats.setStartTime(START_TIME);
         track.setTrackStatistics(stats);
-        track.setCategory("hiking");
+        track.setActivityType("hiking");
         String expected = //"Created by"
                 "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
                         + "Name: -<br>"

src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java

@@ -78,7 +78,7 @@ public class TrackStatisticsUpdaterTest {
 
         // when
         TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-        data.trackPoints.forEach(it -> subject.addTrackPoint(it));
+        data.trackPoints().forEach(subject::addTrackPoint);
 
         // then
         TrackStatistics statistics = subject.getTrackStatistics();

src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java

@@ -41,7 +41,7 @@ public class AggregatedStatisticsTest {
 
         Track track = new Track();
         track.setIcon(TrackIconUtils.getIconValue(context, category));
-        track.setCategory(category);
+        track.setActivityType(category);
         track.setTrackStatistics(statistics);
         return track;
     }
@@ -243,8 +243,8 @@ public class AggregatedStatisticsTest {
         // Check order
 
         {
-            assertEquals(biking, aggregatedStatistics.getItem(0).getCategory());
-            assertEquals(driving, aggregatedStatistics.getItem(3).getCategory());
+            assertEquals(biking, aggregatedStatistics.getItem(0).getActivityType());
+            assertEquals(driving, aggregatedStatistics.getItem(3).getActivityType());
         }
     }
 }

src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java

@@ -12,7 +12,6 @@ import static org.hamcrest.Matchers.allOf;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 
 import android.util.Pair;
-import android.view.View;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.ViewInteraction;
@@ -52,7 +51,7 @@ public class EspressoAggregatedFilterTest {
     @Before
     public void setUp() {
         Pair<Track, List<TrackPoint>> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 20);
-        pair.first.setCategory(CATEGORY);
+        pair.first.setActivityType(CATEGORY);
         TestDataUtil.insertTrackWithLocations(new ContentProviderUtils(ApplicationProvider.getApplicationContext()), pair.first, pair.second);
     }
 
@@ -60,8 +59,8 @@ public class EspressoAggregatedFilterTest {
     public void espressoAggregatedFilterTest() {
         // open AggregatedStatisticsActivity through toolbar's menu item
         onView(ViewMatchers.withId(R.id.bottom_app_bar)).check(matches(isDisplayed()));
-        onView(withId(R.id.bottom_app_bar)).check(matches(hasDescendant(withId(R.id.track_list_aggregated_stats))));
-        onView(withId(R.id.track_list_aggregated_stats)).perform(click());
+        onView(withId(R.id.bottom_app_bar)).check(matches(hasDescendant(withId(R.id.aggregated_stats_button))));
+        onView(withId(R.id.aggregated_stats_button)).perform(click());
 
         // open FilterDialogFragment through toolbar's menu item
         onView(withId(R.id.bottom_app_bar)).check(matches(isDisplayed()));
@@ -72,7 +71,7 @@ public class EspressoAggregatedFilterTest {
         ViewInteraction checkBox = onView(
                 allOf(withId(R.id.filter_dialog_check_button), withText(CATEGORY),
                         withParent(allOf(withId(R.id.filter_items),
-                                withParent(IsInstanceOf.<View>instanceOf(android.view.ViewGroup.class)))),
+                                withParent(IsInstanceOf.instanceOf(android.view.ViewGroup.class)))),
                         isDisplayed()));
         checkBox.perform(waitFor(2000));
 

src/androidTest/java/de/dennisguse/opentracks/ui/customRecordingLayout/CsvRecordingLayoutUtilsTest.java

@@ -10,7 +10,7 @@ import org.junit.runner.RunWith;
 import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
-public class CsvLayoutUtilsTest extends TestCase {
+public class CsvRecordingLayoutUtilsTest extends TestCase {
 
     @Test
     public void testGetCsvLineParts() {

src/androidTest/java/de/dennisguse/opentracks/ui/customRecordingLayout/EspressoCustomLayoutTest.java

@@ -1,76 +0,0 @@
-package de.dennisguse.opentracks.ui.customRecordingLayout;
-
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.longClick;
-import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static org.hamcrest.CoreMatchers.is;
-
-import android.view.View;
-
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.espresso.NoMatchingViewException;
-import androidx.test.espresso.ViewAssertion;
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.espresso.matcher.ViewMatchers;
-import androidx.test.ext.junit.rules.ActivityScenarioRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.GrantPermissionRule;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.TrackListActivity;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class EspressoCustomLayoutTest {
-
-    @Rule
-    public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
-
-    @Rule
-    public GrantPermissionRule mGrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
-    @Test
-    public void customLayoutTest() {
-        // TrackListActivity: start recording
-        ViewInteraction trackControllerRecordButton = onView(ViewMatchers.withId(R.id.track_list_fab_action));
-        trackControllerRecordButton.perform(click());
-
-        // Get custom layout preferences and check all data fields are showed.
-        Layout layout = PreferencesUtils.getCustomLayout();
-
-        onView(withId(R.id.stats_recycler_view)).check(new RecyclerViewItemCountAssertion((int) layout.getFields().stream().filter(DataField::isVisible).count()));
-
-        // stop recording
-        ViewInteraction trackControllerStopButton = onView(withId(R.id.track_recording_fab_action));
-        trackControllerStopButton.perform(longClick());
-    }
-
-    private static class RecyclerViewItemCountAssertion implements ViewAssertion {
-        private final int expectedCount;
-
-        public RecyclerViewItemCountAssertion(int expectedCount) {
-            this.expectedCount = expectedCount;
-        }
-
-        @Override
-        public void check(View view, NoMatchingViewException noViewFoundException) {
-            if (noViewFoundException != null) {
-                throw noViewFoundException;
-            }
-
-            RecyclerView recyclerView = (RecyclerView) view;
-            RecyclerView.Adapter<?> adapter = recyclerView.getAdapter();
-            assertThat(adapter.getItemCount(), is(expectedCount));
-        }
-    }
-
-}

src/androidTest/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayoutTest.java

@@ -17,7 +17,7 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 @RunWith(AndroidJUnit4.class)
-public class LayoutTest extends TestCase {
+public class RecordingLayoutTest extends TestCase {
 
     private final Context context = ApplicationProvider.getApplicationContext();
     private final Resources resources = ApplicationProvider.getApplicationContext().getResources();
@@ -28,21 +28,17 @@ public class LayoutTest extends TestCase {
         String csv = "running;2;" + context.getString(R.string.stats_custom_layout_speed_key) + ",1,1,0;" + context.getString(R.string.stats_custom_layout_distance_key) + ",1,0,0;" + context.getString(R.string.stats_custom_layout_altitude_key) + ",0,1,0;" + context.getString(R.string.stats_custom_layout_gain_key) + ",0,0,0;";
 
         // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();
 
         // then layout and data fields are built correctly
-        assertEquals(layout.getName(), "running");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getName(), "running");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
         assertEquals(dataFieldList.size(), 4);
         assertEquals(dataFieldList.get(0).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
         assertEquals(dataFieldList.get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
         assertEquals(dataFieldList.get(2).getKey(), context.getString(R.string.stats_custom_layout_altitude_key));
         assertEquals(dataFieldList.get(3).getKey(), context.getString(R.string.stats_custom_layout_gain_key));
-        assertEquals(dataFieldList.get(0).getTitle(), context.getString(R.string.stats_speed));
-        assertEquals(dataFieldList.get(1).getTitle(), context.getString(R.string.stats_distance));
-        assertEquals(dataFieldList.get(2).getTitle(), context.getString(R.string.stats_altitude));
-        assertEquals(dataFieldList.get(3).getTitle(), context.getString(R.string.stats_gain));
         assertTrue(dataFieldList.get(0).isVisible());
         assertTrue(dataFieldList.get(0).isPrimary());
         assertFalse(dataFieldList.get(0).isWide());
@@ -64,13 +60,13 @@ public class LayoutTest extends TestCase {
         String csv1 = "Layout Name;speed,1,1;distance,0,0;";
 
         // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();
 
         // then layout and data fields are built correctly
-        assertEquals(layout.getName(), PreferencesUtils.getDefaultLayoutName());
-        assertEquals(layout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
-        assertEquals(layout.getFields().size(), 0);
+        assertEquals(recordingLayout.getName(), PreferencesUtils.getDefaultLayoutName());
+        assertEquals(recordingLayout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
+        assertEquals(recordingLayout.getFields().size(), 0);
     }
 
     @Test
@@ -79,13 +75,13 @@ public class LayoutTest extends TestCase {
         String csv1 = "Layout Name;2;";
 
         // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();
 
         // then layout and data fields are built correctly
-        assertEquals(layout.getName(), PreferencesUtils.getDefaultLayoutName());
-        assertEquals(layout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
-        assertEquals(layout.getFields().size(), 0);
+        assertEquals(recordingLayout.getName(), PreferencesUtils.getDefaultLayoutName());
+        assertEquals(recordingLayout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
+        assertEquals(recordingLayout.getFields().size(), 0);
     }
 
     @Test
@@ -94,13 +90,13 @@ public class LayoutTest extends TestCase {
         String csv1 = "Layout Name;2;speed,distance,total time;";
 
         // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();
 
         // then layout and data fields are built correctly
-        assertEquals(layout.getName(), "Layout Name");
-        assertEquals(layout.getColumnsPerRow(), 2);
-        assertEquals(layout.getFields().size(), 0);
+        assertEquals(recordingLayout.getName(), "Layout Name");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getFields().size(), 0);
     }
 
     @Test
@@ -109,27 +105,27 @@ public class LayoutTest extends TestCase {
         String csv1 = "Layout Name;2;speed,1,0;distance;";
 
         // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();
 
         // then layout and data fields are built correctly
-        assertEquals(layout.getName(), "Layout Name");
-        assertEquals(layout.getColumnsPerRow(), 2);
-        assertEquals(layout.getFields().size(), 1);
+        assertEquals(recordingLayout.getName(), "Layout Name");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getFields().size(), 1);
     }
 
     @Test
     public void testToCsv() {
         // given a layout's object
-        Layout layout = new Layout("Test Layout", 2);
-        layout.addField("key1", "Title 1", false, false, false);
-        layout.addField("key2", "Title 2", false, true, false);
-        layout.addField("key3", "Title 3", true, false, false);
-        layout.addField("key4", "Title 4", true, true, false);
-        layout.addField("key5", "Title 5", true, true, true);
+        RecordingLayout recordingLayout = new RecordingLayout("Test Layout", 2);
+        recordingLayout.addField(new DataField("key1", false, false, false));
+        recordingLayout.addField(new DataField("key2", false, true, false));
+        recordingLayout.addField(new DataField("key3", true, false, false));
+        recordingLayout.addField(new DataField("key4", true, true, false));
+        recordingLayout.addField(new DataField("key5", true, true, true));
 
         // when converts it to CSV
-        String csv = layout.toCsv();
+        String csv = recordingLayout.toCsv();
 
         // then csv is well built
         assertEquals(csv, "Test Layout;2;key1,0,0,0;key2,0,1,0;key3,1,0,0;key4,1,1,0;key5,1,1,1;");
@@ -138,15 +134,15 @@ public class LayoutTest extends TestCase {
     @Test
     public void testToCsv_columnsByDefault() {
         // given a layout's object
-        Layout layout = new Layout("Test Layout");
-        layout.addField("key1", "Title 1", false, false, false);
-        layout.addField("key2", "Title 2", false, true, false);
-        layout.addField("key3", "Title 3", true, false, false);
-        layout.addField("key4", "Title 4", true, true, false);
-        layout.addField("key5", "Title 5", true, true, true);
+        RecordingLayout recordingLayout = new RecordingLayout("Test Layout");
+        recordingLayout.addField(new DataField("key1", false, false, false));
+        recordingLayout.addField(new DataField("key2", false, true, false));
+        recordingLayout.addField(new DataField("key3", true, false, false));
+        recordingLayout.addField(new DataField("key4", true, true, false));
+        recordingLayout.addField(new DataField("key5", true, true, true));
 
         // when converts it to CSV
-        String csv = layout.toCsv();
+        String csv = recordingLayout.toCsv();
 
         // then csv is well built
         assertEquals(csv, "Test Layout;" + PreferencesUtils.getLayoutColumnsByDefault() + ";key1,0,0,0;key2,0,1,0;key3,1,0,0;key4,1,1,0;key5,1,1,1;");

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)) {
@@ -78,7 +79,7 @@ public class EGM2008UtilsTest {
         EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
 
         // then
-        assertEquals(-14.8980, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
+        assertEquals(-14.8980, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
     }
 
     @Test
@@ -93,7 +94,7 @@ public class EGM2008UtilsTest {
         EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
 
         // then
-        assertEquals(30.15, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
+        assertEquals(30.15, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
     }
 
     @Test
@@ -108,7 +109,7 @@ public class EGM2008UtilsTest {
         EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
 
         // then
-        assertEquals(30.15, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
+        assertEquals(30.15, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
     }
 
     @Test
@@ -123,7 +124,7 @@ public class EGM2008UtilsTest {
         EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
 
         // then
-        assertEquals(30.15, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
+        assertEquals(30.15, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
     }
 
     @Test
@@ -138,7 +139,7 @@ public class EGM2008UtilsTest {
         EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
 
         // then
-        assertEquals(-17.2260, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
+        assertEquals(-17.2260, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
     }
 
     @Test
@@ -153,7 +154,7 @@ public class EGM2008UtilsTest {
         EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
 
         // then
-        assertEquals(-39.4865, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
+        assertEquals(-39.4865, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
     }
 
     @Test
@@ -173,7 +174,7 @@ public class EGM2008UtilsTest {
         EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint1.getLocation());
 
         // then
-        assertNotEquals(altitude_egm2008.correctAltitude(trackPoint1.getLocation()), altitude_egm2008.correctAltitude(trackPoint2.getLocation()), 0.0001);
+        assertNotEquals(altitude_egm2008.correctAltitude(trackPoint1.getLocation()).toM(), altitude_egm2008.correctAltitude(trackPoint2.getLocation()).toM(), 0.0001);
     }
 
     @Test
@@ -189,7 +190,7 @@ public class EGM2008UtilsTest {
         EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
 
         // then
-        assertEquals(22.99, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
+        assertEquals(22.99, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
     }
 
     @Test
@@ -204,7 +205,7 @@ public class EGM2008UtilsTest {
         EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
 
         // then
-        assertEquals(-85.824, altitude_egm2008.correctAltitude(trackPoint.getLocation()), MAX_BILINEAR_ERROR);
+        assertEquals(-85.824, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
     }
 
 

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

@@ -17,11 +17,14 @@ package de.dennisguse.opentracks.util;
 
 import static org.junit.Assert.assertEquals;
 
+import androidx.test.core.app.ApplicationProvider;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 
 /**
@@ -37,7 +40,7 @@ public class FileUtilsTest {
      */
     @Test
     public void testBuildUniqueFileName_new() {
-        String filename = FileUtils.buildUniqueFileName(new File("/dir"), "Filename", "ext");
+        String filename = FileUtils.buildUniqueFileName(FileUtils.getPhotoDir(ApplicationProvider.getApplicationContext()), "Filename", "ext");
         assertEquals("Filename.ext", filename);
     }
 
@@ -45,9 +48,14 @@ public class FileUtilsTest {
      * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the file exists already.
      */
     @Test
-    public void testBuildUniqueFileName_exist() {
-        // Expect "/default.prop" to exist on the phone/emulator
-        String filename = FileUtils.buildUniqueFileName(new File("/"), "default", "prop");
+    public void testBuildUniqueFileName_exist() throws IOException {
+        // given
+        new File(FileUtils.getPhotoDir(ApplicationProvider.getApplicationContext()), "default.prop").createNewFile();
+
+        //when
+        String filename = FileUtils.buildUniqueFileName(FileUtils.getPhotoDir(ApplicationProvider.getApplicationContext()), "default", "prop");
+
+        // then
         assertEquals("default(1).prop", filename);
     }
 

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

@@ -12,7 +12,7 @@ import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
 
 @RunWith(AndroidJUnit4.class)
 public class StatisticsUtilsTest extends TestCase {
@@ -44,16 +44,16 @@ public class StatisticsUtilsTest extends TestCase {
     @Test
     public void testFilterVisible() {
         // given
-        Layout layout = new Layout("profile");
-        layout.addField(new DataField("key1", "title1", true, true, false));
-        layout.addField(new DataField("key2", "title2", false, true, false));
-        layout.addField(new DataField("key3", "title3", true, true, false));
-        layout.addField(new DataField("key4", "title4", false, true, false));
-        layout.addField(new DataField("key5", "title5", true, true, false));
+        RecordingLayout recordingLayout = new RecordingLayout("profile");
+        recordingLayout.addField(new DataField("key1", true, true, false));
+        recordingLayout.addField(new DataField("key2", false, true, false));
+        recordingLayout.addField(new DataField("key3", true, true, false));
+        recordingLayout.addField(new DataField("key4", false, true, false));
+        recordingLayout.addField(new DataField("key5", true, true, false));
 
         // when
-        Layout resultTrue = StatisticsUtils.filterVisible(layout, true);
-        Layout resultFalse = StatisticsUtils.filterVisible(layout, false);
+        RecordingLayout resultTrue = recordingLayout.toRecordingLayout(true);
+        RecordingLayout resultFalse = recordingLayout.toRecordingLayout(false);
 
         // then
         assertEquals(resultTrue.getFields().size(), 3);

src/androidTest/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilderTest.java

@@ -1,199 +0,0 @@
-package de.dennisguse.opentracks.viewmodels;
-
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.time.Duration;
-import java.util.List;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.data.models.Cadence;
-import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.HeartRate;
-import de.dennisguse.opentracks.data.models.Power;
-import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.services.RecordingData;
-import de.dennisguse.opentracks.settings.UnitSystem;
-import de.dennisguse.opentracks.stats.SensorStatistics;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
-
-@RunWith(MockitoJUnitRunner.class)
-public class StatisticDataBuilderTest extends TestCase {
-
-    private final Context context = ApplicationProvider.getApplicationContext();
-
-    @Mock
-    private Track trackMock;
-
-    @Mock
-    private TrackStatistics trackStatisticsMock;
-
-    @Mock
-    private RecordingData recordingDataMock;
-
-    @Mock
-    private SensorStatistics sensorStatisticsMock;
-
-    @Test
-    public void testFromRecordingData() {
-        when(trackMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
-        when(trackStatisticsMock.getTotalTime()).thenReturn(Duration.ofMillis(0));
-        when(trackStatisticsMock.getMovingTime()).thenReturn(Duration.ofMillis(0));
-        when(trackStatisticsMock.getTotalDistance()).thenReturn(Distance.of(0));
-        when(recordingDataMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
-
-        // given
-        Layout layout = new Layout(context.getString(R.string.default_activity_default));
-        layout.addField(context.getString(R.string.stats_custom_layout_total_time_key), context.getString(R.string.stats_total_time), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_moving_time_key), context.getString(R.string.stats_moving_time), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_distance_key), context.getString(R.string.stats_distance), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_speed_key), context.getString(R.string.stats_speed), false, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_max_speed_key), context.getString(R.string.stats_max_speed), false, true, false);
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromRecordingData(context, recordingDataMock, layout, UnitSystem.METRIC);
-
-        // then
-        assertEquals(statisticDataList.size(), 3);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_total_time))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_moving_time))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_distance))));
-    }
-
-    @Test
-    public void testFromRecordingData_allFields() {
-        when(trackMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
-        when(trackStatisticsMock.getTotalTime()).thenReturn(Duration.ofMillis(0));
-        when(trackStatisticsMock.getMovingTime()).thenReturn(Duration.ofMillis(0));
-        when(trackStatisticsMock.getTotalDistance()).thenReturn(Distance.of(0));
-        when(recordingDataMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
-
-        // given
-        Layout layout = new Layout(context.getString(R.string.default_activity_default));
-        layout.addField(context.getString(R.string.stats_custom_layout_total_time_key), context.getString(R.string.stats_total_time), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_moving_time_key), context.getString(R.string.stats_moving_time), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_distance_key), context.getString(R.string.stats_distance), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_speed_key), context.getString(R.string.stats_speed), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_average_moving_speed_key), context.getString(R.string.stats_average_moving_speed), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_average_speed_key), context.getString(R.string.stats_average_speed), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_max_speed_key), context.getString(R.string.stats_max_speed), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_pace_key), context.getString(R.string.stats_pace), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_average_moving_pace_key), context.getString(R.string.stats_average_moving_pace), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_average_pace_key), context.getString(R.string.stats_average_pace), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_fastest_pace_key), context.getString(R.string.stats_fastest_pace), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_altitude_key), context.getString(R.string.stats_altitude), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_gain_key), context.getString(R.string.stats_gain), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_loss_key), context.getString(R.string.stats_loss), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_coordinates_key), context.getString(R.string.stats_coordinates), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_heart_rate_key), context.getString(R.string.stats_sensors_heart_rate), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_cadence_key), context.getString(R.string.stats_sensors_cadence), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_power_key), context.getString(R.string.stats_sensors_power), true, true, false);
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromRecordingData(context, recordingDataMock, layout, UnitSystem.METRIC);
-
-        // then
-        assertEquals(statisticDataList.size(), 18);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_total_time))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_moving_time))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_distance))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_speed))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_moving_speed))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_speed))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_max_speed))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_pace))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_moving_pace))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_pace))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_fastest_pace))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_altitude))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_gain))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_loss))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_coordinates))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_heart_rate))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_cadence))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_power))));
-    }
-
-    @Test
-    public void testFromSensorStatistics_onlyHeartRate() {
-        when(sensorStatisticsMock.hasHeartRate()).thenReturn(true);
-        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(HeartRate.of(200f));
-        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(HeartRate.of(150f));
-        when(sensorStatisticsMock.hasCadence()).thenReturn(false);
-        when(sensorStatisticsMock.hasPower()).thenReturn(false);
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
-
-        // then
-        assertEquals(statisticDataList.size(), 2);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_max))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_avg))));
-    }
-
-    @Test
-    public void testFromSensorStatistics_onlyCadence() {
-        when(sensorStatisticsMock.hasHeartRate()).thenReturn(false);
-        when(sensorStatisticsMock.hasCadence()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgCadence()).thenReturn(Cadence.of(90f));
-        when(sensorStatisticsMock.getMaxCadence()).thenReturn(Cadence.of(110f));
-        when(sensorStatisticsMock.hasPower()).thenReturn(false);
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
-
-        // then
-        assertEquals(statisticDataList.size(), 2);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_max))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_avg))));
-    }
-
-    @Test
-    public void testFromSensorStatistics_onlyPower() {
-        when(sensorStatisticsMock.hasHeartRate()).thenReturn(false);
-        when(sensorStatisticsMock.hasCadence()).thenReturn(false);
-        when(sensorStatisticsMock.hasPower()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgPower()).thenReturn(Power.of(300f));
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_power_avg))));
-
-        // then
-        assertEquals(statisticDataList.size(), 1);
-    }
-
-    @Test
-    public void testFromSensorStatistics() {
-        when(sensorStatisticsMock.hasHeartRate()).thenReturn(true);
-        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(HeartRate.of(200f));
-        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(HeartRate.of(150f));
-        when(sensorStatisticsMock.hasCadence()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgCadence()).thenReturn(Cadence.of(90f));
-        when(sensorStatisticsMock.getMaxCadence()).thenReturn(Cadence.of(110f));
-        when(sensorStatisticsMock.hasPower()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgPower()).thenReturn(Power.of(300f));
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
-
-        // then
-        assertEquals(statisticDataList.size(), 5);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_max))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_avg))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_max))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_avg))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_power_avg))));
-    }
-}

src/androidTest/res/raw/csv_export.csv

@@ -1,11 +1,13 @@
 #time,trackpoint_type,latitude,longitude,altitude,accuracy_horizontal,accuracy_vertical,speed,altitude_gain,altitude_loss,sensor_distance,heartrate,cadence,power
 "2020-02-02T03:02:02+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,,
-"2020-02-02T03:02:03+01:00","TRACKPOINT",3,3,10,10,,54,1,1,,,,
+"2020-02-02T03:02:03+01:00","TRACKPOINT",3,14,10,10,,54,1,1,,,,
 "2020-02-02T03:02:04+01:00","SENSORPOINT",,,,,,54,1,1,10,66,3,50
-"2020-02-02T03:02:05+01:00","TRACKPOINT",3,3,10,10,,18,0,0,2,66,3,50
-"2020-02-02T03:02:06+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
-"2020-02-02T03:02:20+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,,
-"2020-02-02T03:02:21+01:00","TRACKPOINT",3,3,10,10,,54,0,0,,,,
-"2020-02-02T03:02:22+01:00","SEGMENT_START_AUTOMATIC",3,3,10,10,,54,0,0,,,,
-"2020-02-02T03:02:23+01:00","TRACKPOINT",3,3,10,10,,54,0,0,,,,
-"2020-02-02T03:02:24+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
+"2020-02-02T03:02:15+01:00","SENSORPOINT",,,,,,,,,,68,3,50
+"2020-02-02T03:02:16+01:00","SENSORPOINT",,,,,,18,,,2,69,3,50
+"2020-02-02T03:02:17+01:00","TRACKPOINT",3,14.001,10,10,,18,0,0,2,69,3,50
+"2020-02-02T03:02:18+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
+"2020-02-02T03:03:20+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,,
+"2020-02-02T03:03:21+01:00","TRACKPOINT",3,14.002,10,10,,54,0,0,,,,
+"2020-02-02T03:03:22+01:00","SEGMENT_START_AUTOMATIC",3,16,10,10,,54,0,0,,,,
+"2020-02-02T03:03:23+01:00","TRACKPOINT",3,16.001,10,10,,54,0,0,,,,
+"2020-02-02T03:03:24+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,

src/debug/res/xml/shortcuts.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/ic_statistics_24dp"
+        android:shortcutId="stats"
+        android:shortcutLongLabel="@string/menu_aggregated_statistics"
+        android:shortcutShortLabel="@string/menu_aggregated_statistics">
+
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsActivity"
+            android:targetPackage="de.dennisguse.opentracks.debug" />
+    </shortcut>
+</shortcuts>

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"
@@ -87,6 +89,7 @@ limitations under the License.
             </intent-filter>
         </activity>
 
+        <!-- NOTE: the name of the MAIN/LAUNCHER is used by icon packs; if this is changed, icon packs break.-->
         <activity
             android:name=".introduction.IntroductionActivity"
             android:exported="true"
@@ -96,6 +99,11 @@ limitations under the License.
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"
+            />
         </activity>
 
         <activity android:name=".AboutActivity" />
@@ -346,6 +354,7 @@ limitations under the License.
         <activity android:name=".ui.aggregatedStatistics.AggregatedStatisticsActivity" />
 
         <activity android:name=".io.file.importer.DirectoryChooserActivity$ExportDirectoryChooserActivity" />
+        <activity android:name=".io.file.importer.DirectoryChooserActivity$ExportDirectoryChooserOneFileActivity" />
         <activity android:name=".io.file.importer.DirectoryChooserActivity$DefaultTrackExportDirectoryChooserActivity" />
 
         <activity android:name=".io.file.exporter.ExportActivity" />

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

@@ -24,7 +24,7 @@ public class ShowErrorActivity extends AbstractActivity {
         super.onCreate(savedInstanceState);
 
         viewBinding.textViewError.setText(getIntent().getStringExtra(EXTRA_ERROR_TEXT));
-        viewBinding.bottomAppBarLayout.bottomAppBarTitle.setText(createErrorTitle());
+        viewBinding.showErrorToolbar.setTitle(createErrorTitle());
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
 

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;
@@ -73,9 +74,9 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
 
         viewBinding.fields.trackEditName.setText(track.getName());
 
-        viewBinding.fields.trackEditActivityType.setText(track.getCategory());
+        viewBinding.fields.trackEditActivityType.setText(track.getActivityType());
 
-        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) -> {
@@ -108,7 +109,6 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
         viewBinding.trackEditCancel.setOnClickListener(v -> finish());
         viewBinding.trackEditCancel.setVisibility(View.VISIBLE);
 
-        viewBinding.bottomAppBarLayout.bottomAppBarTitle.setText(getString(R.string.menu_edit));
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
 

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

@@ -25,7 +25,6 @@ import android.database.Cursor;
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.os.Vibrator;
 import android.provider.Settings;
 import android.util.Pair;
 import android.view.KeyEvent;
@@ -36,20 +35,20 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.content.ContextCompat;
-import androidx.core.splashscreen.SplashScreen;
 import androidx.cursoradapter.widget.ResourceCursorAdapter;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 
+import com.google.android.material.button.MaterialButton;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Arrays;
 
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
@@ -84,7 +83,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
 
     private static final String TAG = TrackListActivity.class.getSimpleName();
 
-    // The following are setFrequency in onCreate
+    // The following are set in onCreate
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
     private ResourceCursorAdapter resourceCursorAdapter;
 
@@ -138,7 +137,6 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
 
     // Menu items
     private MenuItem searchMenuItem;
-    private MenuItem startGpsMenuItem;
 
     private final TrackRecordingServiceConnection.Callback bindChangedCallback = (service, unused) -> {
         service.getRecordingStatusObservable()
@@ -166,6 +164,25 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
 
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
 
+        viewBinding.aggregatedStatsButton.setOnClickListener((view) -> startActivity(IntentUtils.newIntent(this, AggregatedStatisticsActivity.class)));
+        viewBinding.sensorStartButton.setOnClickListener((view) -> {
+            LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
+            if (locationManager != null && !locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+                startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+            } else {
+                // Invoke trackRecordingService
+                if (!gpsStatusValue.isGpsStarted()) {
+                    trackRecordingServiceConnection.startAndBindWithCallback(this);
+                } else {
+                    TrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
+                    if (trackRecordingService != null) {
+                        trackRecordingService.stopSensorsAndShutdown(); //TODO Handle this in TrackRecordingServiceConnection
+                    }
+                    trackRecordingServiceConnection.unbindAndStop(this);
+                }
+            }
+        });
+
         viewBinding.trackList.setEmptyView(viewBinding.trackListEmptyView);
         viewBinding.trackList.setOnItemClickListener((parent, view, position, trackIdId) -> {
             Track.Id trackId = new Track.Id(trackIdId);
@@ -195,7 +212,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
                 int totalDistanceIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE);
                 int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
                 int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
-                int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY);
+                int activityTypeIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE);
                 int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
                 int markerCountIndex = cursor.getColumnIndexOrThrow(TracksColumns.MARKER_COUNT);
 
@@ -211,13 +228,13 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
                 int markerCount = cursor.getInt(markerCountIndex);
                 long startTime = cursor.getLong(startTimeIndex);
                 int startTimeOffset = cursor.getInt(startTimeOffsetIndex);
-                String category = icon != null && !icon.equals("") ? null : cursor.getString(categoryIndex);
+                String activityType = icon != null && !icon.equals("") ? null : cursor.getString(activityTypeIndex);
                 String description = cursor.getString(descriptionIndex);
 
                 ListItemUtils.setListItem(TrackListActivity.this, view, isRecording,
                         iconId, R.string.image_track, name, totalTime, totalDistance, markerCount,
                         OffsetDateTime.ofInstant(Instant.ofEpochMilli(startTime), ZoneOffset.ofTotalSeconds(startTimeOffset)),
-                        category, description, false);
+                        activityType, description, false);
             }
         };
         viewBinding.trackList.setAdapter(resourceCursorAdapter);
@@ -247,7 +264,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
             }
 
             // Recording -> Stop
-            ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(1000);
+            ActivityUtils.vibrate(this, 1000);
             updateGpsMenuItem(false, false);
             trackRecordingServiceConnection.stopRecording(TrackListActivity.this);
             viewBinding.trackListFabAction.setImageResource(R.drawable.ic_baseline_record_24);
@@ -255,7 +272,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
             return true;
         });
 
-        setSupportActionBar(viewBinding.bottomAppBar);
+        setSupportActionBar(viewBinding.trackListToolbar);
 
         loadData(getIntent());
     }
@@ -310,21 +327,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
         getMenuInflater().inflate(R.menu.track_list, menu);
 
         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.SearchAutoComplete searchAutoComplete = searchView.findViewById(R.id.search_src_text);
-        searchAutoComplete.setHintTextColor(ContextCompat.getColor(this, android.R.color.white));
-        searchAutoComplete.setTextColor(ContextCompat.getColor(this, android.R.color.white));
-
-        searchView.setOnCloseListener(() -> {
-            searchView.clearFocus();
-            searchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return true;
-        });
-
-        startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);
+        ActivityUtils.configureSearchWidget(this, searchMenuItem);
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -341,34 +344,6 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.track_list_start_gps) {
-            LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
-            if (locationManager != null && !locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
-                startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
-            } else {
-                // Invoke trackRecordingService
-                if (!gpsStatusValue.isGpsStarted()) {
-                    trackRecordingServiceConnection.startAndBindWithCallback(this);
-                } else {
-                    TrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
-                    if (trackRecordingService != null) {
-                        trackRecordingService.stopSensorsAndShutdown(); //TODO Handle this in TrackRecordingServiceConnection
-                    }
-                    trackRecordingServiceConnection.unbindAndStop(this);
-                }
-
-                // Update menu after starting or stopping gps
-                this.invalidateOptionsMenu();
-            }
-
-            return true;
-        }
-
-        if (item.getItemId() == R.id.track_list_aggregated_stats) {
-            startActivity(IntentUtils.newIntent(this, AggregatedStatisticsActivity.class));
-            return true;
-        }
-
         if (item.getItemId() == R.id.track_list_markers) {
             startActivity(IntentUtils.newIntent(this, MarkerListActivity.class));
             return true;
@@ -383,6 +358,12 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
             SearchView searchView = (SearchView) searchMenuItem.getActionView();
             searchView.setIconified(false);
             searchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_list_help) {
+            startActivity(IntentUtils.newIntent(this, HelpActivity.class));
+            return true;
         }
 
         return super.onOptionsItemSelected(item);
@@ -456,14 +437,12 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
      */
     //TODO Check if if can be avoided to call this outside of onGpsStatusChanged()
     private void updateGpsMenuItem(boolean isGpsStarted, boolean isRecording) {
-        if (startGpsMenuItem != null) {
-            startGpsMenuItem.setVisible(!isRecording);
-            if (!isRecording) {
-                startGpsMenuItem.setTitle(isGpsStarted ? R.string.menu_stop_gps : R.string.menu_start_gps);
-                startGpsMenuItem.setIcon(isGpsStarted ? gpsStatusValue.icon : R.drawable.ic_gps_off_24dp);
-                if (startGpsMenuItem.getIcon() instanceof AnimatedVectorDrawable) {
-                    ((AnimatedVectorDrawable) startGpsMenuItem.getIcon()).start();
-                }
+        MaterialButton startGpsMenuItem = viewBinding.sensorStartButton;
+        startGpsMenuItem.setVisibility(!isRecording ? View.VISIBLE : View.INVISIBLE);
+        if (!isRecording) {
+            startGpsMenuItem.setIcon(AppCompatResources.getDrawable(this, isGpsStarted ? gpsStatusValue.icon : R.drawable.ic_gps_off_24dp));
+            if (startGpsMenuItem.getIcon() instanceof AnimatedVectorDrawable) {
+                ((AnimatedVectorDrawable) startGpsMenuItem.getIcon()).start();
             }
         }
     }
@@ -505,13 +484,6 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
             return true;
         }
 
-        if (itemId == R.id.list_context_menu_aggregated_stats) {
-            Intent intent = IntentUtils.newIntent(this, AggregatedStatisticsActivity.class)
-                    .putParcelableArrayListExtra(AggregatedStatisticsActivity.EXTRA_TRACK_IDS, new ArrayList<>(Arrays.asList(trackIds)));
-            startActivity(intent);
-            return true;
-        }
-
         if (itemId == R.id.list_context_menu_select_all) {
             for (int i = 0; i < viewBinding.trackList.getCount(); i++) {
                 viewBinding.trackList.setItemChecked(i, true);
@@ -533,11 +505,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
         public void setSearch(String searchQuery) {
             this.searchQuery = searchQuery;
             restart();
-            if (searchQuery != null) {
-                setTitle(searchQuery);
-            } else {
-                setTitle(R.string.app_name);
-            }
+            viewBinding.trackListToolbar.setTitle(searchQuery == null ? getString(R.string.app_name) : searchQuery);
         }
 
         public void restart() {
@@ -548,7 +516,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
         @Override
         public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
             final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME,
-                    TracksColumns.DESCRIPTION, TracksColumns.CATEGORY, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET,
+                    TracksColumns.DESCRIPTION, TracksColumns.ACTIVITY_TYPE, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET,
                     TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON, TracksColumns.MARKER_COUNT};
 
             final String sortOrder = TracksColumns.STARTTIME + " DESC";
@@ -558,7 +526,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
             } else {
                 final String SEARCH_QUERY = TracksColumns.NAME + " LIKE ? OR " +
                         TracksColumns.DESCRIPTION + " LIKE ? OR " +
-                        TracksColumns.CATEGORY + " LIKE ?";
+                        TracksColumns.ACTIVITY_TYPE + " LIKE ?";
                 final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
                 return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, sortOrder);
             }
@@ -582,7 +550,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
 
     private void setFloatButton() {
         viewBinding.trackListFabAction.setImageResource(recordingStatus.isRecording() ? R.drawable.ic_baseline_stop_24 : R.drawable.ic_baseline_record_24);
-        viewBinding.trackListFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, recordingStatus.isRecording() ? R.color.opentracks_secondary_color : R.color.red_dark));
+        viewBinding.trackListFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, recordingStatus.isRecording() ? R.color.opentracks : R.color.red_dark));
     }
 
     private void onRecordingStatusChanged(RecordingStatus status) {

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

@@ -103,7 +103,6 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindCallback);
 
         Track track = contentProviderUtils.getTrack(trackId);
-        viewBinding.bottomAppBarLayout.bottomAppBarTitle.setText(track != null ? track.getName() : "");
         viewBinding.bottomAppBarLayout.bottomAppBar.replaceMenu(R.menu.track_detail);
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
 
@@ -274,18 +273,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 +289,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

@@ -1,12 +1,10 @@
 package de.dennisguse.opentracks;
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Vibrator;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -45,6 +43,7 @@ import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.ui.intervals.IntervalsFragment;
 import de.dennisguse.opentracks.ui.markers.MarkerEditActivity;
 import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
+import de.dennisguse.opentracks.ui.util.ActivityUtils;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -134,10 +133,10 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
         }
 
         viewBinding.trackRecordingFabAction.setImageResource(R.drawable.ic_baseline_stop_24);
-        viewBinding.trackRecordingFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.opentracks_secondary_color));
-        viewBinding.trackRecordingFabAction.setBackgroundColor(ContextCompat.getColor(this, R.color.opentracks_secondary_color));
+        viewBinding.trackRecordingFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.opentracks));
+        viewBinding.trackRecordingFabAction.setBackgroundColor(ContextCompat.getColor(this, R.color.opentracks));
         viewBinding.trackRecordingFabAction.setOnLongClickListener((view) -> {
-            ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(1000);
+            ActivityUtils.vibrate(this, 1000);
             trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this);
             Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackStoppedActivity.class)
                     .putExtra(TrackStoppedActivity.EXTRA_TRACK_ID, trackId);
@@ -146,9 +145,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
             finish();
             return true;
         });
-        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> {
-            Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show();
-        });
+        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show());
 
         viewBinding.bottomAppBar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_24);
         setSupportActionBar(viewBinding.bottomAppBar);
@@ -322,8 +319,8 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     @Override
     public void onChooseActivityTypeDone(String iconValue) {
         Track track = contentProviderUtils.getTrack(trackId);
-        String category = getString(TrackIconUtils.getIconActivityType(iconValue));
-        TrackUtils.updateTrack(this, track, null, category, null, contentProviderUtils);
+        String activityType = getString(TrackIconUtils.getIconActivityType(iconValue));
+        TrackUtils.updateTrack(this, track, null, activityType, null, contentProviderUtils);
     }
 
     private class CustomFragmentPagerAdapter extends FragmentStateAdapter {
@@ -335,18 +332,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
@@ -355,18 +348,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);
+            };
         }
     }
 
@@ -383,13 +372,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)),