Dashboard API: provide version 2 again (required by OSMDashboard until v6.4.1).

Part of #2265.

build.gradle

@@ -21,7 +21,7 @@ def getVersionName = { ->
     return 'git describe --tags'.execute().text.trim()
 }
 
-def getVersionCode = { ->
+def getVersionCodeNightly = { ->
     return Integer.valueOf('git rev-list HEAD --count'.execute().text.trim())
 }
 
@@ -47,8 +47,8 @@ android {
 
     defaultConfig {
         applicationId 'de.dennisguse.opentracks'
-        versionCode 6539
-        versionName "v4.25.0"
+        versionCode 6554
+        versionName "v4.25.1"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -108,12 +108,12 @@ android {
             dimension 'version'
             applicationId 'de.dennisguse.opentracks.nightly'
             resValue 'string', 'applicationId', 'de.dennisguse.opentracks.nightly'
-            signingConfig = signingConfigs.nightly
 
-            versionCode getVersionCode()
+            versionCode getVersionCodeNightly()
             versionName getVersionName()
-            base.archivesName = "de.dennisguse.opentracks.nightly_${getVersionCode()}"
+            base.archivesName = "de.dennisguse.opentracks.nightly_${getVersionCodeNightly()}"
 
+            signingConfig = signingConfigs.nightly
         }
         irreproducible {
             // Non-reproducible: https://f-droid.org/de/packages/de.dennisguse.opentracks/
@@ -130,7 +130,7 @@ android {
             applicationId 'de.dennisguse.opentracks.playstore'
             resValue 'string', 'applicationId', 'de.dennisguse.opentracks.playstore'
 
-            base.archivesName = "de.dennisguse.opentracks.playstore_${getVersionName()}_${getVersionCode()}"
+            base.archivesName = "de.dennisguse.opentracks.playstore_${getVersionName()}_${android.defaultConfig.versionCode}"
 
             signingConfig = signingConfigs.release
         }
@@ -158,7 +158,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.2.0'
     implementation 'androidx.mediarouter:mediarouter:1.8.1'
     implementation 'androidx.core:core-location-altitude:1.0.0-beta01'
-    implementation 'androidx.work:work-runtime:2.11.0'
+    implementation 'androidx.work:work-runtime:2.11.1'
 
     androidTestImplementation 'androidx.test:core:1.7.0'
     androidTestImplementation 'androidx.test.ext:junit:1.3.0'

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

@@ -0,0 +1,7 @@
+v4.25.1: OpenTracks
+
+Bugfix:
+- Since v4.24.0, the API for transferring data to OSM Dashboard was broken.
+  Sadly, the changes in OpenTracks could not be reverted.
+  Thus, the protocol version was bumped to 3.
+  This requires updating OSM Dashboard to a version AFTER v6.5.7.

fastlane/metadata/android/ta-IN/changelogs/6508.txt

@@ -0,0 +1,15 @@
+v4.24.0: OpenTracks
+
+மாற்றங்கள்:
+- PublicAPI: தரவு இருந்தால் ஸ்டார்ட் டிராக் மட்டுமே புலத்தை அமைக்கும்
+- மார்க்கர் புகைப்படங்களை மீண்டும் பகிரலாம்
+- புகைப்படங்கள் இல்லாமல் KMZ அகற்றப்பட்டது
+- இதயத் துடிப்பு 0.0 தவறானதாகக் கருதப்படுகிறது (சென்சார் ஸ்டாடிஸ்டிக்ஸ் தவிர)
+- சிறப்பு ஒருங்கிணைப்புகளுக்கான இறக்குமதி தீர்வு நீக்கப்பட்டது (100/200)
+(சிறப்பு டிராக் பாயிண்ட்களை ஏற்றுமதி/இறக்குமதி செய்ய MyTracks பயன்படுத்தியது)
+
+டெவலப்பர்:
+- ட்ராக் மற்றும் மார்க்கர் பதிவுகள்
+- திரட்டப்பட்ட புள்ளிவிவரங்கள் தரவுத்தளத்தில் கணக்கிடப்படுகின்றன
+- TrackStatisticsUpdater மற்றும் SegmentStatisticUpdater எனப் பிரிக்கவும்
+- அறிமுகப்படுத்தப்பட்ட இட்டரேட்டர் வகுப்புகள் (கர்சர் அல்லது பட்டியலைக் கடந்து செல்வதற்குப் பதிலாக)

fastlane/metadata/android/ta-IN/changelogs/6513.txt

@@ -0,0 +1,5 @@
+v4.24.1: OpenTracks
+
+பிழைத்திருத்தம்:
+- OSM டாஷ்போர்டு v6.4.1 மற்றும் அதற்கு முந்தையவற்றுடன் இணக்கத்தன்மையை மீட்டெடுக்கவும் (v4.24.0 இல் அறிமுகப்படுத்தப்பட்டது)
+- எண்ணின்படி இயல்புநிலை ட்ராக் பெயரைப் பயன்படுத்தும்போது செயலிழக்கிறது (v4.24.0 இல் அறிமுகப்படுத்தப்பட்டது)

fastlane/metadata/android/ta-IN/changelogs/6516.txt

@@ -0,0 +1,4 @@
+v4.24.2: OpenTracks
+
+பிழைத்திருத்தம்:
+- அனைத்தையும் தேர்ந்தெடுக்கும்போது செயலிழக்க (v4.24.0 இல் அறிமுகப்படுத்தப்பட்டது)

fastlane/metadata/android/ta-IN/changelogs/6539.txt

@@ -0,0 +1,12 @@
+v4.25.0: OpenTracks
+
+மாற்றங்கள்:
+- பதிவுப் பொத்தான் மையமாக உள்ளது
+- BLE தெர்மோமீட்டருக்கான ஆதரவு (சுற்றுச்சூழல் உணர்தல்)
+
+பிழைத்திருத்தம்:
+- இறக்குமதியில்: கோப்பு பெயரிலிருந்து வகையைப் பெறுங்கள் (URI அல்ல)
+
+டெவலப்பர்:
+- TrackPoint ஒரு பதிவு
+- Android Gradle செருகுநிரல் 9.0 க்கு புதுப்பிக்கவும்

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

@@ -17,6 +17,6 @@
 * 深色和浅色主题，跟随系统设置。
 * 无广告。
 
-‌自由软件/开放源代码
+自由软件/开放源代码
 意味着您可以使用、研究、修改和分享源代码。
 采用 Apache 2.0 许可

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -36,7 +36,8 @@ public class EspressoDeleteTrackTest {
     @Test
     public void espressoDeleteTrackTest() {
         // TrackListActivity: start recording
-        onView(withId(R.id.track_list_fab_action)).perform(click());
+        onView(withId(R.id.track_list_fab_action))
+                .perform(click());
 
         // TrackRecordingActivity
         onView(withId(R.id.track_recording_fab_action))
@@ -46,10 +47,12 @@ public class EspressoDeleteTrackTest {
                 .perform(longClick());
 
         // TrackStoppedActivity
-        onView(withId(R.id.finish_button)).perform(click());
+        onView(withId(R.id.finish_button))
+                .perform(click());
 
         // select track
-        onView(allOf(withParent(withId(R.id.track_list)), withParentIndex(0))).perform(longClick());
+        onView(allOf(withParent(withId(R.id.track_list)), withParentIndex(0)))
+                .perform(longClick());
 
         // open menu and delete selected track
         onView(
@@ -62,9 +65,11 @@ public class EspressoDeleteTrackTest {
                         isDisplayed()))
                 .perform(click());
 
-        onView(withText("Delete")).perform(click());
+        onView(withText("Delete"))
+                .perform(click());
 
-        onView(withText("OK")).perform(click());
+        onView(withText("OK"))
+                .perform(click());
 
         // tracklist is empty now
         onView(allOf(withText("Start recording your next adventure here"), isDisplayed()));

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

@@ -15,7 +15,6 @@ import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 
-import androidx.test.espresso.ViewInteraction;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
@@ -45,41 +44,43 @@ public class EspressoEditTrackRecordingTest {
     public void espressoEditTrackRecordingTest() {
         {
             // TrackListActivity: start recording
-            ViewInteraction fabRecordButton = onView(withId(R.id.track_list_fab_action));
-            fabRecordButton.perform(click());
+            onView(withId(R.id.track_list_fab_action))
+                    .perform(click());
         }
         {
             // TrackRecordingActivity
-            ViewInteraction trackControllerStopButton = onView(withId(R.id.track_recording_fab_action));
 
             // wait; stay recording
-            trackControllerStopButton.perform(waitFor(4000));
+            onView(withId(R.id.track_recording_fab_action))
+                    .perform(waitFor(4000));
 
             // open menu
             openContextualActionModeOverflowMenu();
 
             // Click the item.
-            onView(withText(R.string.menu_edit)).perform(click());
+            onView(withText(R.string.menu_edit))
+                    .perform(click());
 
             // change name for "New Name"
-            ViewInteraction textInputEditText = onView(withId(R.id.track_edit_name));
-            textInputEditText.perform(scrollTo(), replaceText("New Name"));
+            onView(withId(R.id.track_edit_name))
+                    .perform(scrollTo(), replaceText("New Name"));
 
-            ViewInteraction textInputEditText2 = onView(allOf(withId(R.id.track_edit_name), withText("New Name"), isDisplayed()));
-            textInputEditText2.perform(closeSoftKeyboard());
+            onView(allOf(withId(R.id.track_edit_name), withText("New Name"), isDisplayed()))
+                    .perform(closeSoftKeyboard());
 
             // save edition
-            ViewInteraction appCompatButton = onView(withId(R.id.track_edit_save));
-            appCompatButton.perform(click());
+            onView(withId(R.id.track_edit_save))
+                    .perform(click());
 
             // stop;
-            trackControllerStopButton.perform(longClick());
+            onView(withId(R.id.track_recording_fab_action))
+                    .perform(longClick());
 
             // it's on track stopped activity and there are two buttons
-            ViewInteraction resumeButton = onView(withId(R.id.resume_button));
-            resumeButton.check(matches(isDisplayed()));
-            ViewInteraction finishButton = onView(withId(R.id.finish_button));
-            finishButton.check(matches(isDisplayed()));
+            onView(withId(R.id.resume_button))
+                    .check(matches(isDisplayed()));
+            onView(withId(R.id.finish_button))
+                    .check(matches(isDisplayed()));
         }
     }
 }

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

@@ -37,8 +37,8 @@ public class EspressoUITest {
     public void record_stop_resume_stop_finish() {
         {
             // TrackListActivity: start recording
-            ViewInteraction trackControllerRecordButton = onView(withId(R.id.track_list_fab_action));
-            trackControllerRecordButton.perform(click());
+            onView(withId(R.id.track_list_fab_action))
+                    .perform(click());
         }
         {
             // TrackRecordingActivity: wait to record some time and then stop
@@ -66,13 +66,12 @@ public class EspressoUITest {
     public void record_move_through_tabs() {
         {
             // TrackListActivity: start recording
-            ViewInteraction trackControllerRecordButton = onView(withId(R.id.track_list_fab_action));
-            trackControllerRecordButton.perform(click());
+            onView(withId(R.id.track_list_fab_action))
+                    .perform(click());
         }
         {
             // TrackRecordingActivity
             ViewInteraction tabLayout = onView(withId(R.id.track_detail_activity_tablayout));
-            ViewInteraction trackControllerStopButton = onView(withId(R.id.track_recording_fab_action));
 
             tabLayout.perform(selectTabAtIndex(1));
             tabLayout.perform(waitFor(1000));
@@ -87,7 +86,8 @@ public class EspressoUITest {
             tabLayout.perform(waitFor(1000));
 
             // stop
-            trackControllerStopButton.perform(longClick());
+            onView(withId(R.id.track_recording_fab_action)).
+                    perform(longClick());
         }
     }
 

src/androidTest/java/de/dennisguse/opentracks/publicapi/DataProviderTest.java

@@ -0,0 +1,224 @@
+package de.dennisguse.opentracks.publicapi;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+
+@RunWith(AndroidJUnit4.class)
+public class DataProviderTest {
+
+    private final ContentResolver resolver = ApplicationProvider.getApplicationContext().getContentResolver();
+
+    @Test
+    public void supportsVersion2_tracks() {
+        // given
+        Uri uri = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/dashboard/tracks/1");
+        String[] expectedTracksColumns = new String[]{
+                "_id",
+                "name",
+                "description",
+                "category",
+                "activity_type_localized",
+                "starttime",
+                "stoptime",
+                "totaltime",
+                "movingtime",
+                "totaldistance",
+                "maxspeed",
+                "avgspeed",
+                "avgmovingspeed",
+                "minelevation",
+                "maxelevation",
+                "elevationgain",
+                "elevationloss"
+        };
+
+        // when
+        try (Cursor cursor = resolver.query(
+                uri,
+                expectedTracksColumns,
+                null,
+                null,
+                null
+        )) {
+            // then
+            assertEquals("vnd.android.cursor.dir/vnd.de.dennisguse.track", resolver.getType(uri));
+
+            assertNotNull(cursor);
+            assertArrayEquals(expectedTracksColumns, cursor.getColumnNames());
+        }
+    }
+
+    @Test
+    public void supportsVersion2_trackpoints() {
+        // given
+        Uri uri = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/dashboard/trackpoints/1");
+        String[] expectedTrackpointsColumns = {
+                "_id",
+                "trackid",
+                "latitude",
+                "longitude",
+                "time",
+                "type",
+                "speed"
+        };
+
+        // when
+        try (Cursor cursor = resolver.query(
+                uri,
+                expectedTrackpointsColumns,
+                null,
+                null,
+                null
+        )) {
+            // then
+            assertEquals("vnd.android.cursor.dir/vnd.de.dennisguse.trackpoint", resolver.getType(uri));
+
+            assertNotNull(cursor);
+            assertArrayEquals(expectedTrackpointsColumns, cursor.getColumnNames());
+        }
+    }
+
+    @Test
+    public void supportsVersion2_markers() {
+        // given
+        Uri uri = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/dashboard/markers/1");
+        String[] expectedMarkersColumns = {
+                "_id",
+                "name",
+                "description",
+                "category",
+                "trackid",
+                "longitude",
+                "latitude",
+                "photoUrl",
+                "icon"
+        };
+
+        // when
+        try (Cursor cursor = resolver.query(
+                uri,
+                expectedMarkersColumns,
+                null,
+                null,
+                null
+        )) {
+            // then
+            assertEquals("vnd.android.cursor.dir/vnd.de.dennisguse.waypoint", resolver.getType(uri));
+
+            assertNotNull(cursor);
+            assertArrayEquals(expectedMarkersColumns, cursor.getColumnNames());
+        }
+    }
+
+    @Test
+    public void supportsVersion3_tracks() {
+        // given
+        Uri uri = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/dashboard/tracks/1");
+        String[] expectedTracksColumns = {
+                "_id",
+                "name",
+                "description",
+                "activity_type",
+                "activity_type_localized",
+                "time_start",
+                "time_stop",
+                "duration_total",
+                "duration_moving",
+                "distance",
+                "speed_max",
+                "altitude_min",
+                "altitude_max",
+                "altitude_gain",
+                "altitude_loss"
+        };
+
+        // when
+        try (Cursor cursor = resolver.query(
+                uri,
+                expectedTracksColumns,
+                null,
+                null,
+                null
+        )) {
+            // then
+            assertEquals("vnd.android.cursor.dir/vnd.de.dennisguse.track", resolver.getType(uri));
+
+            assertNotNull(cursor);
+            assertArrayEquals(expectedTracksColumns, cursor.getColumnNames());
+        }
+    }
+
+    @Test
+    public void supportsVersion3_trackpoints() {
+        //given
+        Uri uri = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/dashboard/trackpoints/1");
+        String[] expectedTrackpointsColumns = {
+                "_id",
+                "trackid",
+                "latitude",
+                "longitude",
+                "time",
+                "type",
+                "speed"
+        };
+
+        // when
+        try (Cursor cursor = resolver.query(
+                uri,
+                expectedTrackpointsColumns,
+                null,
+                null,
+                null
+        )) {
+            //then
+            assertEquals("vnd.android.cursor.dir/vnd.de.dennisguse.trackpoint", resolver.getType(uri));
+
+            assertNotNull(cursor);
+            assertArrayEquals(expectedTrackpointsColumns, cursor.getColumnNames());
+        }
+    }
+
+    @Test
+    public void supportsVersion3_markers() {
+        // given
+        Uri uri = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/dashboard/markers/1");
+        String[] expectedMarkersColumns = {
+                "_id",
+                "name",
+                "description",
+                "marker_type_localized",
+                "trackid",
+                "latitude",
+                "longitude",
+                "photoUrl"
+        };
+
+        // when
+        try (Cursor cursor = resolver.query(
+                uri,
+                expectedMarkersColumns,
+                null,
+                null,
+                null
+        )) {
+            // then
+            assertEquals("vnd.android.cursor.dir/vnd.de.dennisguse.waypoint", resolver.getType(uri));
+
+            assertNotNull(cursor);
+            assertArrayEquals(expectedMarkersColumns, cursor.getColumnNames());
+        }
+    }
+}

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

@@ -52,7 +52,6 @@ import de.dennisguse.opentracks.sensors.GpsStatusValue;
 
 /**
  * Testing the states of TrackRecordingService.
- * As states are checked against MutableLiveData that are updated via `postValue()` (is asynchronous to be inform other Threads), Thread.sleep() is required.
  */
 @RunWith(AndroidJUnit4.class)
 public class TrackRecordingServiceStateMachineTest {
@@ -118,13 +117,12 @@ public class TrackRecordingServiceStateMachineTest {
 
     @MediumTest
     @Test
-    public void gps_startStop() throws InterruptedException {
+    public void gps_startStop() {
         // given
         assertEquals(GpsStatusValue.GPS_NONE, service.getGpsStatusObservable().getValue());
 
         // when
         service.tryStartSensors();
-        Thread.sleep(1000);
 
         // then
         assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
@@ -133,7 +131,6 @@ public class TrackRecordingServiceStateMachineTest {
 
         // when
         service.stopSensors();
-        Thread.sleep(1000);
 
         // then
         assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
@@ -143,13 +140,12 @@ public class TrackRecordingServiceStateMachineTest {
 
     @MediumTest
     @Test
-    public void recording_startStopResume_no_data() throws InterruptedException {
+    public void recording_startStopResume_no_data() {
         // given
         assertFalse(service.isRecording());
 
         // when
         Track.Id trackId = service.startNewTrack();
-        Thread.sleep(1000);
 
         // then
         assertTrue(service.isRecording());
@@ -161,7 +157,6 @@ public class TrackRecordingServiceStateMachineTest {
 
         // when
         service.resumeTrack(trackId);
-        Thread.sleep(1000);
 
         // then
         assertTrue(service.isRecording());
@@ -172,7 +167,6 @@ public class TrackRecordingServiceStateMachineTest {
 
         // when
         service.endCurrentTrack();
-        Thread.sleep(1000);
 
         // then
         assertFalse(service.isRecording());
@@ -183,12 +177,10 @@ public class TrackRecordingServiceStateMachineTest {
 
         // when
         service.resumeTrack(trackId);
-        Thread.sleep(1000);
 
         // then
         assertTrue(service.isRecording());
         assertEquals(new RecordingStatus(trackId), service.getRecordingStatusObservable().getValue());
-        Thread.sleep(1000); //TODO Figure out why we need to wait here until the update is happening
         assertNotEquals(RecordingData.NOT_RECORDING, service.getRecordingDataObservable().getValue());
         assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
     }
@@ -214,7 +206,7 @@ public class TrackRecordingServiceStateMachineTest {
 
     @MediumTest
     @Test
-    public void cannotEnd_without_starting() throws InterruptedException {
+    public void cannotEnd_without_starting() {
         // given
         assertFalse(service.isRecording());
         assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
@@ -223,7 +215,6 @@ public class TrackRecordingServiceStateMachineTest {
 
         // when
         service.endCurrentTrack();
-        Thread.sleep(1000);
 
         // then
         assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
@@ -234,33 +225,30 @@ public class TrackRecordingServiceStateMachineTest {
     @Ignore("TODO Bug: GPS can be stopped although the current track is recording")
     @MediumTest
     @Test
-    public void recording_stopGPS_noop() throws InterruptedException {
+    public void recording_stopGPS_noop() {
         // given
         Track.Id trackId = service.startNewTrack();
         assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
 
         // when
         service.stopSensors(); //TODO Should be ignored as service is recording
-        Thread.sleep(1000);
 
         // then
         assertTrue(service.isRecording());
         assertEquals(new RecordingStatus(trackId), service.getRecordingStatusObservable().getValue());
-        Thread.sleep(1000); //TODO Figure out why we need to wait here until the update is happening
         assertNotEquals(RecordingData.NOT_RECORDING, service.getRecordingDataObservable().getValue());
         assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
     }
 
     @MediumTest
     @Test
-    public void recording_startRecording_alreadyRecording() throws InterruptedException {
+    public void recording_startRecording_alreadyRecording() {
         // given
         Track.Id trackId = service.startNewTrack();
         assertTrue(service.isRecording());
 
         // when
         Track.Id newTrackId = service.startNewTrack();
-        Thread.sleep(1000);
 
         // then
         assertNotNull(trackId);

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

@@ -14,7 +14,6 @@ import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 import android.util.Pair;
 
 import androidx.test.core.app.ApplicationProvider;
-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;
@@ -61,28 +60,34 @@ public class EspressoAggregatedFilterTest {
     @Test
     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.aggregated_stats_button))));
-        onView(withId(R.id.aggregated_stats_button)).perform(click());
+        onView(ViewMatchers.withId(R.id.bottom_app_bar))
+                .check(matches(isDisplayed()));
+        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()));
-        onView(withId(R.id.bottom_app_bar)).check(matches(hasDescendant(withId(R.id.aggregated_statistics_filter))));
-        onView(withId(R.id.aggregated_statistics_filter)).perform(click());
+        onView(withId(R.id.bottom_app_bar))
+                .check(matches(isDisplayed()));
+        onView(withId(R.id.bottom_app_bar))
+                .check(matches(hasDescendant(withId(R.id.aggregated_statistics_filter))));
+        onView(withId(R.id.aggregated_statistics_filter))
+                .perform(click());
 
         // check there's a checkbox with ACTIVITY_TYPE_LOCALIZED text
-        ViewInteraction checkBox = onView(
-                allOf(withId(R.id.filter_dialog_check_button), withText(ACTIVITY_TYPE_LOCALIZED),
-                        withParent(allOf(withId(R.id.filter_items),
-                                withParent(IsInstanceOf.instanceOf(android.view.ViewGroup.class)))),
-                        isDisplayed()));
-        checkBox.perform(waitFor(2000));
+        onView(allOf(withId(R.id.filter_dialog_check_button), withText(ACTIVITY_TYPE_LOCALIZED),
+                withParent(allOf(withId(R.id.filter_items),
+                        withParent(IsInstanceOf.instanceOf(android.view.ViewGroup.class)))),
+                isDisplayed()))
+                .perform(waitFor(2000));
 
         // check there's an edit text for "from date"
-        onView(withId(R.id.filter_date_edit_text_from)).check(matches(isDisplayed()));
+        onView(withId(R.id.filter_date_edit_text_from))
+                .check(matches(isDisplayed()));
 
         // check there's an edit text for "to date"
-        onView(withId(R.id.filter_date_edit_text_to)).check(matches(isDisplayed()));
+        onView(withId(R.id.filter_date_edit_text_to))
+                .check(matches(isDisplayed()));
     }
-
 }

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

@@ -47,6 +47,7 @@ import java.util.Objects;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackListBinding;
+import de.dennisguse.opentracks.publicapi.DataProvider;
 import de.dennisguse.opentracks.sensors.GpsStatusValue;
 import de.dennisguse.opentracks.services.MissingPermissionException;
 import de.dennisguse.opentracks.services.RecordingStatus;
@@ -62,7 +63,6 @@ import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragm
 import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
 import de.dennisguse.opentracks.ui.util.ActivityUtils;
 import de.dennisguse.opentracks.ui.util.RecyclerViewSwipeDeleteCallback;
-import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PermissionRequester;
 
@@ -367,7 +367,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
         }
 
         if (itemId == R.id.list_context_menu_show_on_map) {
-            IntentDashboardUtils.showTrackOnMap(this, false, trackIds);
+            DataProvider.showTrackOnMap(this, false, trackIds);
             return true;
         }
 

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

@@ -37,6 +37,7 @@ import de.dennisguse.opentracks.data.TrackDataHub;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackRecordedBinding;
 import de.dennisguse.opentracks.fragments.StatisticsRecordedFragment;
+import de.dennisguse.opentracks.publicapi.DataProvider;
 import de.dennisguse.opentracks.services.RecordingStatus;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
@@ -45,7 +46,6 @@ import de.dennisguse.opentracks.share.ShareUtils;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.ui.intervals.IntervalsFragment;
 import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
-import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 
 /**
@@ -167,7 +167,7 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
         }
 
         if (item.getItemId() == R.id.track_detail_menu_show_on_map) {
-            IntentDashboardUtils.showTrackOnMap(this, false, trackId);
+            DataProvider.showTrackOnMap(this, false, trackId);
             return true;
         }
 

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

@@ -38,6 +38,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.databinding.TrackRecordingBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment;
+import de.dennisguse.opentracks.publicapi.DataProvider;
 import de.dennisguse.opentracks.sensors.GpsStatusValue;
 import de.dennisguse.opentracks.services.RecordingStatus;
 import de.dennisguse.opentracks.services.TrackRecordingService;
@@ -49,7 +50,6 @@ 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;
 
 /**
@@ -267,7 +267,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.track_detail_menu_show_on_map) {
-            IntentDashboardUtils.showTrackOnMap(this, true, trackId);
+            DataProvider.showTrackOnMap(this, true, trackId);
             return true;
         }
 

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

@@ -69,9 +69,11 @@ public class ContentProviderUtils {
 
     private static final String TAG = ContentProviderUtils.class.getSimpleName();
 
+    //TODO Move to CustomContentProvider
     // The authority (the first part of the URI) for the app's content provider.
     static final String AUTHORITY_PACKAGE = BuildConfig.APPLICATION_ID + ".content";
 
+    //TODO Move to CustomContentProvider
     // The base URI for the app's content provider.
     public static final String CONTENT_BASE_URI = "content://" + AUTHORITY_PACKAGE;
 

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

@@ -38,6 +38,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.data.tables.MarkerColumns;
 import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
 import de.dennisguse.opentracks.data.tables.TracksColumns;
+import de.dennisguse.opentracks.publicapi.DataProvider;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 /**
@@ -94,7 +95,6 @@ public class CustomContentProvider extends ContentProvider {
             "AND t." + TrackPointsColumns.TYPE + " NOT IN (" + TrackPoint.Type.SEGMENT_START_MANUAL.type_db + ")";
 
     public CustomContentProvider() {
-        //TODO Add tests for used URIs (incl. Dashboard API)
         uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.CONTENT_URI_BY_ID.getPath(), UrlType.TRACKPOINTS.ordinal());
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.CONTENT_URI_BY_ID.getPath() + "/#", UrlType.TRACKPOINTS_BY_ID.ordinal());
@@ -108,6 +108,10 @@ public class CustomContentProvider extends ContentProvider {
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, MarkerColumns.CONTENT_URI.getPath(), UrlType.MARKERS.ordinal());
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, MarkerColumns.CONTENT_URI.getPath() + "/#", UrlType.MARKERS_BY_ID.ordinal());
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, MarkerColumns.CONTENT_URI_BY_TRACKID.getPath() + "/*", UrlType.MARKERS_BY_TRACKID.ordinal());
+
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, UrlType.DASHBOARD_TRACKS_BY_IDS.getPath() + "*", UrlType.DASHBOARD_TRACKS_BY_IDS.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, UrlType.DASHBOARD_TRACKPOINTS_BY_TRACKIDS.getPath() + "*", UrlType.DASHBOARD_TRACKPOINTS_BY_TRACKIDS.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, UrlType.DASHBOARD_MARKERS_BY_TRACKIDS.getPath() + "*", UrlType.DASHBOARD_MARKERS_BY_TRACKIDS.ordinal());
     }
 
     @Override
@@ -170,12 +174,21 @@ public class CustomContentProvider extends ContentProvider {
 
     @Override
     public String getType(@NonNull Uri url) {
+        String contentType = getUrlType(url).contentType;
+        if (contentType != null) {
+            return contentType;
+        }
+
+        //TODO replace with getUrlType(url).getContentType()
         return switch (getUrlType(url)) {
             case TRACKPOINTS -> TrackPointsColumns.CONTENT_TYPE;
             case TRACKPOINTS_BY_TRACKID -> TrackPointsColumns.CONTENT_ITEMTYPE;
             case TRACKS -> TracksColumns.CONTENT_TYPE;
             case MARKERS -> MarkerColumns.CONTENT_TYPE;
             case MARKERS_BY_TRACKID -> MarkerColumns.CONTENT_ITEMTYPE;
+            case DASHBOARD_TRACKS_BY_IDS -> UrlType.DASHBOARD_TRACKS_BY_IDS.contentType;
+            case DASHBOARD_TRACKPOINTS_BY_TRACKIDS -> UrlType.DASHBOARD_TRACKPOINTS_BY_TRACKIDS.contentType;
+            case DASHBOARD_MARKERS_BY_TRACKIDS ->  UrlType.DASHBOARD_MARKERS_BY_TRACKIDS.contentType;
             default -> throw new IllegalArgumentException("Unknown URL " + url);
         };
     }
@@ -225,6 +238,7 @@ public class CustomContentProvider extends ContentProvider {
         SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
         String sortOrder = null;
         String groupBy = null;
+        //TODO queryBuilder.setStrict(true);
         //TODO queryBuilder.appendWhere() should use selectionArgs?
         switch (getUrlType(url)) {
             case TRACKPOINTS -> {
@@ -239,6 +253,11 @@ public class CustomContentProvider extends ContentProvider {
                 queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
                 queryBuilder.appendWhere(TrackPointsColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
             }
+            case DASHBOARD_TRACKPOINTS_BY_TRACKIDS -> {
+                queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
+                queryBuilder.appendWhere(TrackPointsColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
+                queryBuilder.setProjectionMap(DataProvider.DATA_PROJECTIONMAP_TRACKPOINTS);
+            }
             case TRACKS -> {
                 if (projection != null && Arrays.asList(projection).contains(TracksColumns.MARKER_COUNT)) {
                     queryBuilder.setTables(TracksColumns.TABLE_NAME + " LEFT OUTER JOIN (SELECT " + MarkerColumns.TRACKID + " AS markerTrackId, COUNT(*) AS " + TracksColumns.MARKER_COUNT + " FROM " + MarkerColumns.TABLE_NAME + " GROUP BY " + MarkerColumns.TRACKID + ") ON (" + TracksColumns.TABLE_NAME + "." + TracksColumns._ID + "= markerTrackId)");
@@ -251,6 +270,11 @@ public class CustomContentProvider extends ContentProvider {
                 queryBuilder.setTables(TracksColumns.TABLE_NAME);
                 queryBuilder.appendWhere(TracksColumns._ID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
             }
+            case DASHBOARD_TRACKS_BY_IDS ->  {
+                queryBuilder.setTables(TracksColumns.TABLE_NAME);
+                queryBuilder.appendWhere(TracksColumns._ID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
+                queryBuilder.setProjectionMap(DataProvider.DATA_PROJECTIONMAP_TRACKS);
+            }
             case TRACKS_SENSOR_STATS -> {
                 //TODO Replace with SQLQueryBuilder?
                 long trackId = ContentUris.parseId(url);
@@ -278,9 +302,14 @@ public class CustomContentProvider extends ContentProvider {
                 queryBuilder.appendWhere(MarkerColumns._ID + "=" + ContentUris.parseId(url));
             }
             case MARKERS_BY_TRACKID -> {
-                queryBuilder.setTables(MarkerColumns.TABLE_NAME + " LEFT OUTER JOIN (SELECT 'unused' AS ICON)"); //TODO Workaround: Column icon was removed in v4.24.0, but is still required for OSM Dashboard v6.4.1.
+                queryBuilder.setTables(MarkerColumns.TABLE_NAME);
                 queryBuilder.appendWhere(MarkerColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
             }
+            case DASHBOARD_MARKERS_BY_TRACKIDS -> {
+                queryBuilder.setTables(MarkerColumns.TABLE_NAME);
+                queryBuilder.appendWhere(MarkerColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
+                queryBuilder.setProjectionMap(DataProvider.DATA_PROJECTIONMAP_MARKERS);
+            }
             default -> throw new IllegalArgumentException("Unknown url " + url);
         }
         Cursor cursor = queryBuilder.query(db, projection, selection, selectionArgs, groupBy, null, sortOrder);
@@ -372,9 +401,11 @@ public class CustomContentProvider extends ContentProvider {
         throw new SQLException("Failed to insert a marker " + url);
     }
 
-    private enum UrlType {
+    //TODO Add ContentType as attribute
+    public enum UrlType {
         TRACKPOINTS,
         TRACKPOINTS_BY_ID,
+        //TODO Check if still used
         TRACKPOINTS_BY_TRACKID,
         TRACKS,
         TRACKS_BY_ID,
@@ -382,6 +413,36 @@ public class CustomContentProvider extends ContentProvider {
         TRACKS_AGGREGATED_STATISTICS,
         MARKERS,
         MARKERS_BY_ID,
-        MARKERS_BY_TRACKID
+        @Deprecated //TODO Should not be used anymore
+        MARKERS_BY_TRACKID,
+
+        DASHBOARD_TRACKS_BY_IDS(Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/dashboard/tracks/"), TracksColumns.CONTENT_TYPE),
+        DASHBOARD_TRACKPOINTS_BY_TRACKIDS(Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/dashboard/trackpoints/"), TrackPointsColumns.CONTENT_TYPE),
+        DASHBOARD_MARKERS_BY_TRACKIDS(Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/dashboard/markers/"), MarkerColumns.CONTENT_TYPE);
+
+        private final Uri uri;
+
+        private final String contentType;
+
+        //TODO Add Uri as attribute:
+        //TODO Add ContentType as attribute:
+        @Deprecated()
+        UrlType() {
+            this.uri = null;
+            this.contentType = null;
+        }
+
+        UrlType(Uri uri, String contentType) {
+            this.uri = uri;
+            this.contentType = contentType;
+        }
+
+        public Uri getUri() {
+            return uri;
+        }
+
+        String getPath() {
+            return uri.getPath();
+        }
     }
 }

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

@@ -29,7 +29,7 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
 
     private static final String TAG = CustomSQLiteOpenHelper.class.getSimpleName();
 
-    private static final int DATABASE_VERSION = 41;
+    private static final int DATABASE_VERSION = 42;
 
     private final Context context;
 
@@ -85,6 +85,7 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
                 case 39 -> upgradeFrom38to39(db);
                 case 40 -> upgradeFrom39to40(db);
                 case 41 -> upgradeFrom40to41(db);
+                case 42 -> upgradeFrom41to42(db);
                 default -> throw new RuntimeException("Not implemented: upgrade to " + toVersion);
             }
         }
@@ -113,6 +114,7 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
                 case 38 -> downgradeFrom39to38(db);
                 case 39 -> downgradeFrom40to39(db);
                 case 40 -> downgradeFrom41to40(db);
+                case 41 -> downgradeFrom42to41(db);
                 default -> throw new RuntimeException("Not implemented: downgrade to " + toVersion);
             }
         }
@@ -764,4 +766,32 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
         db.setTransactionSuccessful();
         db.endTransaction();
     }
+
+    private void upgradeFrom41to42(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("ALTER TABLE markers RENAME TO markers_old");
+        db.execSQL("CREATE TABLE markers (_id INTEGER PRIMARY KEY AUTOINCREMENT, trackid INTEGER NOT NULL, name TEXT, description TEXT, marker_type_localized TEXT, photoUrl TEXT, longitude INTEGER, latitude INTEGER, time INTEGER, altitude FLOAT, accuracy FLOAT, bearing FLOAT, FOREIGN KEY (trackid) REFERENCES tracks(_id) ON UPDATE CASCADE ON DELETE CASCADE)");
+        db.execSQL("INSERT INTO markers SELECT _id, trackid, name, description, category, photoUrl, longitude, latitude, time, elevation, accuracy, bearing FROM markers_old");
+        db.execSQL("DROP TABLE markers_old");
+
+        db.execSQL("CREATE INDEX markers_trackid_index ON markers(trackid)");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    private void downgradeFrom42to41(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("ALTER TABLE markers RENAME TO markers_old");
+        db.execSQL("CREATE TABLE markers (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT, category TEXT, trackid INTEGER NOT NULL, longitude INTEGER, latitude INTEGER, time INTEGER, elevation FLOAT, accuracy FLOAT, bearing FLOAT, photoUrl TEXT, FOREIGN KEY (trackid) REFERENCES tracks(_id) ON UPDATE CASCADE ON DELETE CASCADE)");
+        db.execSQL("INSERT INTO markers SELECT _id, name, description, marker_type_localized, trackid, longitude, latitude, time, altitude, accuracy, bearing, photoUrl FROM markers_old");
+        db.execSQL("DROP TABLE markers_old");
+
+        db.execSQL("CREATE INDEX markers_trackid_index ON markers(trackid)");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
 }

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

@@ -89,11 +89,10 @@ public class ShareContentProvider extends CustomContentProvider {
         trackIdBuilder.deleteCharAt(trackIdBuilder.lastIndexOf(TRACKID_DELIMITER));
 
         Uri uri = Uri.parse(TracksColumns.CONTENT_URI + "/" + trackFileFormat.getPreferenceId() + "/" + trackIdBuilder + "/" + Uri.encode(filename));
-        String mime = getTypeMime(uri);
 
-        Log.d(TAG, "Created uri " + uri + " with MIME " + mime);
+        Log.d(TAG, "Created uri " + uri + " with MIME " + trackFileFormat.getMimeType());
 
-        return new Pair<>(uri, mime);
+        return new Pair<>(uri, trackFileFormat.getMimeType());
     }
 
     static Set<Track.Id> parseURI(Uri uri) {
@@ -126,6 +125,7 @@ public class ShareContentProvider extends CustomContentProvider {
         }
     }
 
+    @Nullable
     private static TrackFileFormat getTrackFileFormat(@NonNull Uri uri) {
         return switch (uriMatcher.match(uri)) {
             case URI_GPX -> TrackFileFormat.GPX;
@@ -134,16 +134,10 @@ public class ShareContentProvider extends CustomContentProvider {
             case URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES ->
                     TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES;
             case URI_CSV -> TrackFileFormat.CSV;
-            default ->
-                    throw new RuntimeException("Could not derive TrackFileFormat from Uri " + uri);
+            default -> null;
         };
     }
 
-    @Nullable
-    private static String getTypeMime(@NonNull Uri uri) {
-        return getTrackFileFormat(uri).getMimeType();
-    }
-
     @Override
     public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
         if (uriMatcher.match(uri) == -1) {
@@ -182,9 +176,9 @@ public class ShareContentProvider extends CustomContentProvider {
     @Nullable
     @Override
     public String getType(@NonNull Uri uri) {
-        String mime = getTypeMime(uri);
-        if (mime != null) {
-            return mime;
+        TrackFileFormat trackFileFormat = getTrackFileFormat(uri);
+        if (trackFileFormat != null) {
+            return trackFileFormat.getMimeType();
         }
 
         return super.getType(uri);

src/main/java/de/dennisguse/opentracks/data/tables/MarkerColumns.java

@@ -39,32 +39,32 @@ public interface MarkerColumns extends BaseColumns {
     String DEFAULT_SORT_ORDER = _ID;
 
     // Columns
-    String NAME = "name"; // marker name
-    String DESCRIPTION = "description"; // marker description
-    String TYPE_LOCALIZED = "category";
-    String TRACKID = "trackid"; // track id
-    String LONGITUDE = "longitude"; // longitude
-    String LATITUDE = "latitude"; // latitude
-    String TIME = "time"; // time
-    String ALTITUDE = "elevation"; // altitude //TODO RENAME column
-    String HORIZONTAL_ACCURACY = "accuracy"; // accuracy
-    String BEARING = "bearing"; // bearing
+    String NAME = "name";
+    String DESCRIPTION = "description";
+    String TYPE_LOCALIZED = "marker_type_localized";
+    String TRACKID = "trackid";
+    String LONGITUDE = "longitude";
+    String LATITUDE = "latitude";
+    String TIME = "time";
+    String ALTITUDE = "altitude";
+    String HORIZONTAL_ACCURACY = "accuracy";
+    String BEARING = "bearing";
 
     String PHOTOURL = "photoUrl"; // url for the photo
 
     String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("
             + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + TRACKID + " INTEGER NOT NULL, "
             + NAME + " TEXT, "
             + DESCRIPTION + " TEXT, "
             + TYPE_LOCALIZED + " TEXT, "
-            + TRACKID + " INTEGER NOT NULL, "
+            + PHOTOURL + " TEXT, "
             + LONGITUDE + " INTEGER, "
             + LATITUDE + " INTEGER, "
             + TIME + " INTEGER, "
             + ALTITUDE + " FLOAT, "
             + HORIZONTAL_ACCURACY + " FLOAT, "
             + BEARING + " FLOAT, "
-            + PHOTOURL + " TEXT, "
             + "FOREIGN KEY (" + TRACKID + ") REFERENCES " + TracksColumns.TABLE_NAME + "(" + TracksColumns._ID + ") ON UPDATE CASCADE ON DELETE CASCADE"
             + ")";
 

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

@@ -5,7 +5,6 @@ import android.content.res.Resources;
 
 import androidx.annotation.NonNull;
 
-import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -31,11 +30,13 @@ public enum TrackFileFormat {
             return new KMLTrackExporter(context, contentProviderUtils, false);
         }
 
+        @NonNull
         @Override
         public String getMimeType() {
             return "application/vnd.google-earth.kml+xml";
         }
 
+        @NonNull
         public String getExtension() {
             return "kml";
         }
@@ -50,11 +51,13 @@ public enum TrackFileFormat {
             return new KMZTrackExporter(context, contentProviderUtils, exportPhotos);
         }
 
+        @NonNull
         @Override
         public String getMimeType() {
             return "application/vnd.google-earth.kmz";
         }
 
+        @NonNull
         public String getExtension() {
             return "kmz";
         }
@@ -72,11 +75,13 @@ public enum TrackFileFormat {
             return new GPXTrackExporter(contentProviderUtils, context.getString(R.string.app_name));
         }
 
+        @NonNull
         @Override
         public String getMimeType() {
             return "application/gpx+xml";
         }
 
+        @NonNull
         public String getExtension() {
             return "gpx";
         }
@@ -88,11 +93,13 @@ public enum TrackFileFormat {
             return new CSVTrackExporter(contentProviderUtils);
         }
 
+        @NonNull
         @Override
         public String getMimeType() {
             return "text/csv";
         }
 
+        @NonNull
         @Override
         public String getExtension() {
             return "csv";
@@ -115,16 +122,10 @@ public enum TrackFileFormat {
         return preferenceIdLabelMap;
     }
 
-    public static TrackFileFormat valueOfPreferenceId(final String preferenceId) {
-        return Arrays.stream(values())
-                .filter(trackFileFormat -> trackFileFormat.getPreferenceId().equals(preferenceId))
-                .findFirst()
-                .orElse(null);
-    }
-
     /**
      * Returns the mime type for each format.
      */
+    @NonNull
     public abstract String getMimeType();
 
     /**
@@ -137,6 +138,7 @@ public enum TrackFileFormat {
     /**
      * Returns the file extension for each format.
      */
+    @NonNull
     public abstract String getExtension();
 
     /**
@@ -149,6 +151,7 @@ public enum TrackFileFormat {
     /**
      * The identifier to be stored in the preferences.
      */
+    @NonNull
     public String getPreferenceId() {
         return preferenceId;
     }

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

@@ -0,0 +1,199 @@
+package de.dennisguse.opentracks.publicapi;
+
+import android.content.ActivityNotFoundException;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.CustomContentProvider;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
+
+/**
+ * Create an {@link Intent} to request showing tracks on a Map or a Dashboard.
+ * The receiving {@link android.app.Activity} gets temporary access to the {@link TracksColumns} and the {@link TrackPointsColumns} (incl. update).
+ */
+public class DataProvider {
+
+    private static final String TAG = DataProvider.class.getSimpleName();
+
+    private static final String ACTION_DASHBOARD = "Intent.OpenTracks-Dashboard";
+
+    private static final String ACTION_DASHBOARD_PAYLOAD = ACTION_DASHBOARD + ".Payload";
+
+    /**
+     * Assume "1" if not present.
+     */
+    private static final String EXTRAS_PROTOCOL_VERSION = "PROTOCOL_VERSION";
+
+    /**
+     * version 1: the initial version.
+     * version 2: replaced pause/resume trackpoints for track segmentation (lat=100 / lat=200) by TrackPoint.Type.
+     * version 3: renamed track database columns.
+     */
+    private static final int CURRENT_VERSION = 2;
+
+    private static final String EXTRAS_OPENTRACKS_IS_RECORDING_THIS_TRACK = "EXTRAS_OPENTRACKS_IS_RECORDING_THIS_TRACK";
+    private static final String EXTRAS_SHOULD_KEEP_SCREEN_ON = "EXTRAS_SHOULD_KEEP_SCREEN_ON";
+    private static final String EXTRAS_SHOW_WHEN_LOCKED = "EXTRAS_SHOULD_KEEP_SCREEN_ON";
+    private static final String EXTRAS_SHOW_FULLSCREEN = "EXTRAS_SHOULD_FULLSCREEN";
+
+    private static final int TRACK_URI_INDEX = 0;
+    private static final int TRACKPOINTS_URI_INDEX = 1;
+    private static final int MARKERS_URI_INDEX = 2;
+
+    public static final Map<String, String> DATA_PROJECTIONMAP_TRACKS = Map.ofEntries(
+            //V2
+            Map.entry("_id", TracksColumns._ID),
+            Map.entry("name", TracksColumns.NAME),
+            Map.entry("description", TracksColumns.DESCRIPTION),
+            Map.entry("category", TracksColumns.ACTIVITY_TYPE + " AS category"),
+            Map.entry("activity_type_localized", TracksColumns.ACTIVITY_TYPE_LOCALIZED),
+            Map.entry("starttime", TracksColumns.STARTTIME + " AS starttime"),
+            Map.entry("stoptime", TracksColumns.STOPTIME + " AS stoptime"),
+            Map.entry("totaltime", TracksColumns.TOTALTIME + " AS totaltime"),
+            Map.entry("movingtime", TracksColumns.MOVINGTIME + " AS movingtime"),
+            Map.entry("totaldistance", TracksColumns.TOTALDISTANCE + " AS totaldistance"),
+            Map.entry("maxspeed", TracksColumns.MAXSPEED + " AS maxspeed"),
+            Map.entry("avgspeed", "null AS avgspeed"),
+            Map.entry("avgmovingspeed", "null AS avgmovingspeed"),
+            Map.entry("minelevation", TracksColumns.MIN_ALTITUDE + " AS minelevation"),
+            Map.entry("maxelevation", TracksColumns.MAX_ALTITUDE + " AS maxelevation"),
+            Map.entry("elevationgain", TracksColumns.ALTITUDE_GAIN + " AS elevationgain"),
+            Map.entry("elevationloss", TracksColumns.ALTITUDE_LOSS + " AS elevationloss"),
+
+            //V3
+//            Map.entry("_id", TracksColumns._ID),
+//            Map.entry("name",TracksColumns.NAME),
+//            Map.entry("description",TracksColumns.DESCRIPTION),
+            Map.entry("activity_type", TracksColumns.ACTIVITY_TYPE),
+//            Map.entry("activity_type_localized",TracksColumns.ACTIVITY_TYPE_LOCALIZED),
+            Map.entry("time_start", TracksColumns.STARTTIME),
+            Map.entry("time_stop", TracksColumns.STOPTIME),
+            Map.entry("duration_total", TracksColumns.TOTALTIME),
+            Map.entry("duration_moving", TracksColumns.MOVINGTIME),
+            Map.entry("distance", TracksColumns.TOTALDISTANCE),
+            Map.entry("speed_max", TracksColumns.MAXSPEED),
+            Map.entry("altitude_min", TracksColumns.MIN_ALTITUDE),
+            Map.entry("altitude_max", TracksColumns.MAX_ALTITUDE),
+            Map.entry("altitude_gain", TracksColumns.ALTITUDE_GAIN),
+            Map.entry("altitude_loss", TracksColumns.ALTITUDE_LOSS)
+    );
+
+    public static final Map<String, String> DATA_PROJECTIONMAP_TRACKPOINTS = Map.ofEntries(
+            //V2 and V3
+            Map.entry("_id", TrackPointsColumns._ID),
+            Map.entry("trackid", TrackPointsColumns.TRACKID),
+            Map.entry("latitude", TrackPointsColumns.LATITUDE),
+            Map.entry("longitude", TrackPointsColumns.LONGITUDE),
+            Map.entry("time", TrackPointsColumns.TIME),
+            Map.entry("type", TrackPointsColumns.TYPE),
+            Map.entry("speed", TrackPointsColumns.SPEED)
+    );
+    public static final Map<String, String> DATA_PROJECTIONMAP_MARKERS = Map.ofEntries(
+            //V2
+            Map.entry("_id", MarkerColumns._ID),
+            Map.entry("trackid", MarkerColumns.TRACKID),
+            Map.entry("name", MarkerColumns.NAME),
+            Map.entry("description", MarkerColumns.DESCRIPTION),
+            Map.entry("category", MarkerColumns.TYPE_LOCALIZED + " AS category"),
+            Map.entry("latitude", MarkerColumns.LATITUDE),
+            Map.entry("longitude", MarkerColumns.LONGITUDE),
+            Map.entry("photoUrl", MarkerColumns.PHOTOURL),
+            Map.entry("icon", "null AS icon"),
+
+            //V3
+//            Map.entry("_id", MarkerColumns._ID),
+//            Map.entry("trackid",MarkerColumns.TRACKID),
+//            Map.entry("name",MarkerColumns.NAME),
+//            Map.entry("description",MarkerColumns.DESCRIPTION),
+            Map.entry("marker_type_localized", MarkerColumns.TYPE_LOCALIZED)
+//            Map.entry("latitude",MarkerColumns.LATITUDE),
+//            Map.entry("longitude",MarkerColumns.LONGITUDE),
+//            Map.entry("photoUrl",MarkerColumns.PHOTOURL)
+    );
+
+
+    private DataProvider() {
+    }
+
+    /**
+     * Send intent to show tracks on a map (needs an another app) as resource URIs.
+     *
+     * @param context     the context
+     * @param isRecording are we currently recording?
+     * @param trackIds    the track ids
+     */
+    public static void showTrackOnMap(Context context, boolean isRecording, Track.Id... trackIds) {
+        startDashboard(context, isRecording, null, null, trackIds);
+    }
+
+    /**
+     * Send intent to show tracks on a map (needs an another app) as resource URIs.
+     * By providing a targetPackage and targetClass an explicit intent can be sent,
+     * thus bypassing the need for the user to select an app.
+     *
+     * @param context       the context
+     * @param isRecording   are we currently recording?
+     * @param targetPackage the target package
+     * @param targetClass   the target class
+     * @param trackIds      the track ids
+     */
+    public static void startDashboard(Context context, boolean isRecording, @Nullable String targetPackage, @Nullable String targetClass, Track.Id... trackIds) {
+        if (trackIds.length == 0) {
+            return;
+        }
+
+        String trackIdList = ContentProviderUtils.formatIdListForUri(trackIds);
+
+        ArrayList<Uri> uris = new ArrayList<>();
+        uris.add(TRACK_URI_INDEX, Uri.withAppendedPath(CustomContentProvider.UrlType.DASHBOARD_TRACKS_BY_IDS.getUri(), trackIdList));
+        uris.add(TRACKPOINTS_URI_INDEX, Uri.withAppendedPath(CustomContentProvider.UrlType.DASHBOARD_TRACKPOINTS_BY_TRACKIDS.getUri(), trackIdList));
+        uris.add(MARKERS_URI_INDEX, Uri.withAppendedPath(CustomContentProvider.UrlType.DASHBOARD_MARKERS_BY_TRACKIDS.getUri(), trackIdList));
+
+        Intent intent = new Intent(ACTION_DASHBOARD);
+        intent.putExtra(EXTRAS_PROTOCOL_VERSION, CURRENT_VERSION);
+
+        intent.putParcelableArrayListExtra(ACTION_DASHBOARD_PAYLOAD, uris);
+
+        intent.putExtra(EXTRAS_SHOULD_KEEP_SCREEN_ON, PreferencesUtils.shouldKeepScreenOn());
+        intent.putExtra(EXTRAS_SHOW_WHEN_LOCKED, PreferencesUtils.shouldShowStatsOnLockscreen());
+        intent.putExtra(EXTRAS_OPENTRACKS_IS_RECORDING_THIS_TRACK, isRecording);
+        if (isRecording) {
+            intent.putExtra(EXTRAS_SHOW_FULLSCREEN, PreferencesUtils.shouldUseFullscreen());
+        }
+
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        ClipData clipData = ClipData.newRawUri(null, uris.get(TRACK_URI_INDEX));
+        clipData.addItem(new ClipData.Item(uris.get(TRACKPOINTS_URI_INDEX)));
+        clipData.addItem(new ClipData.Item(uris.get(MARKERS_URI_INDEX)));
+        intent.setClipData(clipData);
+
+        if (targetPackage != null && targetClass != null) {
+            Log.i(TAG, "Starting dashboard activity with explicit intent (package=" + targetPackage + ", class=" + targetClass + ")");
+            intent.setClassName(targetPackage, targetClass);
+        } else {
+            Log.i(TAG, "Starting dashboard activity with generic intent (package=" + targetPackage + ", class=" + targetClass + ")");
+        }
+
+        try {
+            context.startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            Log.e(TAG, "Dashboard not installed; cannot start it.");
+            Toast.makeText(context, R.string.show_on_dashboard_not_installed, Toast.LENGTH_SHORT).show();
+        }
+    }
+}

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

@@ -10,7 +10,6 @@ import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackBuilder;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.util.IntentDashboardUtils;
 
 public class StartRecording extends AbstractAPIActivity {
 
@@ -61,7 +60,7 @@ public class StartRecording extends AbstractAPIActivity {
         String targetPackage = bundle.getString(EXTRA_STATS_TARGET_PACKAGE, null);
         String targetClass = bundle.getString(EXTRA_STATS_TARGET_CLASS, null);
         if (targetClass != null && targetPackage != null) {
-            IntentDashboardUtils.startDashboard(this, true, targetPackage, targetClass, trackId);
+            DataProvider.startDashboard(this, true, targetPackage, targetClass, trackId);
         }
     }
 

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

@@ -185,14 +185,15 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     }
 
     private void startRecording() {
-        // Update instance variables
-        handler.postDelayed(updateRecordingData, RECORDING_DATA_UPDATE_INTERVAL.toMillis());
-
         startSensors();
 
         voiceAnnouncementManager.start(trackRecordingManager.getTrackStatistics());
 
         notificationManager.onRecordingStarted(this, recordingStatus.trackId());
+
+        // Update instance variables
+        updateRecordingData.run();
+        handler.postDelayed(updateRecordingData, RECORDING_DATA_UPDATE_INTERVAL.toMillis());
     }
 
     public void tryStartSensors() {

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

@@ -778,7 +778,14 @@ public class PreferencesUtils {
             // We want to really clear settings now.
             sharedPreferences.edit().clear().commit();
         }
+
+        // Each setting file must be mentioned here.
         PreferenceManager.setDefaultValues(context, R.xml.settings, readAgain);
+        PreferenceManager.setDefaultValues(context, R.xml.settings_defaults, readAgain);
+        PreferenceManager.setDefaultValues(context, R.xml.settings_user_interface, readAgain);
+        PreferenceManager.setDefaultValues(context, R.xml.settings_sensors, readAgain);
+        PreferenceManager.setDefaultValues(context, R.xml.settings_import_export, readAgain);
+        PreferenceManager.setDefaultValues(context, R.xml.settings_public_api, readAgain);
     }
 
     public static Uri getDefaultExportDirectoryUri() {

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

@@ -1,125 +0,0 @@
-package de.dennisguse.opentracks.util;
-
-import android.content.ActivityNotFoundException;
-import android.content.ClipData;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.util.Log;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-
-import java.util.ArrayList;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.data.ContentProviderUtils;
-import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.data.tables.MarkerColumns;
-import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
-import de.dennisguse.opentracks.data.tables.TracksColumns;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-
-/**
- * Create an {@link Intent} to request showing tracks on a Map or a Dashboard.
- * The receiving {@link android.app.Activity} gets temporary access to the {@link TracksColumns} and the {@link TrackPointsColumns} (incl. update).
- */
-public class IntentDashboardUtils {
-
-    private static final String TAG = IntentDashboardUtils.class.getSimpleName();
-
-    private static final String ACTION_DASHBOARD = "Intent.OpenTracks-Dashboard";
-
-    private static final String ACTION_DASHBOARD_PAYLOAD = ACTION_DASHBOARD + ".Payload";
-
-    /**
-     * Assume "v1" if not present.
-     */
-    private static final String EXTRAS_PROTOCOL_VERSION = "PROTOCOL_VERSION";
-
-    /**
-     * version 1: the initial version.
-     * version 2: replaced pause/resume trackpoints for track segmentation (lat=100 / lat=200) by TrackPoint.Type.
-     */
-    private static final int CURRENT_VERSION = 2;
-
-    private static final String EXTRAS_OPENTRACKS_IS_RECORDING_THIS_TRACK = "EXTRAS_OPENTRACKS_IS_RECORDING_THIS_TRACK";
-    private static final String EXTRAS_SHOULD_KEEP_SCREEN_ON = "EXTRAS_SHOULD_KEEP_SCREEN_ON";
-    private static final String EXTRAS_SHOW_WHEN_LOCKED = "EXTRAS_SHOULD_KEEP_SCREEN_ON";
-    private static final String EXTRAS_SHOW_FULLSCREEN = "EXTRAS_SHOULD_FULLSCREEN";
-
-    private static final int TRACK_URI_INDEX = 0;
-    private static final int TRACKPOINTS_URI_INDEX = 1;
-    private static final int MARKERS_URI_INDEX = 2;
-    private static final int NONE_SELECTED = -1;
-
-    private IntentDashboardUtils() {
-    }
-
-    /**
-     * Send intent to show tracks on a map (needs an another app) as resource URIs.
-     *
-     * @param context  the context
-     * @param isRecording are we currently recording?
-     * @param trackIds the track ids
-     */
-    public static void showTrackOnMap(Context context, boolean isRecording, Track.Id... trackIds) {
-        startDashboard(context, isRecording, null, null, trackIds);
-    }
-
-    /**
-     * Send intent to show tracks on a map (needs an another app) as resource URIs.
-     * By providing a targetPackage and targetClass an explicit intent can be sent,
-     * thus bypassing the need for the user to select an app.
-     *
-     * @param context the context
-     * @param isRecording are we currently recording?
-     * @param targetPackage the target package
-     * @param targetClass the target class
-     * @param trackIds the track ids
-     */
-    public static void startDashboard(Context context, boolean isRecording, @Nullable String targetPackage, @Nullable String targetClass, Track.Id... trackIds) {
-        if (trackIds.length == 0) {
-            return;
-        }
-
-        String trackIdList = ContentProviderUtils.formatIdListForUri(trackIds);
-
-        ArrayList<Uri> uris = new ArrayList<>();
-        uris.add(TRACK_URI_INDEX, Uri.withAppendedPath(TracksColumns.CONTENT_URI, trackIdList));
-        uris.add(TRACKPOINTS_URI_INDEX, Uri.withAppendedPath(TrackPointsColumns.CONTENT_URI_BY_TRACKID, trackIdList));
-        uris.add(MARKERS_URI_INDEX, Uri.withAppendedPath(MarkerColumns.CONTENT_URI_BY_TRACKID, trackIdList));
-
-        Intent intent = new Intent(ACTION_DASHBOARD);
-        intent.putExtra(EXTRAS_PROTOCOL_VERSION, CURRENT_VERSION);
-
-        intent.putParcelableArrayListExtra(ACTION_DASHBOARD_PAYLOAD, uris);
-
-        intent.putExtra(EXTRAS_SHOULD_KEEP_SCREEN_ON, PreferencesUtils.shouldKeepScreenOn());
-        intent.putExtra(EXTRAS_SHOW_WHEN_LOCKED, PreferencesUtils.shouldShowStatsOnLockscreen());
-        intent.putExtra(EXTRAS_OPENTRACKS_IS_RECORDING_THIS_TRACK, isRecording);
-        if (isRecording) {
-            intent.putExtra(EXTRAS_SHOW_FULLSCREEN, PreferencesUtils.shouldUseFullscreen());
-        }
-
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        ClipData clipData = ClipData.newRawUri(null, uris.get(TRACK_URI_INDEX));
-        clipData.addItem(new ClipData.Item(uris.get(TRACKPOINTS_URI_INDEX)));
-        clipData.addItem(new ClipData.Item(uris.get(MARKERS_URI_INDEX)));
-        intent.setClipData(clipData);
-
-        if (targetPackage != null && targetClass != null) {
-            Log.i(TAG, "Starting dashboard activity with explicit intent (package=" + targetPackage + ", class=" + targetClass + ")");
-            intent.setClassName(targetPackage, targetClass);
-        } else {
-            Log.i(TAG, "Starting dashboard activity with generic intent (package=" + targetPackage + ", class=" + targetClass + ")");
-        }
-
-        try {
-            context.startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-            Log.e(TAG, "Dashboard not installed; cannot start it.");
-            Toast.makeText(context, R.string.show_on_dashboard_not_installed, Toast.LENGTH_SHORT).show();
-        }
-    }
-}

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

@@ -596,4 +596,7 @@ limitations under the License.
     <string name="introduction_osm_dashboard">Kaardi kuvamine pole OpenTracks-i automaatselt lisatud. Oma salvestiste kaardil vaatamiseks palun paigalda OSMDashboard.</string>
     <string name="settings_recording_min_sampling_interval_title">Proovivõtu ajavahemik</string>
     <string name="voice_announce_lap_power_key">RingiVõimsuseHäälteade</string>
+    <string name="description_sensor_temperature">Temperatuur (Celsius)</string>
+    <string name="sensor_state_temperature">Termomeeter</string>
+    <string name="stats_sensors_temperature">Temperatuur</string>
 </resources>

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

@@ -604,4 +604,7 @@ limitations under the License.
     <string name="settings_announcements_segment_average_speed_pace">Velocidade/Ritmo medios (Tramo)</string>
     <string name="stats_average_segment_pace">Ritmo medio no Tramo</string>
     <string name="stats_elapsed_segment_time">Tempo transcurrido no tramo</string>
+    <string name="stats_sensors_temperature">Temperatura</string>
+    <string name="description_sensor_temperature">Temperatura (Celsius)</string>
+    <string name="sensor_state_temperature">Termómetro</string>
 </resources>

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

@@ -216,7 +216,7 @@ limitations under the License.
     <string name="track_markers">Markører for %1$s</string>
     <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Sporet og markørene slettes fra enheten for godt.</string>
-    <string name="track_delete_one_confirm_title">Slett sporet\?</string>
+    <string name="track_delete_one_confirm_title">Slette spor?</string>
     <string name="track_delete_multiple_confirm_message">Valgte spor og markører slettes fra enheten for godt.</string>
     <string name="track_delete_progress_message">Sletter …</string>
     <!-- Track Detail -->
@@ -585,4 +585,7 @@ limitations under the License.
     <string name="track_edit_time_offset">Tidssoneforskyvning</string>
     <string name="stats_average_segment_pace">Gjen. segmenttempo</string>
     <string name="settings_announcements_segment_average_speed_pace">Gjennomsnittlig hastighet/tempo (Segment)</string>
+    <string name="stats_sensors_temperature">Temperatur</string>
+    <string name="sensor_state_temperature">Termometer</string>
+    <string name="description_sensor_temperature">Temperatur (Celsius)</string>
 </resources>

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

@@ -545,4 +545,7 @@
     <string name="settings_announcements_segment_average_speed_pace">சராசரி வேகம்/பாய்சல் (பிரிவு)</string>
     <string name="stats_average_segment_pace">சராசரி பிரிவு வேகம்</string>
     <string name="stats_elapsed_segment_time">கடந்த பிரிவு நேரம்</string>
+    <string name="description_sensor_temperature">வெப்பநிலை (செல்சியசு)</string>
+    <string name="sensor_state_temperature">வெப்பமானி</string>
+    <string name="stats_sensors_temperature">வெப்பநிலை</string>
 </resources>

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

@@ -600,4 +600,7 @@ limitations under the License.
     <string name="stats_gain_loss">Підйом і спуск</string>
     <string name="voice_announce_lap_power_key">voiceAnnounceLapPower</string>
     <string name="stats_elapsed_segment_time">Час на відрізок</string>
+    <string name="description_sensor_temperature">Температура (Цельсій)</string>
+    <string name="sensor_state_temperature">Термометр</string>
+    <string name="stats_sensors_temperature">Температура</string>
 </resources>

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

@@ -83,14 +83,14 @@ limitations under the License.
     <string name="activity_type_wind_surfing">帆板运动</string>
     <!-- Description -->
     <string name="description_activity_type">活动类型：%1$s</string>
-    <string name="description_average_moving_pace_in_minute">平均移动配速：%1$s分钟/公里（%2$s分钟/英里）</string>
+    <string name="description_average_moving_pace_in_minute">平均移动配速：%1$s 分钟/公里（%2$s 分钟/英里）</string>
     <string name="description_average_moving_speed">平均移动速度：%1$.2f 公里/小时（%2$.1f 英里/小时）</string>
-    <string name="description_average_pace_in_minute">平均配速：%1$s分钟/公里（%2$s分钟/英里）</string>
-    <string name="description_average_speed">平均时速：%1$.2f 公里/小时（%2$.1f 英里/小时）</string>
-    <string name="description_altitude_gain">海拔升高：%1$d 米（%2$d 英尺）</string>
+    <string name="description_average_pace_in_minute">平均配速：%1$s 分钟/公里（%2$s 分钟/英里）</string>
+    <string name="description_average_speed">平均速度：%1$.2f 公里/小时（%2$.1f 英里/小时）</string>
+    <string name="description_altitude_gain">海拔上升：%1$d 米（%2$d 英尺）</string>
     <string name="description_altitude_imperial">海拔（英尺）</string>
     <string name="description_altitude_metric">海拔（米）</string>
-    <string name="description_fastest_pace_in_minute">最快配速：%1$s分钟/公里（%2$s分钟/英里）</string>
+    <string name="description_fastest_pace_in_minute">最快配速：%1$s 分钟/公里（%2$s 分钟/英里）</string>
     <string name="description_max_altitude">最高海拔：%1$d 米（%2$d 英尺）</string>
     <string name="description_max_speed">最高速度：%1$.2f 公里/小时（%2$.1f 英里/小时）</string>
     <string name="description_min_altitude">最低海拔：%1$d 米（%2$d 英尺）</string>
@@ -99,8 +99,8 @@ limitations under the License.
     <string name="description_pace_metric">配速（分钟/公里）</string>
     <string name="description_recorded_time">记录时间：%1$s</string>
     <string name="description_speed_ms">速度（米/秒）</string>
-    <string name="description_sensor_cadence">蹬踏频率（转数/分钟）</string>
-    <string name="description_sensor_heart_rate">心率（次/分钟）</string>
+    <string name="description_sensor_cadence">踏频（RPM）</string>
+    <string name="description_sensor_heart_rate">心率（BPM）</string>
     <string name="description_sensor_power">功率（瓦）</string>
     <string name="description_speed_imperial">速度（英里/小时）</string>
     <string name="description_speed_metric">速度（公里/小时）</string>
@@ -112,14 +112,14 @@ limitations under the License.
     <!-- External Storage -->
     <!-- Generic -->
     <string name="generic_add">添加</string>
-    <string name="generic_delete_selected_confirm_title">删除所选项？</string>
-    <string name="generic_description">说明</string>
-    <string name="generic_description_line">说明：%1$s</string>
+    <string name="generic_delete_selected_confirm_title">删除所选内容？</string>
+    <string name="generic_description">描述</string>
+    <string name="generic_description_line">描述：%1$s</string>
     <string name="generic_name">名称</string>
     <string name="generic_name_line">名称：%1$s</string>
     <string name="generic_recording">正在记录…</string>
     <string name="generic_save">保存</string>
-    <string name="generic_tracks">路线</string>
+    <string name="generic_tracks">轨迹</string>
     <!-- Gps -->
     <string name="gps_starting">正在启动 GPS</string>
     <string name="gps_wait_for_better_signal">正在等待更好的 GPS 信号</string>
@@ -130,16 +130,16 @@ limitations under the License.
     <string name="image_photo_marker">照片标记</string>
     <string name="image_record">记录</string>
     <string name="image_stop">停止</string>
-    <string name="image_track">跟踪</string>
+    <string name="image_track">轨迹</string>
     <!-- Import -->
     <string name="import_progress_message">正在从 %1$s 导入…</string>
     <!-- Marker -->
     <string name="marker_add_error">无法插入标记，无 GPS 信号。请重试。</string>
     <string name="marker_add_success">已插入标记</string>
     <string name="marker_add_canceled">已取消，未添加标记</string>
-    <string name="marker_delete_one_confirm_message">标记将永久地从设备中删除</string>
+    <string name="marker_delete_one_confirm_message">标记将从设备中永久删除</string>
     <string name="marker_delete_one_confirm_title">删除标记？</string>
-    <string name="marker_delete_multiple_confirm_message">所选标记将永久地从设备中删除</string>
+    <string name="marker_delete_multiple_confirm_message">所选标记将从设备中永久删除</string>
     <string name="marker_name_format">标记 %1$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
@@ -147,10 +147,10 @@ limitations under the License.
     <!-- Marker List -->
     <string name="marker_list_empty_message">您没有任何标记</string>
     <!-- Menu -->
-    <string name="menu_aggregated_statistics">汇总统计信息</string>
+    <string name="menu_aggregated_statistics">汇总统计数据</string>
     <string name="menu_delete">删除</string>
-    <string name="menu_edit">修改</string>
-    <string name="menu_export_all">全部导出（一个文件存储一条路线）</string>
+    <string name="menu_edit">编辑</string>
+    <string name="menu_export_all">全部导出（每条轨迹单独文件）</string>
     <string name="menu_help">帮助</string>
     <string name="menu_import_all">全部导入</string>
     <string name="menu_insert_marker">插入标记</string>
@@ -161,8 +161,8 @@ limitations under the License.
     <string name="menu_settings">设置</string>
     <string name="menu_share">分享</string>
     <string name="menu_show_on_map">在地图上显示</string>
-    <string name="menu_voice_rate">语音提示速率</string>
-    <string name="menu_resume_track">继续</string>
+    <string name="menu_voice_rate">语音速度</string>
+    <string name="menu_resume_track">恢复轨迹</string>
     <!-- OpenTracks -->
     <string name="recording_service">记录服务</string>
     <!-- Search -->
@@ -179,42 +179,40 @@ limitations under the License.
     <!-- Settings Recording -->
     <string name="settings_recording_show_on_lockscreen_while_recording_title">锁屏显示统计数据</string>
     <string name="settings_recording_show_on_lockscreen_while_recording_summary">记录时，无需解锁设备即可显示统计数据。</string>
-    <string name="settings_recording_keep_screen_on_while_recording_title">保持亮屏</string>
-    <string name="settings_recording_keep_screen_on_while_recording_summary">记录时，保持屏幕常亮。</string>
-    <string name="settings_recording_fullscreen_on_while_recording_title">全屏显示</string>
-    <string name="settings_recording_fullscreen_on_while_recording_summary">记录时，全屏幕显示。</string>
+    <string name="settings_recording_keep_screen_on_while_recording_title">保持屏幕开启</string>
+    <string name="settings_recording_keep_screen_on_while_recording_summary">记录时让屏幕保持开启。</string>
+    <string name="settings_recording_fullscreen_on_while_recording_title">全屏</string>
+    <string name="settings_recording_fullscreen_on_while_recording_summary">记录时以全屏显示。</string>
     <string name="settings_recording_default_activity_title">默认活动类型</string>
-    <string name="settings_recording_location_frequency_summary">每隔%1$s检查一次位置</string>
-    <string name="settings_recording_max_recording_distance_summary">如果两个位置之间的距离超过%1$s，则创建新的路段</string>
+    <string name="settings_recording_location_frequency_summary">位置检查间隔：%1$s</string>
+    <string name="settings_recording_max_recording_distance_summary">如果两个位置之间的距离超过 %1$s，则会创建新分段</string>
     <string name="settings_recording_max_recording_distance_title">最大距离</string>
     <string name="settings_recording_min_recording_distance_title">记录距离间隔</string>
     <string name="settings_recording_min_recording_interval_title">记录时间间隔</string>
     <string name="settings_recording_min_required_accuracy_title">GPS 精度</string>
-    <string name="settings_recording_track_name_date_iso_8601_option">日期 (ISO 8601)</string>
+    <string name="settings_recording_track_name_date_iso_8601_option">日期（ISO 8601）</string>
     <string name="settings_recording_track_name_date_local_option">日期（本地）</string>
     <string name="settings_recording_track_name_number_option">编号</string>
-    <string name="settings_recording_track_name_title">默认路线名称</string>
+    <string name="settings_recording_track_name_title">默认轨迹名称</string>
     <string name="settings_night_mode_title">用户界面主题</string>
-    <string name="settings_night_mode_option_system">跟随系统</string>
-    <string name="settings_night_mode_option_day">白天模式</string>
-    <string name="settings_night_mode_option_night">夜间模式</string>
+    <string name="settings_night_mode_option_system">系统</string>
+    <string name="settings_night_mode_option_day">浅色</string>
+    <string name="settings_night_mode_option_night">深色</string>
     <!-- Settings Reset -->
-    <string name="settings_reset_confirm_message">所有设置都将恢复为默认值。此操作不会删除设备上的路线。</string>
-    <string name="settings_reset_confirm_title">是否立即重置？</string>
+    <string name="settings_reset_confirm_message">所有设置都将恢复为默认值。此操作不会删除设备上的任何轨迹。</string>
+    <string name="settings_reset_confirm_title">立即重置？</string>
     <string name="settings_reset_done">所有设置都已恢复为默认值</string>
     <!-- Settings Sensor -->
-    <string name="settings_sensor_wheel_circumference">车轮周长 (mm)</string>
+    <string name="settings_sensor_wheel_circumference">车轮周长（毫米）</string>
     <!-- Settings Stats -->
     <string name="settings_stats_rate_title">首选速率</string>
     <string name="settings_stats_units_imperial">英制（英里、英尺）</string>
     <string name="settings_stats_units_metric">公制（公里、米）</string>
     <string name="settings_stats_units_title">首选单位</string>
-    <string name="settings_prevent_reimport_tracks_title">防止重复导入路线</string>
+    <string name="settings_prevent_reimport_tracks_title">防止重复导入轨迹</string>
     <!-- Share Track -->
-    <string name="share_track_share_file_body">我想您可能会对此路线感兴趣。
-\n
-\n%1$s</string>
-    <string name="share_track_subject">我想给您分享一条路线</string>
+    <string name="share_track_share_file_body">我觉得您可能会对这条轨迹感兴趣。\n\n%1$s</string>
+    <string name="share_track_subject">我想把这条轨迹分享给您</string>
     <!-- Stats -->
     <string name="stats_average_moving_pace">平均移动配速</string>
     <string name="stats_average_moving_speed">平均移动速度</string>
@@ -222,7 +220,7 @@ limitations under the License.
     <string name="stats_average_speed">平均速度</string>
     <string name="stats_altitude">海拔</string>
     <string name="stats_fastest_pace">最快配速</string>
-    <string name="stats_gain">增益</string>
+    <string name="stats_gain">上升</string>
     <string name="stats_max_speed">最高速度</string>
     <string name="stats_moving_time">移动时间</string>
     <string name="stats_pace">配速</string>
@@ -231,20 +229,20 @@ limitations under the License.
     <string name="stats_total_time">总时间</string>
     <string name="stats_split_interval">分段间隔</string>
     <!-- Track -->
-    <string name="track_name_format">路线 %1$d</string>
+    <string name="track_name_format">轨迹 %1$d</string>
     <string name="track_markers">%1$s 标记</string>
     <!-- Track Delete -->
-    <string name="track_delete_one_confirm_message">系统将从设备中永久删除路线及其标记。</string>
-    <string name="track_delete_one_confirm_title">删除路线？</string>
-    <string name="track_delete_multiple_confirm_message">系统将从设备中永久删除选定的路线及其标记。</string>
+    <string name="track_delete_one_confirm_message">该轨迹及其标记将从设备中永久删除。</string>
+    <string name="track_delete_one_confirm_title">删除轨迹？</string>
+    <string name="track_delete_multiple_confirm_message">所选轨迹及其标记将从设备中永久删除。</string>
     <string name="track_delete_progress_message">正在删除…</string>
     <!-- Track Detail -->
-    <string name="track_detail_stats_tab">统计信息</string>
+    <string name="track_detail_stats_tab">统计数据</string>
     <!-- Track Edit -->
     <string name="track_edit_activity_type">活动类型（如徒步）</string>
     <string name="track_edit_activity_type_hint">活动类型</string>
     <!-- Track List -->
-    <string name="track_list_empty_message">在这里开始记录您的新冒险</string>
+    <string name="track_list_empty_message">在此处开始记录您的下一次探险</string>
     <!-- Track Widget -->
     <!-- Tracks -->
     <!-- Unit -->
@@ -261,14 +259,14 @@ limitations under the License.
     <string name="value_integer_feet_recommended">%1$d 英尺（推荐）</string>
     <string name="value_integer_kilometer_hour">%1$d 公里/小时</string>
     <string name="value_integer_meter_excellent_gps">%1$d 米（GPS 信号极佳）</string>
-    <string name="value_integer_meter_poor_gps">%1$d 米（GPS 信号差）</string>
+    <string name="value_integer_meter_poor_gps">%1$d 米（GPS 信号不佳）</string>
     <string name="value_integer_meter_recommended">%1$d 米（推荐）</string>
     <string name="value_integer_mile_hour">%1$d 英里/小时</string>
     <string name="value_integer_minute">%1$d 分钟</string>
     <string name="value_integer_second">%1$d 秒</string>
     <string name="value_none">无</string>
     <string name="value_off">关闭</string>
-    <string name="value_smallest_recommended">最小（建议）</string>
+    <string name="value_smallest_recommended">最小（推荐）</string>
     <!-- Voice -->
     <string name="voiceHoursPlural">
         { n, plural,
@@ -348,79 +346,74 @@ limitations under the License.
     <string name="waypoint_type_water_fountain">喷泉</string>
     <string name="waypoint_type_waypoint">路标</string>
     <string name="about_url">项目主页：<a href="%1$s">%1$s</a></string>
-    <string name="about_history">OpenTracks 是已于 2016 年停止维护的 <a href="https://code.google.com/archive/p/mytracks/"><i>Google MyTracks</i></a> 的一个分支版本。</string>
+    <string name="about_history">OpenTracks 是 2016 年停止维护的 <a href="https://code.google.com/archive/p/mytracks/"><i>Google MyTracks</i></a> 的分支版本。</string>
     <string name="open_track_as_trackfileformat">作为 %1$s 文件打开</string>
     <string name="about_preference_title">关于</string>
     <string name="about_version_name">版本名称：%1$s</string>
     <string name="about_version_code">版本号：%1$d</string>
     <string name="about_libraries">库</string>
-    <string name="help_feature_title">OpenTracks 支持以下特性：</string>
+    <string name="help_feature_title">OpenTracks 具备以下功能：</string>
     <string name="activity_type_escooter">电动滑板车</string>
-    <string name="description_altitude_loss">海拔降低：%1$d 米（%2$d 英尺）</string>
+    <string name="description_altitude_loss">海拔下降：%1$d 米（%2$d 英尺）</string>
     <string name="description_default_speed_or_pace">按活动类型</string>
     <!-- Share image -->
-    <string name="hold_to_stop">长按停止</string>
-    <string name="instant_export_enabled_summary">活动结束后，自动导出数据</string>
-    <string name="instant_export_enabled_title">自动导出</string>
-    <string name="settings_default_export_uri_title">选择导出目录</string>
-    <string name="help_recording_content">OpenTracks 使用设备内置的 GPS 传感器来记录位置信息，即使来自 GPS 传感器的数据（比如位置、速度、高度）并不精确。</string>
+    <string name="hold_to_stop">按住即可停止</string>
+    <string name="instant_export_enabled_summary">记录完成后将轨迹导出至存储空间</string>
+    <string name="instant_export_enabled_title">运动数据即时导出</string>
+    <string name="settings_default_export_uri_title">轨迹导出目录</string>
+    <string name="help_recording_content">OpenTracks 使用设备的 GPS 传感器持续记录位置信息。如果 GPS 设备报告的数据（例如位置、速度、海拔）不准确，OpenTracks 对此无法采取任何措施。</string>
     <string name="gps_recording_without_signal">OpenTracks 正在无 GPS 信号状态下记录数据。</string>
     <string name="help_data_storage_title">OpenTracks 如何存储传感器数据？</string>
     <string name="help_data_google_play_services_title">OpenTracks 依赖或者使用 Google Play 服务吗？</string>
     <string name="help_recording_title">OpenTracks 如何记录数据？</string>
     <string name="gps_fixed_and_ready">GPS 已就绪</string>
-    <string name="gps_disabled_msg">GPS 被禁用</string>
+    <string name="gps_disabled_msg">GPS 已禁用</string>
     <string name="speed">平均移动速度</string>
-    <string name="about_description"><i>OpenTracks</i> 是一款完全尊重您的个人隐私的运动追踪软件。</string>
-    <string name="help_feature_content">* 创建 GPS 路线
-\n* 使用心率传感器（仅支持低功率蓝牙）
-\n* 语音播报（时间或距离）
-\n* 创建标记（可包含图片）
-\n* 完全不需要联网
-\n* 在地图上显示路线（见下方）</string>
-    <string name="help_gps_troubleshooting_content">下面是你可以做的事情：\n 一、检查 GPS 是否已经开启，\n 二、改善 GPS 信号（比如走到室外），\n 三、使用 <a href="https://f-droid.org/en/packages/com.android.gpstest.osmdroid/">GPSTest</a> 工具检查 GPS 是否正常， \n 四、关闭节能模式。\n\n 如果以上措施都不起作用，请给我们提交 BUG 报告。</string>
-    <string name="help_storage_pictures_title">OpenTracks 是如何存储被用作标记的照片的？</string>
-    <string name="help_track_export_content">您可以在设置界面导出路线，支持的格式有 KMZ、KML 和 GPX。KMZ 和 KML 格式包含全部数据；GPX 仅包含位置数据。用<i>分享图标</i>分享出去的路线即为 KMZ 格式。</string>
-    <string name="help_support_content">你可以：\n 一、向别人介绍 OpenTracks，\n 二、<a href="https://codeberg.org/OpenTracksApp/OpenTracks/issues">提交新功能建议</a>，\n 三、<a href="https://codeberg.org/OpenTracksApp/OpenTracks/issues">报告 BUG</a>，\n 四、帮助开发本应用，\n 五、在 <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">Google Play 商店</a>购买本应用，\n 六、赞助，或者\n 七、做任何你认为可以帮助到 OpenTracks 的事情。</string>
+    <string name="about_description"><i>OpenTracks</i> 是完全尊重您隐私的运动追踪应用程序。</string>
+    <string name="help_feature_content">* 创建 GPS 轨迹\n* 使用心率传感器（仅限低功率蓝牙）\n* 语音播报（按时间或距离）\n* 创建标记（包括图片）\n* 完全离线工作\n* 在地图上显示轨迹（见下方）</string>
+    <string name="help_gps_troubleshooting_content">您可以采取以下措施：\n 一、检查 GPS 是否已启用，\n 二、改善 GPS 信号接收（例如移步室外），\n 三、使用 <a href="https://f-droid.org/zh_Hans/packages/com.android.gpstest.osmdroid/">GPSTest</a> 应用进行检测，\n 四、禁用省电模式。\n \n 如果以上措施无效，请提交错误报告。</string>
+    <string name="help_storage_pictures_title">OpenTracks 如何存储作为标记拍摄的照片？</string>
+    <string name="help_track_export_content">轨迹可以从设置中以 KMZ、KML 或 GPX 格式导出。KMZ/KML 包含所有数据，GPX 仅包含位置数据。通过<i>分享图标</i>分享的轨迹将以 KMZ 格式分享。</string>
+    <string name="help_support_content">您可以通过以下方式贡献力量：\n 一、宣传推广 OpenTracks，\n 二、<a href="https://codeberg.org/OpenTracksApp/OpenTracks/issues">提出功能建议</a>，\n 三、<a href="https://codeberg.org/OpenTracksApp/OpenTracks/issues">提交错误报告</a>，\n 四、参与软件开发，\n 五、在 <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">Google Play 商店</a>购买本应用，\n 六、直接捐赠，\n 七、采取任何您认为有助于 OpenTracks 的方式。</string>
     <string name="activity_type_swimming">游泳</string>
     <string name="export_with_photos">带照片</string>
-    <string name="export_progress_summary_skip_msg">已跳过的文件</string>
+    <string name="export_progress_summary_skip_msg">文件已跳过</string>
     <string name="generic_overwrite">覆盖</string>
     <string name="import_progress_summary_ok_msg">文件已导入</string>
     <string name="value_float_kilometer_hour_recommended">%1$.1f 公里/小时（推荐）</string>
     <string name="permission_bluetooth_failed">OpenTracks 需要使用蓝牙的权限。</string>
-    <string name="generic_choose_an_option">选择一项</string>
+    <string name="generic_choose_an_option">选择一个选项</string>
     <string name="settings_gps_summary">时间间隔、距离间隔、最大距离、精度</string>
     <string name="permission_bluetooth_failed_rejected">您需要在系统设置中手动授予 OpenTracks 访问附近设备的权限。</string>
     <string name="settings_recording_customize_layout_title">自定义您的记录布局</string>
     <string name="settings_announcements_lap_heart_rate">单圈心率</string>
-    <string name="custom_layout_list_layout_removed">布局已删除</string>
+    <string name="custom_layout_list_layout_removed">布局已移除</string>
     <string name="stats_custom_layout_default_layout">默认布局</string>
-    <string name="settings_layout_reset_confirm_message">所有布局设置都会被恢复至默认值。此操作不会删除设备上的路线。</string>
-    <string name="settings_public_api_enabled_summary_on">其他应用可以开始或停止记录。</string>
-    <string name="settings_public_api_dashboard_enabled_summary_on">开始记录的应用可以访问记录下的数据。</string>
-    <string name="help_track_map_content">点击地图图标。\n 方法一（在线地图）：安装 <a href="https://codeberg.org/OpenTracksApp/OSMDashboard">OSMDashboard</a>。该应用提供基于 <a href="https://www.openstreetmap.org">OpenStreetMap</a> 的在线或离线地图。\n 事实上，OSMDashboard 是一款独立的应用，它仅能（临时）访问将要被展示的数据。\n 方法二：通过一个正常的地图应用（例如 <a href="http://osmand.net/">OsmAnd</a> 和 <a href="https://maps.me/">MAPS.ME</a>）。这些应用需要支持 KMZ 文件格式（只包含位置和时间戳）。事实上，应用需要支持 <i>application/vnd.google-earth.kmz</i> MIME 类型的 <i>ACTION_VIEW</i> 操作。</string>
+    <string name="settings_layout_reset_confirm_message">所有布局设置都将恢复为默认值。此操作不会删除设备上的任何轨迹。</string>
+    <string name="settings_public_api_enabled_summary_on">其他已安装的应用程序可以开始或停止记录。</string>
+    <string name="settings_public_api_dashboard_enabled_summary_on">开始记录的应用程序也可以访问记录的数据。</string>
+    <string name="help_track_map_content">使用小地图图标。\n 方法一：（实时更新）安装 <a href="https://codeberg.org/OpenTracksApp/OSMDashboard">OSMDashboard</a>。它通过 <a href="https://www.openstreetmap.org">OpenStreetMap</a> 提供在线或离线地图。\n 实际上，OSMDashboard 是独立的应用程序，只能（临时）访问要显示的轨迹数据。\n 方法二：通过常规地图应用程序（例如 <a href="http://osmand.net/">OsmAnd</a> 和 <a href="https://maps.me/">MAPS.ME</a>）。这些应用需要支持 KMZ 文件格式（仅包含位置和时间戳）。实际上，应用需要支持 <i>ACTION_VIEW</i> 操作及 MIME 类型 <i>application/vnd.google-earth.kmz</i>。</string>
     <string name="export_progress_summary_errors_msg">错误</string>
     <string name="permission_gps_failed">OpenTracks 需要使用 GPS 的权限。</string>
     <string name="custom_layout_list_title">布局</string>
-    <string name="image_discard">丢弃</string>
-    <string name="import_thread_interrupted">线程被中断</string>
+    <string name="image_discard">舍弃</string>
+    <string name="import_thread_interrupted">线程中断</string>
     <string name="import_unsupported_format">不支持的文件格式</string>
     <string name="import_parser_error">解析器错误：%1$s</string>
     <string name="import_unable_to_import_file">无法导入文件：%1$s</string>
     <string name="menu_select_layout">选择布局</string>
     <string name="voice_per_kilometer">每公里</string>
-    <string name="track_delete_number_of_tracks">%1$d 条路线</string>
+    <string name="track_delete_number_of_tracks">%1$d 条轨迹</string>
     <string name="stats_clock">时钟</string>
-    <string name="export_error_post_workout">健身后导出失败，请检查导出文件夹。</string>
-    <string name="export_track_already_exists_msg">文件 %1$s 已经存在于目标文件夹。</string>
+    <string name="export_error_post_workout">运动数据导出失败，请检查导出目录。</string>
+    <string name="export_track_already_exists_msg">目标目录中已存在文件 %1$s。</string>
     <string name="pace">配速</string>
     <string name="generic_show_errors">显示错误</string>
     <string name="settings_export_filename_title">文件名格式</string>
-    <string name="generic_filter">过滤器</string>
+    <string name="generic_filter">筛选</string>
     <string name="generic_from">从</string>
     <string name="generic_to">到</string>
-    <string name="menu_insert_gallery_img">插入相册中的图片</string>
+    <string name="menu_insert_gallery_img">插入图库图片</string>
     <string name="settings_announcements_summary">时间、距离、语音速度</string>
     <string name="settings_import_export_summary">导入、导出、自动导出</string>
     <string name="settings_running_sensor">跑步</string>
@@ -429,11 +422,11 @@ limitations under the License.
     <string name="settings_sensor_running_speed_and_cadence">距离、速度和踏频</string>
     <string name="settings_import_section">导入</string>
     <string name="stats_sensors_heart_rate">心率</string>
-    <string name="track_discarding">丢弃路线</string>
+    <string name="track_discarding">正在舍弃轨迹</string>
     <string name="unit_nautical_mile">海里</string>
     <string name="voice_per_mile">每英里</string>
-    <string name="no_compatible_file_manager_installed">没有安装兼容的文件管理器</string>
-    <string name="track_detail_intervals_tab">分段</string>
+    <string name="no_compatible_file_manager_installed">未安装兼容的文件管理器</string>
+    <string name="track_detail_intervals_tab">间隔</string>
     <string name="settings_generic_sensor">通用</string>
     <string name="settings_cycling_sensor">骑自行车</string>
     <string name="settings_public_api_package_title">公共 API 包名</string>
@@ -453,16 +446,16 @@ limitations under the License.
     <string name="sensor_state_heart_rate_avg">平均心率</string>
     <string name="sensor_state_heart_rate_max">最大心率</string>
     <string name="sensor_state_power_avg">平均功率</string>
-    <string name="bluetooth_disabled">请开启蓝牙。</string>
-    <string name="settings_defaults_summary">偏好的单位，默认活动类型，路线默认名称</string>
+    <string name="bluetooth_disabled">请启用蓝牙。</string>
+    <string name="settings_defaults_summary">首选单位、默认活动、轨迹默认名称</string>
     <string name="settings_ui_title">用户界面</string>
     <string name="settings_ui_summary">外观、记录布局、主题</string>
     <string name="settings_gps_sensor">GPS</string>
     <string name="settings_import_export_title">导入和导出</string>
-    <string name="settings_activity_defaults_category">活动默认</string>
+    <string name="settings_activity_defaults_category">活动的默认设置</string>
     <string name="settings_announcements_totaltime_frequency">时间间隔</string>
     <string name="settings_announcements_distance_frequency">每圈长度</string>
-    <string name="custom_layout_list_edit_already_exists">布局名已存在</string>
+    <string name="custom_layout_list_edit_already_exists">布局名称已存在</string>
     <string name="settings_public_api_enabled_title">公共 API</string>
     <string name="track_distance_notification">距离：%1$s</string>
     <string name="value_float_mile_hour_recommended">%1$.1f 英里/小时（推荐）</string>
@@ -479,7 +472,7 @@ limitations under the License.
     </string>
     <string name="average_heart_rate">平均心率</string>
     <string name="export_without_photos">不带照片</string>
-    <string name="settings_sensor_bluetooth_service_filter_on">只显示蓝牙广播中包含所需服务的设备</string>
+    <string name="settings_sensor_bluetooth_service_filter_on">仅显示广播所需服务的蓝牙设备</string>
     <string name="voiceSpeedMKnotsPlural">
         { n, plural,
         other {{n,number,#.0} 节}
@@ -491,41 +484,41 @@ limitations under the License.
         other {{n,number,#.0} 海里}
         }
     </string>
-    <string name="share_image_subject">我想跟你分享一张图片</string>
-    <string name="share_image_body">我觉得你可能对这张图片感兴趣。</string>
+    <string name="share_image_subject">我想把这张图片分享给您</string>
+    <string name="share_image_body">我觉得您可能会对这张图片感兴趣。</string>
     <string name="field_set_primary">设为主要</string>
     <string name="field_remove_from_layout">移除</string>
-    <string name="help_gps_troubleshooting_title">为什么 OpenTracks 没有记录下我的位置？</string>
-    <string name="help_support_title">我能通过什么途径支持 OpenTracks 呢？</string>
+    <string name="help_gps_troubleshooting_title">OpenTracks 没有记录位置？</string>
+    <string name="help_support_title">我如何支持 OpenTracks？</string>
     <string name="generic_skip">跳过</string>
     <string name="generic_separator_done_total">/</string>
     <plurals name="generic_completed_with_errors">
         <item quantity="other">已完成但有 %1$d 个错误</item>
     </plurals>
     <string name="generic_completed">已完成</string>
-    <string name="generic_click_twice_cancel">再按一次返回取消</string>
+    <string name="generic_click_twice_cancel">再次点击返回即可取消</string>
     <string name="settings_api_title">公共 API</string>
-    <string name="aggregated_stats_empty_message">记录您的第一条路线后即可看到汇总统计数据</string>
-    <string name="aggregated_stats_filter_no_results">当前过滤条件下没有活动</string>
-    <string name="interval_list_empty_message">目前暂时没有分段</string>
+    <string name="aggregated_stats_empty_message">记录您的第一条轨迹即可查看汇总统计数据</string>
+    <string name="aggregated_stats_filter_no_results">没有符合指定筛选条件的活动</string>
+    <string name="interval_list_empty_message">尚无任何间隔</string>
     <string name="lap_speed">单圈速度</string>
     <string name="about_third_party_data">第三方数据</string>
-    <string name="help_track_map_title">如何在地图上显示路线？</string>
-    <string name="help_track_export_title">如何导出或分享我记录的路线？</string>
-    <string name="export_all_do_it_for_all">用同样方式处理全部冲突</string>
-    <string name="export_progress_summary_overwrite_msg">已覆盖的文件</string>
-    <string name="show_on_dashboard_not_installed">没有安装支持 OpenTracks 仪表盘 API 的应用。</string>
-    <string name="help_storage_pictures_content">这些照片被保存在设备内部存储中（也就是说只能在 OpenTracks 内访问）。</string>
-    <string name="help_data_storage_content">应用每记录一次位置便同时记录一次传感器数据。以心率传感器为例，这意味着每一个位置仅仅对应<i>一个</i>心率读数。如果你站着不动或者处于室内，心率数据就不会被记录（但会被显示）。</string>
+    <string name="help_track_map_title">如何在地图上显示轨迹？</string>
+    <string name="help_track_export_title">如何导出或分享已记录的轨迹？</string>
+    <string name="export_all_do_it_for_all">对所有冲突执行此操作</string>
+    <string name="export_progress_summary_overwrite_msg">文件已覆盖</string>
+    <string name="show_on_dashboard_not_installed">未安装支持 OpenTracks 仪表板 API 的应用程序。</string>
+    <string name="help_storage_pictures_content">这些照片存储在应用内部存储空间中（即仅可在 OpenTracks 内访问）。</string>
+    <string name="help_data_storage_content">传感器数据会按记录的位置进行存储。以心率传感器为例，这意味着每个位置仅会存储<i>一次</i>心率测量值。如果您站立不动或在室内，则不会记录传感器数据（但数据仍会显示）。</string>
     <string name="description_speed_nautical">速度（节）</string>
     <string name="description_speed_source_gps">GPS</string>
-    <string name="export_cannot_write_to_dir">无法写入导出文件夹。</string>
+    <string name="export_cannot_write_to_dir">无法写入导出目录。</string>
     <string name="export_dir_not_writable">" （不可写！）"</string>
-    <string name="export_track_errors">未导出的文件</string>
-    <string name="export_progress_summary_new_msg">已导出的新文件</string>
+    <string name="export_track_errors">文件未导出</string>
+    <string name="export_progress_summary_new_msg">新文件已导出</string>
     <string name="generic_undo">撤销</string>
     <string name="generic_dismiss">关闭</string>
-    <string name="settings_defaults_title">默认的单位和活动类型</string>
+    <string name="settings_defaults_title">默认单位和活动</string>
     <string name="settings_sensors_title">传感器</string>
     <string name="settings_sensors_summary">自行车传感器、车轮周长、跑步传感器</string>
     <string name="settings_announcements_statistics_title">统计数据播报</string>
@@ -534,20 +527,20 @@ limitations under the License.
     <string name="description_pace_nautical">配速（分钟/海里）</string>
     <string name="field_set_secondary">设为次要</string>
     <string name="gps_recording_status">%1$s：%2$s</string>
-    <string name="generic_open_track">打开路线</string>
-    <string name="menu_add_custom_layout">创建新布局</string>
-    <string name="menu_filter">过滤器</string>
-    <string name="custom_layout_list_edit_name">输入布局名以添加</string>
+    <string name="generic_open_track">打开轨迹</string>
+    <string name="menu_add_custom_layout">新布局</string>
+    <string name="menu_filter">筛选</string>
+    <string name="custom_layout_list_edit_name">输入要添加的布局名称</string>
     <string name="custom_layout_select_layout">选择布局</string>
-    <string name="settings_layout_reset_confirm_title">是否重置布局？</string>
+    <string name="settings_layout_reset_confirm_title">重置布局？</string>
     <string name="settings_announcements_average_speed_pace">平均速度/配速</string>
     <string name="settings_stats_units_nautical">海事（海里、英尺）</string>
-    <string name="settings_public_api_enabled_summary_off">只有 OpenTracks 才能开始或停止记录。</string>
-    <string name="settings_public_api_disabled_toast">OpenTracks 公共 API 已停用：可以在设置中启用。</string>
+    <string name="settings_public_api_enabled_summary_off">只有 OpenTracks 可以开始或停止记录。</string>
+    <string name="settings_public_api_disabled_toast">OpenTracks 公共 API 已禁用：可以在设置中启用。</string>
     <string name="settings_public_api_dashboard_enabled_title">自动数据传输</string>
-    <string name="settings_public_api_dashboard_enabled_summary_off">记录下的数据不会被自动分享给其他应用。</string>
+    <string name="settings_public_api_dashboard_enabled_summary_off">记录的数据不会自动与其他应用程序共享。</string>
     <string name="settings_export_section">导出</string>
-    <string name="stats_loss">损失</string>
+    <string name="stats_loss">下降</string>
     <string name="stats_coordinates">纬度/经度</string>
     <string name="track_pace_notification">配速：%1$s</string>
     <string name="settings_announcements_lap_speed_pace">单圈速度/配速</string>
@@ -555,14 +548,14 @@ limitations under the License.
     <string name="activity_type_workout">健身</string>
     <string name="generic_today">今天</string>
     <string name="generic_yesterday">昨天</string>
-    <string name="import_no_kml_file_found">在 KMZ 中没有找到 kml 文件</string>
+    <string name="import_no_kml_file_found">KMZ 中未找到 kml 文件</string>
     <string name="import_error_info">%1$s：%2$s</string>
     <string name="import_error_list_dialog_title">文件未导入</string>
     <string name="import_file_imported">文件 %1$s 已导入</string>
-    <string name="import_prevent_reimport">您设置了防止重复导入路线</string>
+    <string name="import_prevent_reimport">您设置了防止重复导入轨迹</string>
     <string name="import_progress_summary_exists_msg">已存在</string>
     <string name="import_progress_summary_errors_msg">错误</string>
-    <string name="marker_add_photo_canceled">已取消，照片标记没有被添加</string>
+    <string name="marker_add_photo_canceled">已取消，未添加照片标记</string>
     <string name="sensor_state_cadence_avg">平均踏频</string>
     <string name="sensor_could_not_scan">无法扫描蓝牙设备（错误：%1$i）。</string>
     <string name="settings_units_category">单位</string>
@@ -570,23 +563,23 @@ limitations under the License.
     <string name="settings_announcements_average_heart_rate">平均心率</string>
     <string name="settings_layout_reset_done">所有布局设置已恢复至默认值</string>
     <string name="settings_all_reset">重置</string>
-    <string name="track_delete_not_recording">该路线无法被删除，因为它还在记录中。</string>
-    <string name="error_crash_title">%1$s 已崩溃</string>
+    <string name="track_delete_not_recording">此轨迹正在记录中，无法删除。</string>
+    <string name="error_crash_title">%1$s 崩溃了</string>
     <string name="share_crash_report">分享崩溃报告</string>
-    <string name="report_bug">报告 BUG</string>
-    <string name="show_on_dashboard">OpenTracks 仪表盘 API</string>
-    <string name="always">总是</string>
+    <string name="report_bug">报告错误</string>
+    <string name="show_on_dashboard">OpenTracks 仪表板 API</string>
+    <string name="always">始终</string>
     <string name="track_speed_notification">速度：%1$s</string>
-    <string name="settings_stats_units_imperial_meter">英制（英里，米）</string>
+    <string name="settings_stats_units_imperial_meter">英制（英里、米）</string>
     <string name="voice_on_device_speaker_title">使用设备的扬声器</string>
-    <string name="introduction_osm_dashboard">OpenTracks 本身不提供地图。请安装 OSMDashboard 应用，以便在地图上查看您的记录。</string>
+    <string name="introduction_osm_dashboard">OpenTracks 本身不提供地图。请安装 OSMDashboard 以在地图上查看您的记录。</string>
     <string name="settings_sensor_bluetooth_service_filter_title">筛选蓝牙设备</string>
-    <string name="menu_export_all_one_file">全部导出（一个文件存储全部路线）</string>
-    <string name="no_compatible_camera_installed">尚未安装兼容的照相机应用</string>
-    <string name="no_compatible_gallery_installed">尚未安装兼容的图库应用</string>
-    <string name="settings_recording_min_required_accuracy_summary">精度不足 %1$s 的位置会被忽略</string>
-    <string name="settings_sensor_heart_rate_max">心率区间：最大心率（bpm）</string>
-    <string name="settings_api_summary">给其他应用使用的远程控制和统计 API</string>
+    <string name="menu_export_all_one_file">全部导出（所有轨迹合并文件）</string>
+    <string name="no_compatible_camera_installed">未安装兼容的相机应用程序</string>
+    <string name="no_compatible_gallery_installed">未安装兼容的图库应用程序</string>
+    <string name="settings_recording_min_required_accuracy_summary">如果位置精度大于 %1$s，则忽略该位置</string>
+    <string name="settings_sensor_heart_rate_max">心率区间：最大心率（BPM）</string>
+    <string name="settings_api_summary">其他应用的远程控制和统计数据 API</string>
     <string name="sensor_state_cadence_unit">RPM</string>
     <string name="sensor_state_heart_rate_unit">BPM</string>
     <string name="sensor_state_power_unit">瓦</string>
@@ -598,7 +591,7 @@ limitations under the License.
     <string name="settings_ui_dynamic_colors_summary">使用用户定义的动态配色（需要 Android 12 及更高版本，需要手动重启）</string>
     <string name="sensor_state_power_max">最大功率</string>
     <string name="activity_type_kickscooter">滑板车</string>
-    <string name="permission_recording_failed">OpenTracks 需要获取定位和查找附近设备权限。</string>
+    <string name="permission_recording_failed">OpenTracks 需要获得访问您的位置信息以及附近的设备的权限。</string>
     <string name="voiceIdle">即将进入空闲状态。</string>
     <string name="settings_announcements_idle_title">空闲</string>
     <string name="settings_recording_idle_timeout_title">空闲阈值</string>
@@ -607,9 +600,9 @@ limitations under the License.
     <string name="value_internal_sensor">内部传感器</string>
     <string name="bluetooth_sensor_summary">%1$s (%2$s)</string>
     <string name="settings_recording_min_sampling_interval_title">采样时间间隔</string>
-    <string name="settings_recording_location_distance_summary">每隔%1$s记录地点之间</string>
+    <string name="settings_recording_location_distance_summary">间隔 %1$s 记录位置</string>
     <string name="settings_theme_switch_restart">主题更改可能需要手动重启。</string>
-    <string name="settings_night_mode_option_night_oled">OLED 优化模式</string>
+    <string name="settings_night_mode_option_night_oled">OLED 优化</string>
     <string name="voiceDistance">{n, plural, =1 {1 } other {{n,number,#.0}} }</string>
     <string name="settings_announcements_lap_power">单圈功率</string>
     <string name="settings_charts_title">图表</string>
@@ -629,12 +622,15 @@ limitations under the License.
     <string name="create_marker_error">无法创建标记，请重试。</string>
     <string name="stats_gain_loss">上升与下降</string>
     <string name="marker_detail_title">%1$d / %2$d：%3$s</string>
-    <string name="settings_night_mode_option_system_dynamic">跟随系统（动态配色）</string>
-    <string name="settings_night_mode_option_day_dynamic">白天模式（动态配色）</string>
-    <string name="settings_night_mode_option_night_dynamic">‌夜间模式（动态配色）</string>
-    <string name="settings_night_mode_option_night_oled_dynamic">OLED 优化模式（动态配色）</string>
+    <string name="settings_night_mode_option_system_dynamic">系统（动态配色）</string>
+    <string name="settings_night_mode_option_day_dynamic">浅色（动态配色）</string>
+    <string name="settings_night_mode_option_night_dynamic">深色（动态配色）</string>
+    <string name="settings_night_mode_option_night_oled_dynamic">OLED 优化（动态配色）</string>
     <string name="track_edit_time_offset">时区偏移</string>
-    <string name="settings_announcements_segment_average_speed_pace">平均速度/配速（路段）</string>
-    <string name="stats_average_segment_pace">平均路段配速</string>
+    <string name="settings_announcements_segment_average_speed_pace">平均速度/配速（分段）</string>
+    <string name="stats_average_segment_pace">平均分段配速</string>
     <string name="stats_elapsed_segment_time">已用分段时间</string>
+    <string name="description_sensor_temperature">温度（摄氏度）</string>
+    <string name="sensor_state_temperature">温度计</string>
+    <string name="stats_sensors_temperature">温度</string>
 </resources>