Release: v4.8.3

Fixes #1682.

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.2.0-beta01'
     }
 }
 
@@ -64,8 +64,8 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 5361
-        versionName "v4.8.0"
+        versionCode 5389
+        versionName "v4.8.3"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -141,7 +141,7 @@ dependencies {
     androidTestImplementation 'androidx.test:rules:1.5.0'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'org.mockito:mockito-android:5.4.0'
+    androidTestImplementation 'org.mockito:mockito-android:5.5.0'
 
     androidTestUtil 'androidx.test:orchestrator:1.4.2'
 }

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

@@ -0,0 +1,5 @@
+v4.8.1: OpenTracks
+
+Bugfix:
+- Location permission was not granted due to ACCESS_LOCATION_BACKGROUND (removed)
+

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

@@ -0,0 +1,5 @@
+v4.8.2: OpenTracks
+
+Changes:
+- After recording export: show error message if unsuccessful
+

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

@@ -0,0 +1,8 @@
+v4.8.3: OpenTracks
+
+
+Bugfix:
+- Android 14: prevent crash due to malformed UUID (example for filename template)
+
+Developer:
+- Marker list is now a RecyclerView

fastlane/metadata/android/gl-ES/changelogs/5196.txt

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

fastlane/metadata/android/gl-ES/changelogs/5211.txt

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

fastlane/metadata/android/gl-ES/changelogs/5326.txt

@@ -0,0 +1,8 @@
+v4.7.1: OpenTracks
+
+Bugfixes:
+- Android 14: crash on recording start (missing permissions)
+- Android 14: crash on track deletion (ForegroundService without reason)
+
+Developer:
+- AggregatedStats is now a RecyclerView

fastlane/metadata/android/gl-ES/changelogs/5361.txt

@@ -0,0 +1,10 @@
+v4.8.0: OpenTracks
+
+Cambios:
+- Permiso: ACCESS_BACKGROUND_LOCATION é requerido debido á API
+- Preparación para a detección da pausa en función do tempoPreparation for time-based idle detection
+- Retirada da distinción por orixe nos datos gardados (sensores GPS vs. BLE)
+
+Desenvolvemento:
+- retirados algúns atallos no código que entraban en conflito (TrackRecordingService e GpsStatusManager)
+- TrackRecordingServiceConnection xestiona o apagado do servizo

fastlane/metadata/android/gl-ES/changelogs/5366.txt

@@ -0,0 +1,4 @@
+v4.8.1: OpenTracks
+
+Arranxo:
+- Non se concedía o permiso de localización debido a ACCESS_LOCATION_BACKGROUND (eliminado)

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

@@ -0,0 +1,10 @@
+v4.8.0: OpenTracks
+
+Veranderingen:
+- Toestemming: ACCESS_BACKGROUND_LOCATION is vereist vanwege API
+- Voorbereiding voor tijdgebaseerde stationaire detectie
+- Onderscheid bron (GPS vs BLE sensoren) vervallen voor opgeslagen gegevens 
+
+Ontwikkelaar:
+- verwijderde raceconditie-werkplekken (TrackRecordingService en GpsStatusManager)
+- TrackRecordingServiceConnection zorgt voor service-uitschakeling

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

@@ -0,0 +1,4 @@
+v4.8.1: OpenTracks
+
+Bugfix :
+- Toestemming tot locatie is niet verleend vanwege ACCESS_LOCATION_BACKGROUND (verwijderd)

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

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

@@ -9,8 +9,8 @@ public class TestUtil {
 
     public static GrantPermissionRule createGrantPermissionRule() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.POST_NOTIFICATIONS);
+            return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.POST_NOTIFICATIONS);
         }
-        return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT);
+        return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT);
     }
 }

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

@@ -37,7 +37,7 @@ public class TestDataUtil {
     public static Track createTrack(Track.Id trackId) {
         Track track = new Track();
         track.setId(trackId);
-        track.setName("Test: " + trackId.getId());
+        track.setName("Test: " + trackId.id());
 
         return track;
     }

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

@@ -119,7 +119,7 @@ public class CustomContentProviderUtilsTest {
                 assertNotNull(trackPoint);
                 locations.add(trackPoint);
                 // Make sure the IDs are returned in the right order.
-                assertEquals(lastPointId.getId() - numPoints + locations.size(), trackPoint.getId().getId());
+                assertEquals(lastPointId.id() - numPoints + locations.size(), trackPoint.getId().id());
             }
             assertEquals(numPoints, locations.size());
         }
@@ -128,7 +128,7 @@ public class CustomContentProviderUtilsTest {
     private TrackPoint.Id initializeTrack(Track.Id id, int numPoints) {
         Track track = new Track();
         track.setId(id);
-        track.setName("Test: " + id.getId());
+        track.setName("Test: " + id.id());
         contentProviderUtils.insertTrack(track);
         track = contentProviderUtils.getTrack(id);
         assertNotNull(track);
@@ -155,7 +155,7 @@ public class CustomContentProviderUtilsTest {
             }
         }
 
-        assertTrue(numPoints == 0 || lastPointId.getId() > 0);
+        assertTrue(numPoints == 0 || lastPointId.id() > 0);
         assertEquals(numPoints, counter);
 
         return lastPointId;
@@ -172,7 +172,7 @@ public class CustomContentProviderUtilsTest {
         // Id
         when(cursorMock.getColumnIndexOrThrow(TracksColumns._ID)).thenReturn(columnIndex);
         when(cursorMock.isNull(columnIndex)).thenReturn(false);
-        when(cursorMock.getLong(columnIndex)).thenReturn(trackId.getId());
+        when(cursorMock.getLong(columnIndex)).thenReturn(trackId.id());
 
         //Uuid
         columnIndex++;
@@ -182,7 +182,7 @@ public class CustomContentProviderUtilsTest {
 
         // Name
         columnIndex++;
-        String name = NAME_PREFIX + trackId.getId();
+        String name = NAME_PREFIX + trackId.id();
         when(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).thenReturn(columnIndex);
         when(cursorMock.isNull(columnIndex)).thenReturn(false);
         when(cursorMock.getString(columnIndex)).thenReturn(name);
@@ -460,7 +460,7 @@ public class CustomContentProviderUtilsTest {
         Marker marker = contentProviderUtils.createMarker(cursorMock);
         assertEquals(id, marker.getId().id());
         assertEquals(name, marker.getName());
-        assertEquals(trackId, marker.getTrackId().getId());
+        assertEquals(trackId, marker.getTrackId().id());
     }
 
     /**
@@ -640,7 +640,7 @@ public class CustomContentProviderUtilsTest {
         marker.setDescription(TEST_DESC);
         Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));
 
-        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId());
+        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id());
         assertTrue(dir.exists());
         assertTrue(dir.isDirectory());
         assertEquals(1, dir.list().length);
@@ -675,7 +675,7 @@ public class CustomContentProviderUtilsTest {
         marker.setDescription(TEST_DESC);
         Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));
 
-        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId());
+        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id());
         assertTrue(dir.exists());
         assertTrue(dir.isDirectory());
         assertEquals(1, dir.list().length);
@@ -712,7 +712,7 @@ public class CustomContentProviderUtilsTest {
         Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));
         contentProviderUtils.insertMarker(otherMarker);
 
-        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId());
+        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id());
         assertTrue(dir.exists());
         assertTrue(dir.isDirectory());
         assertEquals(2, dir.list().length);
@@ -889,7 +889,7 @@ public class CustomContentProviderUtilsTest {
         for (int i = 0; i < trackpointIds.size(); i++) {
             assertTrue(trackPointIterator.hasNext());
             TrackPoint trackPoint = trackPointIterator.next();
-            assertEquals(startTrackPointId.getId() + i, trackPoint.getId().getId());
+            assertEquals(startTrackPointId.id() + i, trackPoint.getId().id());
 
             checkLocation(i, trackPoint.getLocation());
         }

src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java

@@ -35,7 +35,7 @@ public class TrackFilenameGenerator2Test {
         // given
         Track track = new Track();
         track.setName("Best Track");
-        track.setUuid(UUID.fromString("0000fee0-0000-1000-8000-00805f9b34fb"));
+        track.setUuid(UUID.fromString("f81d4fae-7dec-11d0-a765-00a0c91e6bf6"));
         track.getTrackStatistics().setStartTime(Instant.parse("2020-02-02T02:02:02Z"));
 
         // when

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

@@ -75,6 +75,6 @@ public class TrackNameUtilsTest {
     @Test
     public void testTrackName_number() {
         PreferencesUtils.setString(R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_number_value));
-        assertEquals("Track " + TRACK_ID.getId(), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals("Track " + TRACK_ID.id(), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
     }
 }

src/androidTest/res/raw/gpx_timezone.gpx

@@ -31,8 +31,6 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/
 <gpxtrkx:MovingTime>0</gpxtrkx:MovingTime>
 <gpxtrkx:StoppedTime>0</gpxtrkx:StoppedTime>
 <gpxtrkx:MaxSpeed>0.0</gpxtrkx:MaxSpeed>
-<gpxtrkx:Ascent>null</gpxtrkx:Ascent>
-<gpxtrkx:Descent>null</gpxtrkx:Descent>
 </gpxtrkx:TrackStatsExtension>
 </extensions>
 <trkseg>

src/main/AndroidManifest.xml

@@ -46,7 +46,7 @@ limitations under the License.
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+<!--    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />-->
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 

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

@@ -66,7 +66,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
         contentProviderUtils = new ContentProviderUtils(this);
         track = contentProviderUtils.getTrack(trackId);
         if (track == null) {
-            Log.e(TAG, "No track for " + trackId.getId());
+            Log.e(TAG, "No track for " + trackId.id());
             finish();
             return;
         }

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

@@ -276,7 +276,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
     }
 
     private void requestRequiredPermissions() {
-        PermissionRequester.ALL.requestPermissionsIfNeeded(this, this, null, (requester) -> Toast.makeText(this, R.string.permission_gps_failed, Toast.LENGTH_SHORT).show());
+        PermissionRequester.ALL.requestPermissionsIfNeeded(this, this, null, (requester) -> Toast.makeText(this, R.string.permission_gps_failed, Toast.LENGTH_LONG).show());
     }
 
     @Override

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

@@ -189,13 +189,13 @@ public class ContentProviderUtils {
         }
 
         String whereClause = String.format(TracksColumns._ID + " IN (%s)", TextUtils.join(",", Collections.nCopies(trackIds.size(), "?")));
-        contentResolver.delete(TracksColumns.CONTENT_URI, whereClause, trackIds.stream().map(id -> Long.toString(id.getId())).toArray(String[]::new));
+        contentResolver.delete(TracksColumns.CONTENT_URI, whereClause, trackIds.stream().map(trackId -> Long.toString(trackId.id())).toArray(String[]::new));
     }
 
     public void deleteTrack(Context context, @NonNull Track.Id trackId) {
         // Delete track folder resources.
         FileUtils.deleteDirectoryRecurse(FileUtils.getPhotoDir(context, trackId));
-        contentResolver.delete(TracksColumns.CONTENT_URI, TracksColumns._ID + "=?", new String[]{Long.toString(trackId.getId())});
+        contentResolver.delete(TracksColumns.CONTENT_URI, TracksColumns._ID + "=?", new String[]{Long.toString(trackId.id())});
     }
 
     //TODO Only use for tests; also move to tests.
@@ -229,7 +229,7 @@ public class ContentProviderUtils {
     }
 
     public Track getTrack(@NonNull Track.Id trackId) {
-        try (Cursor cursor = getTrackCursor(TracksColumns._ID + "=?", new String[]{Long.toString(trackId.getId())}, null)) {
+        try (Cursor cursor = getTrackCursor(TracksColumns._ID + "=?", new String[]{Long.toString(trackId.id())}, null)) {
             if (cursor != null && cursor.moveToNext()) {
                 return createTrack(cursor);
             }
@@ -278,7 +278,7 @@ public class ContentProviderUtils {
      * @param track the track
      */
     public void updateTrack(Track track) {
-        contentResolver.update(TracksColumns.CONTENT_URI, createContentValues(track), TracksColumns._ID + "=?", new String[]{Long.toString(track.getId().getId())});
+        contentResolver.update(TracksColumns.CONTENT_URI, createContentValues(track), TracksColumns._ID + "=?", new String[]{Long.toString(track.getId().id())});
     }
 
     private ContentValues createContentValues(Track track) {
@@ -286,7 +286,7 @@ public class ContentProviderUtils {
         TrackStatistics trackStatistics = track.getTrackStatistics();
 
         if (track.getId() != null) {
-            values.put(TracksColumns._ID, track.getId().getId());
+            values.put(TracksColumns._ID, track.getId().id());
         }
         values.put(TracksColumns.UUID, UUIDUtils.toBytes(track.getUuid()));
         values.put(TracksColumns.NAME, track.getName());
@@ -315,7 +315,7 @@ public class ContentProviderUtils {
     }
 
     public void updateTrackStatistics(@NonNull Track.Id trackId, @NonNull TrackStatistics trackStatistics) {
-        contentResolver.update(TracksColumns.CONTENT_URI, createContentValues(trackStatistics), TracksColumns._ID + "=?", new String[]{Long.toString(trackId.getId())});
+        contentResolver.update(TracksColumns.CONTENT_URI, createContentValues(trackStatistics), TracksColumns._ID + "=?", new String[]{Long.toString(trackId.id())});
     }
 
     private ContentValues createContentValues(TrackStatistics trackStatistics) {
@@ -413,7 +413,7 @@ public class ContentProviderUtils {
     public Integer getNextMarkerNumber(@NonNull Track.Id trackId) {
         String[] projection = {MarkerColumns._ID};
         String selection = MarkerColumns.TRACKID + "=?";
-        String[] selectionArgs = new String[]{Long.toString(trackId.getId())};
+        String[] selectionArgs = new String[]{Long.toString(trackId.id())};
         try (Cursor cursor = getMarkerCursor(projection, selection, selectionArgs, MarkerColumns._ID, -1)) {
             if (cursor != null) {
                 return cursor.getCount();
@@ -443,10 +443,10 @@ public class ContentProviderUtils {
         String[] selectionArgs;
         if (minMarkerId != null) {
             selection = MarkerColumns.TRACKID + "=? AND " + MarkerColumns._ID + ">=?";
-            selectionArgs = new String[]{Long.toString(trackId.getId()), Long.toString(minMarkerId.id())};
+            selectionArgs = new String[]{Long.toString(trackId.id()), Long.toString(minMarkerId.id())};
         } else {
             selection = MarkerColumns.TRACKID + "=?";
-            selectionArgs = new String[]{Long.toString(trackId.getId())};
+            selectionArgs = new String[]{Long.toString(trackId.id())};
         }
         return getMarkerCursor(null, selection, selectionArgs, MarkerColumns._ID, maxCount);
     }
@@ -510,7 +510,7 @@ public class ContentProviderUtils {
         values.put(MarkerColumns.DESCRIPTION, marker.getDescription());
         values.put(MarkerColumns.CATEGORY, marker.getCategory());
         values.put(MarkerColumns.ICON, marker.getIcon());
-        values.put(MarkerColumns.TRACKID, marker.getTrackId().getId());
+        values.put(MarkerColumns.TRACKID, marker.getTrackId().id());
         values.put(MarkerColumns.LENGTH, marker.getLength().toM());
         values.put(MarkerColumns.DURATION, marker.getDuration().toMillis());
 
@@ -548,6 +548,35 @@ public class ContentProviderUtils {
         return contentResolver.query(MarkerColumns.CONTENT_URI, projection, selection, selectionArgs, sortOrder);
     }
 
+    public List<Marker> searchMarkers(Track.Id trackId, String query) {
+        String selection = null;
+        String[] selectionArgs = null;
+        String sortOrder = null;
+
+        if (query == null) {
+            if (trackId != null) {
+                selection = MarkerColumns.TRACKID + " = ?";
+                selectionArgs = new String[]{Long.toString(trackId.id())};
+            }
+        } else {
+            selection = MarkerColumns.NAME + " LIKE ? OR " +
+                    MarkerColumns.DESCRIPTION + " LIKE ? OR " +
+                    MarkerColumns.CATEGORY + " LIKE ?";
+            selectionArgs = new String[]{"%" + query + "%", "%" + query + "%", "%" + query + "%"};
+            sortOrder = MarkerColumns.DEFAULT_SORT_ORDER + " DESC";
+        }
+
+        ArrayList<Marker> markers = new ArrayList<>();
+        try (Cursor cursor = getMarkerCursor(null, selection, selectionArgs, sortOrder, -1)) {
+            if (cursor.moveToFirst()) {
+                do {
+                    markers.add(createMarker(cursor));
+                } while (cursor.moveToNext());
+            }
+        }
+        return markers;
+    }
+
     /**
      * Fills a {@link TrackPoint} from a cursor.
      *
@@ -632,7 +661,7 @@ public class ContentProviderUtils {
     @Deprecated
     public TrackPoint.Id getLastTrackPointId(@NonNull Track.Id trackId) {
         String selection = TrackPointsColumns._ID + "=(SELECT MAX(" + TrackPointsColumns._ID + ") from " + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID + "=?)";
-        String[] selectionArgs = new String[]{Long.toString(trackId.getId())};
+        String[] selectionArgs = new String[]{Long.toString(trackId.id())};
         try (Cursor cursor = getTrackPointCursor(new String[]{TrackPointsColumns._ID}, selection, selectionArgs, TrackPointsColumns._ID)) {
             if (cursor != null && cursor.moveToFirst()) {
                 return new TrackPoint.Id(cursor.getLong(cursor.getColumnIndexOrThrow(TrackPointsColumns._ID)));
@@ -651,7 +680,7 @@ public class ContentProviderUtils {
     @Deprecated
     public TrackPoint.Id getTrackPointId(Track.Id trackId, Location location) {
         String selection = TrackPointsColumns._ID + "=(SELECT MAX(" + TrackPointsColumns._ID + ") FROM " + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns.TIME + "=?)";
-        String[] selectionArgs = new String[]{Long.toString(trackId.getId()), Long.toString(location.getTime())};
+        String[] selectionArgs = new String[]{Long.toString(trackId.id()), Long.toString(location.getTime())};
         try (Cursor cursor = getTrackPointCursor(new String[]{TrackPointsColumns._ID}, selection, selectionArgs, TrackPointsColumns._ID)) {
             if (cursor != null && cursor.moveToFirst()) {
                 return new TrackPoint.Id(cursor.getLong(cursor.getColumnIndexOrThrow(TrackPointsColumns._ID)));
@@ -681,10 +710,10 @@ public class ContentProviderUtils {
         String[] selectionArgs;
         if (startTrackPointId != null) {
             selection = TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns._ID + ">=?";
-            selectionArgs = new String[]{Long.toString(trackId.getId()), Long.toString(startTrackPointId.getId())};
+            selectionArgs = new String[]{Long.toString(trackId.id()), Long.toString(startTrackPointId.id())};
         } else {
             selection = TrackPointsColumns.TRACKID + "=?";
-            selectionArgs = new String[]{Long.toString(trackId.getId())};
+            selectionArgs = new String[]{Long.toString(trackId.id())};
         }
 
         return getTrackPointCursor(null, selection, selectionArgs, TrackPointsColumns.DEFAULT_SORT_ORDER);
@@ -699,7 +728,7 @@ public class ContentProviderUtils {
     @Deprecated
     public TrackPoint getLastValidTrackPoint(Track.Id trackId) {
         String selection = TrackPointsColumns._ID + "=(SELECT MAX(" + TrackPointsColumns._ID + ") FROM " + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns.TYPE + " IN (" + TrackPoint.Type.SEGMENT_START_AUTOMATIC.type_db + "," + TrackPoint.Type.TRACKPOINT.type_db + "))";
-        String[] selectionArgs = new String[]{Long.toString(trackId.getId())};
+        String[] selectionArgs = new String[]{Long.toString(trackId.id())};
         return findTrackPointBy(selection, selectionArgs);
     }
 
@@ -722,7 +751,7 @@ public class ContentProviderUtils {
      */
     private ContentValues createContentValues(TrackPoint trackPoint, Track.Id trackId) {
         ContentValues values = new ContentValues();
-        values.put(TrackPointsColumns.TRACKID, trackId.getId());
+        values.put(TrackPointsColumns.TRACKID, trackId.id());
         values.put(TrackPointsColumns.TYPE, trackPoint.getType().type_db);
 
         if (trackPoint.hasLocation()) {
@@ -805,7 +834,7 @@ public class ContentProviderUtils {
     public static String formatIdListForUri(Track.Id... trackIds) {
         long[] ids = new long[trackIds.length];
         for (int i = 0; i < trackIds.length; i++) {
-            ids[i] = trackIds[i].getId();
+            ids[i] = trackIds[i].id();
         }
 
         return formatIdListForUri(ids);
@@ -834,7 +863,7 @@ public class ContentProviderUtils {
 
     public SensorStatistics getSensorStats(@NonNull Track.Id trackId) {
         SensorStatistics sensorStatistics = null;
-        try (Cursor cursor = contentResolver.query(ContentUris.withAppendedId(TracksColumns.CONTENT_URI_SENSOR_STATS, trackId.getId()), null, null, null, null)) {
+        try (Cursor cursor = contentResolver.query(ContentUris.withAppendedId(TracksColumns.CONTENT_URI_SENSOR_STATS, trackId.id()), null, null, null, null)) {
             if (cursor != null && cursor.moveToFirst()) {
                 final int MAX_HR_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_MAX_HR);
                 final int AVG_HR_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_HR);

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

@@ -177,7 +177,7 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
                     Track.Id trackId = new Track.Id(cursor.getLong(trackIdIndex));
                     ContentValues cv = new ContentValues();
                     cv.put("uuid", UUIDUtils.toBytes(UUID.randomUUID()));
-                    db.update("tracks", cv, "_id = ?", new String[]{String.valueOf(trackId.getId())});
+                    db.update("tracks", cv, "_id = ?", new String[]{String.valueOf(trackId.id())});
                 } while (cursor.moveToNext());
             }
         }
@@ -455,7 +455,7 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
 
                     ContentValues cv = new ContentValues();
                     cv.put("starttime_offset", zoneRules.getOffset(Instant.ofEpochMilli(startTime)).getTotalSeconds());
-                    db.update("tracks", cv, "_id = ?", new String[]{String.valueOf(trackId.getId())});
+                    db.update("tracks", cv, "_id = ?", new String[]{String.valueOf(trackId.id())});
                 } while (cursor.moveToNext());
             }
         }

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

@@ -86,7 +86,7 @@ public class ShareContentProvider extends CustomContentProvider {
 
         StringBuilder trackIdBuilder = new StringBuilder();
         for (Track.Id trackId : trackIds) {
-            trackIdBuilder.append(trackId.getId()).append(TRACKID_DELIMITER);
+            trackIdBuilder.append(trackId.id()).append(TRACKID_DELIMITER);
         }
         trackIdBuilder.deleteCharAt(trackIdBuilder.lastIndexOf(TRACKID_DELIMITER));
 
@@ -199,7 +199,7 @@ public class ShareContentProvider extends CustomContentProvider {
     public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
         Set<Track.Id> trackIds = parseURI(uri);
         final ArrayList<Track> tracks = new ArrayList<>();
-        String[] trackIdsString = trackIds.stream().map(Track.Id::toString).toArray(String[]::new);
+        String[] trackIdsString = trackIds.stream().map(id -> String.valueOf(id.id())).toArray(String[]::new);
         String whereClause = String.format(TracksColumns._ID + " IN (%s)", TextUtils.join(",", Collections.nCopies(trackIds.size(), "?")));
 
         try (Cursor cursor = super.query(TracksColumns.CONTENT_URI, null, whereClause, trackIdsString, TracksColumns._ID)) {

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

@@ -166,7 +166,7 @@ public class TrackDataHub {
     public void loadTrack(final @NonNull Track.Id trackId) {
         handler.post(() -> {
             if (trackId.equals(selectedTrackId)) {
-                Log.i(TAG, "Not reloading track " + trackId.getId());
+                Log.i(TAG, "Not reloading track " + trackId.id());
                 return;
             }
             selectedTrackId = trackId;
@@ -326,7 +326,7 @@ public class TrackDataHub {
 
         TrackPoint.Id next = null;
         if (localLastSeenTrackPointIdId != null) {
-            next = new TrackPoint.Id(localLastSeenTrackPointIdId.getId() + 1); //TODO startTrackPointId + 1 is an assumption assumption; should be derived from the DB.
+            next = new TrackPoint.Id(localLastSeenTrackPointIdId.id() + 1); //TODO startTrackPointId + 1 is an assumption assumption; should be derived from the DB.
         }
 
         TrackPoint trackPoint = null;
@@ -344,7 +344,7 @@ public class TrackDataHub {
                 TrackPoint.Id trackPointId = trackPoint.getId();
 
                 // Stop if past the last wanted point
-                if (maxPointId != null && trackPointId.getId() > maxPointId.getId()) {
+                if (maxPointId != null && trackPointId.id() > maxPointId.id()) {
                     break;
                 }
 
@@ -355,7 +355,7 @@ public class TrackDataHub {
                 }
 
                 if (samplingFrequency == -1) {
-                    long numTotalPoints = Math.max(0L, lastTrackPointId.getId() - localFirstSeenTrackPointId.getId()); //TODO That is an assumption; should be derived from the DB.
+                    long numTotalPoints = Math.max(0L, lastTrackPointId.id() - localFirstSeenTrackPointId.id()); //TODO That is an assumption; should be derived from the DB.
                     samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints);
                 }
 

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

@@ -67,7 +67,7 @@ public class TrackSelection implements ContentProviderUtils.ContentProviderSelec
         }
 
         // Builds selection arguments.
-        ArrayList<String> args = trackIds.stream().map(id -> Long.toString(id.getId())).collect(Collectors.toCollection(ArrayList::new));
+        ArrayList<String> args = trackIds.stream().map(id -> Long.toString(id.id())).collect(Collectors.toCollection(ArrayList::new));
         args.addAll(categories);
         args.addAll(fromToArgs);
         selectionArgs = args.stream().toArray(String[]::new);

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

@@ -143,53 +143,20 @@ public class Track {
         return Objects.hash(id);
     }
 
-    public static class Id implements Parcelable {
 
-        private final long id;
-
-        public Id(long id) {
-            this.id = id;
-        }
-
-        protected Id(Parcel in) {
-            id = in.readLong();
-        }
-
-        //TOOD Limit visibility to TrackRecordingService / ContentProvider
-        public long getId() {
-            return id;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Id id1 = (Id) o;
-            return id == id1.id;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id);
-        }
+    public record Id(long id) implements Parcelable {
 
         @Override
         public int describeContents() {
             return 0;
         }
 
-        @NonNull
-        @Override
-        public String toString() {
-            return String.valueOf(id);
-        }
-
         @Override
         public void writeToParcel(Parcel parcel, int i) {
             parcel.writeLong(id);
         }
 
-        public static final Parcelable.Creator<Track.Id> CREATOR = new Parcelable.Creator<>() {
+        public static final Creator<Track.Id> CREATOR = new Creator<>() {
             public Track.Id createFromParcel(Parcel in) {
                 return new Track.Id(in.readLong());
             }

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

@@ -18,6 +18,7 @@ package de.dennisguse.opentracks.data.models;
 import android.location.Location;
 import android.os.Build;
 import android.os.Parcel;
+import android.os.Parcelable;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -25,7 +26,6 @@ import androidx.annotation.VisibleForTesting;
 
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Objects;
 
 /**
  * Sensor and/or location information for a specific point in time.
@@ -462,40 +462,26 @@ public class TrackPoint {
                 '}';
     }
 
-    public static class Id {
+    public record Id(long id) implements Parcelable {
 
-        private final long id;
-
-        public Id(long id) {
-            this.id = id;
-        }
-
-        protected Id(Parcel in) {
-            id = in.readLong();
-        }
-
-        //TOOD Limit visibility to TrackRecordingService / ContentProvider
-        public long getId() {
-            return id;
+        @Override
+        public int describeContents() {
+            return 0;
         }
 
         @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            TrackPoint.Id id1 = (TrackPoint.Id) o;
-            return id == id1.id;
+        public void writeToParcel(Parcel parcel, int i) {
+            parcel.writeLong(id);
         }
 
-        @Override
-        public int hashCode() {
-            return Objects.hash(id);
-        }
+        public static final Creator<Id> CREATOR = new Creator<>() {
+            public Id createFromParcel(Parcel in) {
+                return new Id(in.readLong());
+            }
 
-        @NonNull
-        @Override
-        public String toString() {
-            return String.valueOf(id);
-        }
+            public Id[] newArray(int size) {
+                return new Id[size];
+            }
+        };
     }
 }

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

@@ -93,7 +93,7 @@ public class TrackFilenameGenerator {
     public String getExample() {
         Track track = new Track();
         track.setName("Berlin");
-        track.setUuid(UUID.fromString("fefefefefe-0000-1000-8000-00805f9b34fb"));
+        track.setUuid(UUID.fromString("f81d4fae-7dec-11d0-a765-00a0c91e6bf6"));
         track.getTrackStatistics().setStartTime(Instant.ofEpochMilli(0));
 
         return format(track, TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES);

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

@@ -19,6 +19,7 @@ package de.dennisguse.opentracks.io.file.exporter;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
@@ -340,7 +341,7 @@ public class ExportActivity extends FragmentActivity implements ExportService.Ex
     }
 
     @Override
-    public void onExportError(ExportTask exportTask) {
+    public void onExportError(ExportTask exportTask, String errorMessage) {
         trackExportErrorCount++;
         String name;
         if (exportTask.isMultiExport()) {
@@ -348,6 +349,7 @@ public class ExportActivity extends FragmentActivity implements ExportService.Ex
         } else {
             name = contentProviderUtils.getTrack(exportTask.getTrackIds().get(0)).getName();
         }
+        Log.e(TAG, "Error exporting " + name + ": " + errorMessage);
         trackErrors.add(name);
 
         nextExport(exportTask);

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

@@ -7,12 +7,12 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ResultReceiver;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
 import androidx.documentfile.provider.DocumentFile;
 
+import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.util.ExportUtils;
 
 public class ExportService extends JobIntentService {
@@ -22,7 +22,6 @@ public class ExportService extends JobIntentService {
     private static final String EXTRA_RECEIVER = "extra_receiver";
     private static final String EXTRA_EXPORT_TASK = "export_task";
     private static final String EXTRA_DIRECTORY_URI = "extra_directory_uri";
-    private static final String TAG = ExportService.class.getSimpleName();
 
     public static void enqueue(Context context, ExportServiceResultReceiver receiver, ExportTask exportTask, Uri directoryUri) {
         Intent intent = new Intent(context, JobService.class);
@@ -46,17 +45,19 @@ public class ExportService extends JobIntentService {
         // Build directory file.
         DocumentFile directoryFile = DocumentFile.fromTreeUri(this, directoryUri);
         if (directoryFile == null || !directoryFile.canWrite()) {
-            Log.e(TAG, "Can't write to directory: " + directoryFile);
+            bundle.putString(ExportServiceResultReceiver.EXTRA_EXPORT_ERROR_MESSAGE, getString(R.string.export_cannot_write_to_dir) + ": " + directoryFile);
             resultReceiver.send(ExportServiceResultReceiver.RESULT_CODE_ERROR, bundle);
             return;
         }
 
-        // Export.
-        boolean success = ExportUtils.exportTrack(this, directoryFile, exportTask);
-
-        // Send result to the receiver.
-        int resultCode = success ? ExportServiceResultReceiver.RESULT_CODE_SUCCESS : ExportServiceResultReceiver.RESULT_CODE_ERROR;
-        resultReceiver.send(resultCode, bundle);
+        // Export and send result
+        try {
+            ExportUtils.exportTrack(this, directoryFile, exportTask);
+            resultReceiver.send(ExportServiceResultReceiver.RESULT_CODE_SUCCESS, bundle);
+        } catch (Exception e) {
+            bundle.putString(ExportServiceResultReceiver.EXTRA_EXPORT_ERROR_MESSAGE, e.getMessage());
+            resultReceiver.send(ExportServiceResultReceiver.RESULT_CODE_ERROR, bundle);
+        }
     }
 
     public static class ExportServiceResultReceiver extends ResultReceiver {
@@ -66,6 +67,8 @@ public class ExportService extends JobIntentService {
 
         public static final String RESULT_EXTRA_EXPORT_TASK = "result_extra_export_task";
 
+        public static final String EXTRA_EXPORT_ERROR_MESSAGE = "extra_export_error_message";
+
         private final Receiver receiver;
 
         public ExportServiceResultReceiver(Handler handler, @NonNull Receiver receiver) {
@@ -75,10 +78,10 @@ public class ExportService extends JobIntentService {
 
         @Override
         protected void onReceiveResult(int resultCode, Bundle resultData) {
-            ExportTask exportTask = resultData.getParcelable(ExportServiceResultReceiver.RESULT_EXTRA_EXPORT_TASK);
+            ExportTask exportTask = resultData.getParcelable(RESULT_EXTRA_EXPORT_TASK);
             switch (resultCode) {
                 case RESULT_CODE_SUCCESS -> receiver.onExportSuccess(exportTask);
-                case RESULT_CODE_ERROR -> receiver.onExportError(exportTask);
+                case RESULT_CODE_ERROR -> receiver.onExportError(exportTask, resultData.getString(EXTRA_EXPORT_ERROR_MESSAGE));
                 default -> throw new RuntimeException("Unknown resultCode.");
             }
         }
@@ -87,7 +90,7 @@ public class ExportService extends JobIntentService {
             default void onExportSuccess(ExportTask exportTask) {
             }
 
-            default void onExportError(ExportTask exportTask) {
+            default void onExportError(ExportTask exportTask, String errorMessage) {
             }
         }
     }

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

@@ -279,8 +279,12 @@ public class GPXTrackExporter implements TrackExporter {
         printWriter.println("<gpxtrkx:MovingTime>" + trackStatistics.getMovingTime().getSeconds() + "</gpxtrkx:MovingTime>");
         printWriter.println("<gpxtrkx:StoppedTime>" + trackStatistics.getStoppedTime().getSeconds() + "</gpxtrkx:StoppedTime>");
         printWriter.println("<gpxtrkx:MaxSpeed>" + trackStatistics.getMaxSpeed().toMPS() + "</gpxtrkx:MaxSpeed>");
-        printWriter.println("<gpxtrkx:Ascent>" + trackStatistics.getTotalAltitudeGain() + "</gpxtrkx:Ascent>");
-        printWriter.println("<gpxtrkx:Descent>" + trackStatistics.getTotalAltitudeLoss() + "</gpxtrkx:Descent>");
+        if (trackStatistics.hasTotalAltitudeGain()) {
+            printWriter.println("<gpxtrkx:Ascent>" + trackStatistics.getTotalAltitudeGain() + "</gpxtrkx:Ascent>");
+        }
+        if (trackStatistics.hasTotalAltitudeLoss()) {
+            printWriter.println("<gpxtrkx:Descent>" + trackStatistics.getTotalAltitudeLoss() + "</gpxtrkx:Descent>");
+        }
         printWriter.println("</gpxtrkx:TrackStatsExtension>");
 
         printWriter.println("</extensions>");

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

@@ -88,7 +88,7 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
         trackId = resumeTrackId;
         Track track = contentProviderUtils.getTrack(trackId);
         if (track == null) {
-            Log.e(TAG, "Ignore resumeTrack. Track " + trackId.getId() + " does not exists.");
+            Log.e(TAG, "Ignore resumeTrack. Track " + trackId.id() + " does not exists.");
             return false;
         }
 

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

@@ -32,6 +32,8 @@ import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.time.Duration;
 
 import de.dennisguse.opentracks.data.models.Distance;
@@ -244,6 +246,15 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     public void newGpsStatus(GpsStatusValue gpsStatusValue) {
         Log.e(TAG, "newGpsStatus: " + gpsStatusValue.message);
 
+        if (notificationManager == null) {
+
+            StringWriter writer = new StringWriter();
+            Exception e = new RuntimeException("TrackRecording.newGpsStatus() called after onDestroy(); objectID: " + this + " with thread: " + Thread.currentThread().toString());
+            e.printStackTrace(new PrintWriter(writer));
+
+            Log.e(TAG, e.getMessage() + " " + writer);
+            return;
+        }
         notificationManager.updateContent(getString(gpsStatusValue.message));
         gpsStatusObservable.postValue(gpsStatusValue);
     }

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

@@ -16,8 +16,9 @@ import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 
 public class SettingsActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller {
 
-    public static final String EXTRAS_CHECK_EXPORT_DIRECTORY = "Check Export Directory";
-    private boolean checkExportDirectory = false;
+    public static final String EXTRAS_EXPORT_ERROR_MESSAGE = "Export error message";
+
+    private String exportErrorMessage = null;
 
     public static final String FRAGMENT_KEY = "fragmentKey";
 
@@ -30,8 +31,8 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
         super.onCreate(savedInstanceState);
 
         Intent intent = getIntent();
-        if (intent != null && intent.hasExtra(EXTRAS_CHECK_EXPORT_DIRECTORY)) {
-            checkExportDirectory = true;
+        if (intent != null) {
+            exportErrorMessage = intent.getStringExtra(EXTRAS_EXPORT_ERROR_MESSAGE);
         }
 
         if (savedInstanceState != null) {
@@ -48,15 +49,15 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
 
     @Override
     protected void onResume() {
-        if (checkExportDirectory) {
-            checkExportDirectory = false;
+        if (exportErrorMessage != null) {
             new AlertDialog.Builder(this)
                     .setIcon(R.drawable.ic_logo_24dp)
                     .setTitle(R.string.app_name)
-                    .setMessage(R.string.export_error_post_workout)
+                    .setMessage(getString(R.string.export_error_post_workout) + "\n" + exportErrorMessage)
                     .setNeutralButton(android.R.string.ok, null)
                     .create()
                     .show();
+            exportErrorMessage = null;
         }
 
         super.onResume();

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

@@ -50,7 +50,7 @@ public class ShareUtils {
         for (Track.Id trackId : trackIds) {
             Track track = contentProviderUtils.getTrack(trackId);
             if (track == null) {
-                Log.e(TAG, "TrackId " + trackId.getId() + " could not be resolved.");
+                Log.e(TAG, "TrackId " + trackId.id() + " could not be resolved.");
                 continue;
             }
 

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

@@ -18,19 +18,16 @@ package de.dennisguse.opentracks.ui.markers;
 
 import android.app.SearchManager;
 import android.content.Intent;
-import android.database.Cursor;
 import android.os.Bundle;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.CursorLoader;
-import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
+import java.util.List;
 import java.util.Objects;
 
 import de.dennisguse.opentracks.AbstractActivity;
@@ -38,15 +35,12 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.data.tables.MarkerColumns;
 import de.dennisguse.opentracks.databinding.MarkerListBinding;
 import de.dennisguse.opentracks.services.RecordingStatus;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.share.ShareUtils;
-import de.dennisguse.opentracks.ui.markers.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.ui.util.ActivityUtils;
-import de.dennisguse.opentracks.ui.util.ScrollVisibleViews;
 import de.dennisguse.opentracks.util.IntentUtils;
 
 /**
@@ -54,23 +48,20 @@ import de.dennisguse.opentracks.util.IntentUtils;
  *
  * @author Leif Hendrik Wilden
  */
-public class MarkerListActivity extends AbstractActivity implements DeleteMarkerCaller {
+public class MarkerListActivity extends AbstractActivity {
 
     public static final String EXTRA_TRACK_ID = "track_id";
 
-    private static final String TAG = MarkerListActivity.class.getSimpleName();
-
     private ContentProviderUtils contentProviderUtils;
 
     private RecordingStatus recordingStatus = TrackRecordingService.STATUS_DEFAULT;
 
-    private Track track;
-    private MarkerResourceCursorAdapter resourceCursorAdapter;
+    private Track.Id trackId;
+
+    private MarkerListAdapter adapter;
 
     private MarkerListBinding viewBinding;
 
-    private final MarkerLoaderCallback loaderCallbacks = new MarkerLoaderCallback();
-
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
 
     private final TrackRecordingServiceConnection.Callback bindCallback = (service, unused) -> service.getRecordingStatusObservable()
@@ -105,33 +96,24 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     private MenuItem insertMarkerMenuItem;
     private MenuItem searchMenuItem;
 
+    private String searchQuery;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
-        Track.Id trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);
-
         contentProviderUtils = new ContentProviderUtils(this);
 
-        track = trackId != null ? contentProviderUtils.getTrack(trackId) : null;
-
-        viewBinding.markerList.setEmptyView(viewBinding.markerListEmpty);
-        viewBinding.markerList.setOnItemClickListener((parent, view, position, id) -> {
-            resourceCursorAdapter.markerInvalid(id);
-            Intent intent = IntentUtils.newIntent(MarkerListActivity.this, MarkerDetailActivity.class)
-                    .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, new Marker.Id(id));
-            startActivity(intent);
-        });
-
-        resourceCursorAdapter = new MarkerResourceCursorAdapter(this, R.layout.list_item);
-        ScrollVisibleViews scrollVisibleViews = new ScrollVisibleViews(resourceCursorAdapter);
-        viewBinding.markerList.setOnScrollListener(scrollVisibleViews);
-        viewBinding.markerList.setAdapter(resourceCursorAdapter);
-        ActivityUtils.configureListViewContextualMenu(viewBinding.markerList, contextualActionModeCallback);
+        trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);
 
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindCallback);
 
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+        adapter = new MarkerListAdapter(this, viewBinding.markerList, null);
+        viewBinding.markerList.setLayoutManager(layoutManager);
+        viewBinding.markerList.setAdapter(adapter);
+
         setSupportActionBar(viewBinding.markerListToolbar);
+        adapter.setActionModeCallback(contextualActionModeCallback);
     }
 
     @Override
@@ -145,7 +127,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
         super.onResume();
         trackRecordingServiceConnection.bind(this);
         this.invalidateOptionsMenu();
-        loadData(getIntent());
+        loadData();
     }
 
     @Override
@@ -157,9 +139,8 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        resourceCursorAdapter.clear();
         viewBinding = null;
-        resourceCursorAdapter = null;
+        adapter = null;
         contentProviderUtils = null;
     }
 
@@ -183,15 +164,15 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        insertMarkerMenuItem.setVisible(track != null && track.getId().equals(recordingStatus.getTrackId()));
+        insertMarkerMenuItem.setVisible(trackId != null && trackId.equals(recordingStatus.getTrackId()));
         return super.onPrepareOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (track != null && item.getItemId() == R.id.marker_list_insert_marker) {
+        if (trackId != null && item.getItemId() == R.id.marker_list_insert_marker) {
             Intent intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
-                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, track.getId());
+                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId);
             startActivity(intent);
             return true;
         }
@@ -229,7 +210,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
 
         if (itemId == R.id.list_context_menu_edit) {
             if (markerIds.length == 1) {
-                resourceCursorAdapter.markerInvalid(markerIds[0].id());
                 Intent intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
                         .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerIds[0]);
                 startActivity(intent);
@@ -243,23 +223,13 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
         }
 
         if (itemId == R.id.list_context_menu_select_all) {
-            for (int i = 0; i < viewBinding.markerList.getCount(); i++) {
-                viewBinding.markerList.setItemChecked(i, true);
-            }
+            adapter.setAllSelected(true);
             return false;
         }
 
         return false;
     }
 
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_SEARCH && searchMenuItem != null) {
-            return true;
-        }
-        return super.onKeyUp(keyCode, event);
-    }
-
     @Override
     public void onBackPressed() {
         SearchView searchView = (SearchView) searchMenuItem.getActionView();
@@ -267,8 +237,9 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
             searchView.setIconified(true);
         }
 
-        if (loaderCallbacks.getSearchQuery() != null) {
-            loaderCallbacks.setSearch(null);
+        if (searchQuery != null) {
+            searchQuery = null;
+            loadData();
             return;
         }
 
@@ -276,78 +247,33 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     }
 
     @Override
-    public void onNewIntent(Intent intent) {
+    protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        setIntent(intent);
-        loadData(intent);
-    }
 
-    private void loadData(Intent intent) {
-        String searchQuery = null;
         if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
             searchQuery = intent.getStringExtra(SearchManager.QUERY);
+        } else {
+            searchQuery = null;
         }
-
-        loaderCallbacks.setSearch(searchQuery);
     }
 
-    @Override
-    public void onMarkerDeleted() {
-        // Do nothing
+    private void loadData() {
+        viewBinding.markerListToolbar.setTitle(Objects.requireNonNullElseGet(searchQuery, () -> getString(R.string.menu_markers)));
+
+        List<Marker> markers = contentProviderUtils.searchMarkers(trackId, searchQuery);
+
+        adapter.swapData(markers);
+
+        if (markers.isEmpty()) {
+            viewBinding.markerListEmpty.setVisibility(View.VISIBLE);
+            viewBinding.markerList.setVisibility(View.GONE);
+        } else {
+            viewBinding.markerListEmpty.setVisibility(View.GONE);
+            viewBinding.markerList.setVisibility(View.VISIBLE);
+        }
     }
 
     private void onRecordingStatusChanged(RecordingStatus status) {
         recordingStatus = status;
     }
-
-    private class MarkerLoaderCallback implements LoaderManager.LoaderCallbacks<Cursor> {
-
-        private String searchQuery = null;
-
-        public String getSearchQuery() {
-            return searchQuery;
-        }
-
-        public void setSearch(String searchQuery) {
-            this.searchQuery = searchQuery;
-            restart();
-            viewBinding.markerListToolbar.setTitle(Objects.requireNonNullElseGet(searchQuery, () -> getString(R.string.menu_markers)));
-        }
-
-        public void restart() {
-            LoaderManager.getInstance(MarkerListActivity.this).restartLoader(0, null, loaderCallbacks);
-        }
-
-        @NonNull
-        @Override
-        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-            final String[] PROJECTION = new String[]{MarkerColumns._ID,
-                    MarkerColumns.NAME, MarkerColumns.DESCRIPTION, MarkerColumns.CATEGORY,
-                    MarkerColumns.TIME, MarkerColumns.PHOTOURL, MarkerColumns.TRACKID};
-
-            if (searchQuery == null) {
-                if (track != null) {
-                    return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, MarkerColumns.TRACKID + "=?", new String[]{String.valueOf(track.getId().getId())}, null);
-                } else {
-                    return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, null, null, null);
-                }
-            } else {
-                final String SEARCH_QUERY = MarkerColumns.NAME + " LIKE ? OR " +
-                        MarkerColumns.DESCRIPTION + " LIKE ? OR " +
-                        MarkerColumns.CATEGORY + " LIKE ?";
-                final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
-                return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, MarkerColumns.DEFAULT_SORT_ORDER + " DESC");
-            }
-        }
-
-        @Override
-        public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
-            resourceCursorAdapter.swapCursor(cursor);
-        }
-
-        @Override
-        public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-            resourceCursorAdapter.swapCursor(null);
-        }
-    }
 }

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

@@ -0,0 +1,276 @@
+package de.dennisguse.opentracks.ui.markers;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.media.ThumbnailUtils;
+import android.net.Uri;
+import android.util.Log;
+import android.util.LruCache;
+import android.util.SparseBooleanArray;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.databinding.MarkerListItemBinding;
+import de.dennisguse.opentracks.ui.util.ActivityUtils;
+import de.dennisguse.opentracks.ui.util.ExecutorListViewService;
+import de.dennisguse.opentracks.ui.util.ListItemUtils;
+import de.dennisguse.opentracks.ui.util.ThemeUtils;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+
+public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements ActionMode.Callback {
+
+    private static final String TAG = MarkerListAdapter.class.getSimpleName();
+
+    private final AppCompatActivity context;
+    private final RecyclerView recyclerView;
+    private List<Marker> markers;
+    private final SparseBooleanArray selection;
+    private boolean selectionMode;
+    private ActivityUtils.ContextualActionModeCallback actionModeCallback;
+    private ActionMode actionMode;
+
+    private final ExecutorListViewService<Marker.Id> executorService = new ExecutorListViewService<>(128);
+
+    private final LruCache<Marker.Id, Bitmap> memoryCache;
+
+    public MarkerListAdapter(AppCompatActivity context, RecyclerView recyclerView, List<Marker> markers) {
+        this.context = context;
+        this.recyclerView = recyclerView;
+        this.markers = markers;
+
+        selection = new SparseBooleanArray();
+        selectionMode = false;
+
+        // Get max available VM memory, exceeding this amount will throw an OutOfMemory exception.
+        final long usedMemory = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+        final int cacheSize = (int) (Runtime.getRuntime().maxMemory() - usedMemory) / 8;
+
+        memoryCache = new LruCache<>(cacheSize) {
+            @Override
+            protected int sizeOf(Marker.Id key, Bitmap value) {
+                return value.getByteCount();
+            }
+        };
+    }
+
+    public void setActionModeCallback(ActivityUtils.ContextualActionModeCallback actionModeCallback) {
+        this.actionModeCallback = actionModeCallback;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.marker_list_item, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        ViewHolder viewHolder = (ViewHolder) holder;
+
+        viewHolder.bind(markers.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        if (markers == null) {
+            return 0;
+        }
+        return markers.size();
+    }
+
+    public void swapData(List<Marker> markers) {
+        this.markers = markers;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
+        actionMode.getMenuInflater().inflate(R.menu.list_context_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
+        selectionMode = true;
+        actionModeCallback.onPrepare(menu, getCheckedPositions(), getCheckedIds(), true);
+        return true;
+    }
+
+    @Override
+    public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
+        if (actionModeCallback.onClick(menuItem.getItemId(), getCheckedPositions(), getCheckedIds())) {
+            actionMode.finish();
+        }
+        return true;
+    }
+
+    @Override
+    public void onDestroyActionMode(ActionMode actionMode) {
+        selectionMode = false;
+
+        setAllSelected(false);
+        selection.clear();
+
+        actionModeCallback.onDestroy();
+    }
+
+    public void setAllSelected(boolean isSelected) {
+        for (int i = 0; i < getItemCount(); i++) {
+            ViewHolder holder = (ViewHolder) recyclerView.findViewHolderForLayoutPosition(i);
+            holder.setSelected(isSelected);
+        }
+    }
+
+    private int[] getCheckedPositions() {
+        List<Integer> positions = new ArrayList<>();
+
+        for (int i = 0; i < selection.size(); i++) {
+            if (selection.valueAt(i)) {
+                positions.add(selection.keyAt(i));
+            }
+        }
+
+        return positions.stream().mapToInt(i -> i).toArray();
+    }
+
+    private long[] getCheckedIds() {
+        List<Long> ids = new ArrayList<>();
+
+        for (int i = 0; i < selection.size(); i++) {
+            if (selection.valueAt(i)) {
+                ViewHolder holder = (ViewHolder) recyclerView.findViewHolderForLayoutPosition(selection.keyAt(i));
+                ids.add(holder.getId());
+            }
+        }
+
+        return ids.stream().mapToLong(i -> i).toArray();
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+
+        private final MarkerListItemBinding viewBinding;
+        private final View view;
+
+        private Marker marker;
+
+        public ViewHolder(@NonNull View view) {
+            super(view);
+
+            viewBinding = MarkerListItemBinding.bind(view);
+            this.view = view;
+
+            view.setOnClickListener(this);
+            view.setOnLongClickListener(this);
+        }
+
+        public void bind(Marker marker) {
+            this.marker = marker;
+
+            viewBinding.markerListItemPhoto.setVisibility(marker.hasPhoto() ? View.VISIBLE : View.GONE);
+            viewBinding.markerListItemTextGradient.setVisibility(marker.hasPhoto() ? View.VISIBLE : View.GONE);
+            if (marker.hasPhoto()) {
+                int height = ThemeUtils.getPhotoHeight(context);
+                ViewGroup.LayoutParams params = viewBinding.markerListItemPhoto.getLayoutParams();
+                params.height = height;
+                viewBinding.markerListItemPhoto.setLayoutParams(params);
+                viewBinding.markerListItemTextGradient.setLayoutParams(params);
+
+                asyncLoadPhoto(viewBinding.markerListItemPhoto, marker.getPhotoURI(), marker.getId());
+            }
+
+            viewBinding.markerListItemName.setText(marker.getName());
+
+            {
+                ZoneOffset timeZone = new ContentProviderUtils(context).getTrack(marker.getTrackId()).getZoneOffset();
+                ListItemUtils.setDateAndTime(context, viewBinding.markerListItemDate, viewBinding.markerListItemTime, marker.getTime(), timeZone);
+            }
+
+            String categoryDescription = StringUtils.getCategoryDescription(marker.getCategory(), marker.getDescription());
+            viewBinding.markerListItemTimeDistance.setText(categoryDescription);
+
+            setSelected(selection.get(getLayoutPosition()));
+        }
+
+        public void setSelected(boolean isSelected) {
+            selection.put(getLayoutPosition(), isSelected);
+            view.setActivated(isSelected);
+        }
+
+        public long getId() {
+            return marker.getId().id();
+        }
+
+        @Override
+        public void onClick(View view) {
+            if (selectionMode) {
+                setSelected(!view.isActivated());
+                actionMode.invalidate();
+            } else {
+                Intent intent = IntentUtils.newIntent(context, MarkerDetailActivity.class)
+                        .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, marker.getId());
+                context.startActivity(intent);
+            }
+        }
+
+        @Override
+        public boolean onLongClick(View view) {
+            actionMode = context.startSupportActionMode(MarkerListAdapter.this);
+            setSelected(true);
+            return true;
+        }
+    }
+
+    /**
+     * It loads the photoUrl in the imageView from view.
+     * It takes the photo from cache or from storage if isn't in the cache.
+     *
+     * @param imageView view object where photo will be loaded.
+     * @param photoUri  photo's url.
+     * @param id        marker's id where photo belong.
+     */
+    private void asyncLoadPhoto(ImageView imageView, Uri photoUri, Marker.Id id) {
+
+        Bitmap bm = memoryCache.get(id);
+        imageView.setImageBitmap(bm);
+        if (bm != null) {
+            return;
+        }
+
+        executorService.execute(id, () -> {
+            try (InputStream inputStream = context.getContentResolver().openInputStream(photoUri)) {
+                Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
+                int height = ThemeUtils.getPhotoHeight(context);
+                Log.d(TAG, "Width : " + (bitmap.getWidth() / (bitmap.getHeight() / height)) + " | Height: " + height);
+                final Bitmap finalPhoto = ThumbnailUtils.extractThumbnail(bitmap, bitmap.getWidth() / (bitmap.getHeight() / height), height);
+                context.runOnUiThread(() -> imageView.setImageBitmap(finalPhoto));
+                memoryCache.put(id, finalPhoto);
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to image " + e);
+            }
+        });
+    }
+}

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

@@ -1,195 +0,0 @@
-package de.dennisguse.opentracks.ui.markers;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.ThumbnailUtils;
-import android.net.Uri;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import androidx.annotation.NonNull;
-import androidx.collection.LruCache;
-import androidx.cursoradapter.widget.ResourceCursorAdapter;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.time.Instant;
-import java.time.OffsetDateTime;
-
-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.ui.util.ExecutorListViewService;
-import de.dennisguse.opentracks.ui.util.ListItemUtils;
-import de.dennisguse.opentracks.ui.util.ScrollVisibleViews;
-
-public class MarkerResourceCursorAdapter extends ResourceCursorAdapter implements ScrollVisibleViews.VisibleViewsListener {
-
-    private static final String TAG = MarkerResourceCursorAdapter.class.getSimpleName();
-
-    private static final int LIST_PREFERRED_ITEM_HEIGHT_DEFAULT = 128;
-
-    private final Activity activity;
-
-    //TODO Should be Marker.Id
-    private final ExecutorListViewService<Long> executorService = new ExecutorListViewService<>(LIST_PREFERRED_ITEM_HEIGHT_DEFAULT);
-
-    private boolean scroll = false;
-
-    // Cache size is in bytes.
-    private final LruCache<String, Bitmap> memoryCache;
-
-    public MarkerResourceCursorAdapter(Activity activity, int layout) {
-        super(activity, layout, null, 0);
-
-        this.activity = activity;
-
-        // Get max available VM memory, exceeding this amount will throw an OutOfMemory exception.
-        final long usedMemory = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
-        final int cacheSize = (int) (Runtime.getRuntime().maxMemory() - usedMemory) / 8;
-
-        memoryCache = new LruCache<>(cacheSize) {
-            @Override
-            protected int sizeOf(@NonNull String key, @NonNull Bitmap bitmap) {
-                return bitmap.getByteCount();
-            }
-        };
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        int idIndex = cursor.getColumnIndex(MarkerColumns._ID);
-        int nameIndex = cursor.getColumnIndex(MarkerColumns.NAME);
-        int timeIndex = cursor.getColumnIndexOrThrow(MarkerColumns.TIME);
-        int categoryIndex = cursor.getColumnIndex(MarkerColumns.CATEGORY);
-        int descriptionIndex = cursor.getColumnIndex(MarkerColumns.DESCRIPTION);
-        int photoUrlIndex = cursor.getColumnIndex(MarkerColumns.PHOTOURL);
-        int trackIdIndex = cursor.getColumnIndex(MarkerColumns.TRACKID);
-
-        long id = cursor.getLong(idIndex);
-        int iconId = MarkerUtils.ICON_ID;
-        String name = cursor.getString(nameIndex);
-        long time = cursor.getLong(timeIndex);
-        String category = cursor.getString(categoryIndex);
-        String description = cursor.getString(descriptionIndex);
-        String photoUrl = cursor.getString(photoUrlIndex);
-        long trackId = cursor.getLong(trackIdIndex);
-
-        view.setTag(String.valueOf(id));
-
-        boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
-
-        ImageView imageView = view.findViewById(R.id.list_item_photo);
-        ImageView textGradient = view.findViewById(R.id.list_item_text_gradient);
-        imageView.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
-        textGradient.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
-        imageView.setImageBitmap(null);
-
-        if (hasPhoto) {
-            int height = getPhotoHeight(activity);
-            ViewGroup.LayoutParams params = imageView.getLayoutParams();
-            params.height = height;
-            imageView.setLayoutParams(params);
-
-            if (getBitmapFromMemCache(String.valueOf(id)) != null || !scroll) {
-                asyncLoadPhoto(view, imageView, photoUrl, id);
-            }
-        }
-
-        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
-        Track track = contentProviderUtils.getTrack(new Track.Id(trackId));
-        ListItemUtils.setListItem(activity, view, false, iconId, R.string.image_marker, name, null, null, 0,
-                OffsetDateTime.ofInstant(Instant.ofEpochMilli(time), track.getZoneOffset()), category, description, hasPhoto);
-    }
-
-    public void clear() {
-        executorService.shutdown();
-    }
-
-    @Override
-    public void onViewVisible(View view, int position) {
-        scroll = true;
-
-        Cursor cursor = getCursor();
-        if (!cursor.moveToPosition(position)) {
-            return;
-        }
-
-        long id = cursor.getLong(cursor.getColumnIndexOrThrow(MarkerColumns._ID));
-        String photoUrl = cursor.getString(cursor.getColumnIndexOrThrow(MarkerColumns.PHOTOURL));
-
-        boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
-        if (hasPhoto) {
-            ImageView imageView = view.findViewById(R.id.list_item_photo);
-            asyncLoadPhoto(view, imageView, photoUrl, id);
-        }
-    }
-
-    public void markerInvalid(long id) {
-        memoryCache.remove(String.valueOf(id));
-        scroll = false;
-    }
-
-    private void addBitmapToMemoryCache(String key, Bitmap bitmap) {
-        synchronized (memoryCache) {
-            if (getBitmapFromMemCache(key) == null) {
-                memoryCache.put(key, bitmap);
-            }
-        }
-    }
-
-    private Bitmap getBitmapFromMemCache(String key) {
-        return memoryCache.get(key);
-    }
-
-    /**
-     * It loads the photoUrl in the imageView from view.
-     * It takes the photo from cache or from storage if isn't in the cache.
-     *
-     * @param view      item's view.
-     * @param imageView view object where photo will be loaded.
-     * @param photoUrl  photo's url.
-     * @param id        marker's id where photo belong.
-     */
-    private void asyncLoadPhoto(View view, ImageView imageView, String photoUrl, long id) {
-        Bitmap photo = getBitmapFromMemCache(String.valueOf(id));
-        imageView.setImageBitmap(photo);
-
-        if (photo == null) {
-            executorService.execute(id, () -> {
-                try (InputStream inputStream = activity.getContentResolver().openInputStream(Uri.parse(photoUrl))) {
-                    Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
-                    int height = getPhotoHeight(activity);
-                    Log.d(TAG, "Width : " + (bitmap.getWidth() / (bitmap.getHeight() / height)) + " | Height: " + height);
-                    final Bitmap finalPhoto = ThumbnailUtils.extractThumbnail(bitmap, bitmap.getWidth() / (bitmap.getHeight() / height), height);
-                    addBitmapToMemoryCache(String.valueOf(id), finalPhoto);
-                    if (view.getTag().equals(String.valueOf(id))) {
-                        activity.runOnUiThread(() -> imageView.setImageBitmap(finalPhoto));
-                    }
-                } catch (IOException e) {
-                    Log.e(TAG, "Failed to image " + e);
-                }
-            });
-        }
-    }
-
-    /**
-     * Gets the photo height.
-     *
-     * @param context the context
-     */
-    private static int getPhotoHeight(Context context) {
-        int[] attrs = new int[]{android.R.attr.listPreferredItemHeight};
-        TypedArray typeArray = context.obtainStyledAttributes(attrs);
-        int height = typeArray.getDimensionPixelSize(0, LIST_PREFERRED_ITEM_HEIGHT_DEFAULT);
-        typeArray.recycle();
-        return 2 * height;
-    }
-}

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

@@ -24,7 +24,9 @@ import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 
+import java.time.Instant;
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 
 import de.dennisguse.opentracks.R;
@@ -180,4 +182,17 @@ public class ListItemUtils {
             textView.setShadowLayer(0, 0, 0, 0);
         }
     }
+
+    public static void setDateAndTime(Context context, TextView dateView, TextView timeView, Instant time, ZoneOffset timeZone) {
+        OffsetDateTime offsetDateTime = OffsetDateTime.ofInstant(time, timeZone);
+        String dateContent = StringUtils.formatDateTodayRelative(context, offsetDateTime);
+        String pattern = "HH:mm";
+        if (!offsetDateTime.getOffset().equals(OffsetDateTime.now().getOffset())) {
+            pattern = "HH:mm x";
+        }
+        String timeContent = offsetDateTime.format(DateTimeFormatter.ofPattern(pattern));
+
+        dateView.setText(dateContent);
+        timeView.setText(timeContent);
+    }
 }

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

@@ -52,4 +52,15 @@ public class ThemeUtils {
         typedArray.recycle();
         return fontSize;
     }
+
+    /**
+     * Gets the photo height.
+     */
+    public static int getPhotoHeight(Context context) {
+        int[] attrs = new int[]{android.R.attr.listPreferredItemHeight};
+        TypedArray typeArray = context.obtainStyledAttributes(attrs);
+        int height = typeArray.getDimensionPixelSize(0, 128);
+        typeArray.recycle();
+        return 2 * height;
+    }
 }

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

@@ -8,7 +8,6 @@ import android.net.Uri;
 import android.os.Handler;
 import android.provider.DocumentsContract;
 import android.util.Log;
-import android.widget.Toast;
 
 import androidx.documentfile.provider.DocumentFile;
 
@@ -19,7 +18,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
@@ -40,17 +38,12 @@ public class ExportUtils {
             TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat();
             DocumentFile directory = IntentUtils.toDocumentFile(context, PreferencesUtils.getDefaultExportDirectoryUri());
 
-            if (directory == null || !directory.canWrite()) {
-                Toast.makeText(context, R.string.export_cannot_write_to_dir, Toast.LENGTH_LONG).show();
-                return;
-            }
-
             ExportServiceResultReceiver resultReceiver = new ExportServiceResultReceiver(new Handler(), new ExportServiceResultReceiver.Receiver() {
                 @Override
-                public void onExportError(ExportTask unused) {
+                public void onExportError(ExportTask unused, String errorMessage) {
                     Intent intent = new Intent(context, SettingsActivity.class);
-                    intent.putExtra(SettingsActivity.EXTRAS_CHECK_EXPORT_DIRECTORY, true);
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    intent.putExtra(SettingsActivity.EXTRAS_EXPORT_ERROR_MESSAGE, errorMessage);
                     context.startActivity(intent);
                 }
             });
@@ -59,7 +52,7 @@ public class ExportUtils {
         }
     }
 
-    public static boolean exportTrack(Context context, DocumentFile directory, ExportTask exportTask) {
+    public static void exportTrack(Context context, DocumentFile directory, ExportTask exportTask) {
         ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
         List<Track> tracks = exportTask.getTrackIds().stream().map(contentProviderUtils::getTrack).collect(Collectors.toList());
         Uri exportDocumentFileUri;
@@ -71,27 +64,21 @@ public class ExportUtils {
         }
 
         if (exportDocumentFileUri == null) {
-            Log.e(TAG, "Couldn't create document file for export");
-            return false;
+            throw new RuntimeException("Couldn't create document file for export");
         }
 
         TrackExporter trackExporter = exportTask.getTrackFileFormat().createTrackExporter(context, contentProviderUtils);
         try (OutputStream outputStream = context.getContentResolver().openOutputStream(exportDocumentFileUri)) {
-            if (trackExporter.writeTrack(tracks, outputStream)) {
-                return true;
-            } else {
+            if (!trackExporter.writeTrack(tracks, outputStream)) {
                 if (!DocumentFile.fromSingleUri(context, exportDocumentFileUri).delete()) {
-                    Log.e(TAG, "Unable to delete exportDocumentFile");
+                    throw new RuntimeException("Unable to delete exportDocumentFile");
                 }
-                Log.e(TAG, "Unable to export track");
-                return false;
+                throw new RuntimeException("Unable to export track");
             }
         } catch (FileNotFoundException e) {
-            Log.e(TAG, "Unable to open exportDocumentFile " + exportDocumentFileUri, e);
-            return false;
+            throw new RuntimeException("Unable to open exportDocumentFile " + exportDocumentFileUri, e);
         } catch (IOException e) {
-            Log.e(TAG, "Unable to close exportDocumentFile output stream", e);
-            return false;
+            throw new RuntimeException("Unable to close exportDocumentFile output stream", e);
         }
     }
 

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

@@ -59,7 +59,7 @@ public class FileUtils {
     }
 
     public static File getPhotoDir(Context context, Track.Id trackId) {
-        File photoDirectory = new File(getPhotoDir(context), "" + trackId.getId());
+        File photoDirectory = new File(getPhotoDir(context), "" + trackId.id());
         photoDirectory.mkdirs();
         return photoDirectory;
     }

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

@@ -60,11 +60,12 @@ public class PermissionRequester {
     private static final List<String> GPS_PERMISSION;
 
     static {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            GPS_PERMISSION = List.of(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION);
-        } else {
+        //TODO ACCESS_BACKGROUND_LOCATION is required for API, but the permission is not properly granted. See #1653.
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+//            GPS_PERMISSION = List.of(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION);
+//        } else {
             GPS_PERMISSION = List.of(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION);
-        }
+//        }
     }
 
     private static final List<String> BLUETOOTH_PERMISSIONS;

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

@@ -44,7 +44,7 @@ public class TrackNameUtils {
         } else if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_iso_8601_value))) {
             return startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mmX"));
         } else {
-            return context.getString(R.string.track_name_format, trackId.getId());
+            return context.getString(R.string.track_name_format, trackId.id());
         }
     }
 }

src/main/res/layout/marker_list.xml

@@ -37,7 +37,7 @@ limitations under the License.
         android:paddingBottom="?attr/actionBarSize"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <ListView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/marker_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

src/main/res/layout/marker_list_item.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/activated_background"
+    android:padding="8dp">
+
+    <!-- Photo -->
+    <ImageView
+        android:id="@+id/marker_list_item_photo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/image_photo_marker"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toTopOf="@id/marker_list_item_bottom_line"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <!-- A gradient on top of the text -->
+    <ImageView
+        android:id="@+id/marker_list_item_text_gradient"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha=".6"
+        android:contentDescription="@string/image_photo_marker"
+        android:src="@drawable/text_gradient"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/marker_list_item_bottom_line"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <!-- Name -->
+    <TextView
+        android:id="@+id/marker_list_item_name"
+        style="?attr/textAppearanceBody1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Main text" />
+
+    <!-- Date -->
+    <TextView
+        android:id="@+id/marker_list_item_date"
+        style="?attr/textAppearanceBodySmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="2022-02-17" />
+
+    <!-- Total time and distance -->
+    <TextView
+        android:id="@+id/marker_list_item_time_distance"
+        style='?attr/textAppearanceBodySmall'
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@+id/marker_list_item_name"
+        app:layout_constraintTop_toBottomOf="@+id/marker_list_item_name"
+        tools:text="50:43 (50.00km)" />
+
+    <!-- Time -->
+    <TextView
+        android:id="@+id/marker_list_item_time"
+        style="?attr/textAppearanceBodySmall"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/marker_list_item_name"
+        tools:text="10:10:10" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/marker_list_item_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="marker_list_item_photo,marker_list_item_text_gradient,marker_list_item_name,marker_list_item_date,marker_list_item_time_distance,marker_list_item_time" />
+
+    <!-- Bottom Line -->
+    <View
+        android:id="@+id/marker_list_item_bottom_line"
+        style="@style/HorizontalLine"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/marker_list_item_barrier" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -634,11 +634,9 @@ limitations under the License.
     <string name="introduction_osm_dashboard">OpenTracks en sí no proporciona un mapa. Por favor, instale OSMDashboard para ver sus grabaciones en un mapa.</string>
     <string name="share_crash_report">Compartir informe de fallo</string>
     <string name="settings_stats_units_imperial_meter">Imperial (millas, metros)</string>
-
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si la precisión es superior a %1$s</string>
     <string name="settings_sensor_heart_rate_max">Zonas: frecuencia cardíaca máxima (lpm)</string>
     <string name="settings_api_summary">API de control remoto y estadísticas para otras aplicaciones</string>
-
     <string name="no_compatible_camera_installed">No hay ninguna aplicación de cámara compatible instalada</string>
     <string name="no_compatible_gallery_installed">No hay ninguna aplicación de galería de imágenes compatible instalada</string>
     <string name="sensor_state_cadence_unit">rpm</string>
@@ -647,4 +645,5 @@ limitations under the License.
     <string name="settings_sensor_bluetooth_service_filter_title">Filtrar dispositivos Bluetooth</string>
     <string name="settings_sensor_bluetooth_service_filter_off">Mostrar todos los dispositivos Bluetooth detectados</string>
     <string name="voice_on_device_speaker_title">Utiliza el altavoz del dispositivo</string>
+    <string name="menu_export_all_one_file">Exportar todo (un archivo para todas las pistas)</string>
 </resources>

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

@@ -592,4 +592,5 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele
     <string name="sensor_state_cadence_unit">rpm</string>
     <string name="sensor_state_heart_rate_unit">lpm</string>
     <string name="sensor_state_power_unit">W</string>
+    <string name="show_on_dashboard">Taboleiro da API OpenTracks</string>
 </resources>

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

@@ -542,7 +542,7 @@ limitations under the License.
     <string name="show_on_map_format_ask">Spør</string>
     <string name="show_on_dashboard">OpenTracks-API for oversikten</string>
     <string name="always">Alltid</string>
-    <string name="settings_announcements_average_heart_rate">Gjen. puls</string>
+    <string name="settings_announcements_average_heart_rate">Gjennomsnittlig puls</string>
     <string name="settings_announcements_lap_heart_rate">Runde-puls</string>
     <string name="settings_announcements_average_speed_pace">Gjen. hastighet/tempo</string>
     <string name="image_discard">Forkast</string>
@@ -580,4 +580,5 @@ limitations under the License.
     <string name="voiceDistanceNauticalMilesPlural">{n, plural, =1 {1 nautisk mil} other {{n,number,#.0} nautiske mil} }</string>
     <string name="sensor_state_cadence_unit">o/min</string>
     <string name="sensor_state_heart_rate_unit">slag/min</string>
+    <string name="average_heart_rate">Gjennomsnittlig puls</string>
 </resources>

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

@@ -152,7 +152,7 @@ limitations under the License.
     <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_export_all">Експортувати все (один файл на трек)</string>
     <string name="menu_help">Довідка</string>
     <string name="menu_import_all">Імпортувати все</string>
     <string name="menu_insert_marker">Вставити маркер</string>
@@ -352,9 +352,9 @@ limitations under the License.
     <string name="activity_type_escooter">електро-байк</string>
     <string name="settings_sensor_wheel_circumference">Окружність колеса (мм)</string>
     <string name="description_altitude_loss">Зменшення висоти: %1$d м (%2$d фут.)</string>
-    <string name="export_progress_summary_new_msg">Нові треки експортовано</string>
-    <string name="export_progress_summary_overwrite_msg">Треки перезаписано</string>
-    <string name="export_progress_summary_skip_msg">Треки пропущено</string>
+    <string name="export_progress_summary_new_msg">Нові файли експортовано</string>
+    <string name="export_progress_summary_overwrite_msg">Файли перезаписано</string>
+    <string name="export_progress_summary_skip_msg">Пропущені файли</string>
     <string name="export_progress_summary_errors_msg">Помилки</string>
     <string name="generic_open_track">Відкрити Трек</string>
     <string name="import_file_imported">Файл %1$s імпортовано</string>
@@ -364,9 +364,9 @@ limitations under the License.
     <string name="import_progress_summary_errors_msg">Помилки</string>
     <string name="export_with_photos">з фото</string>
     <string name="export_without_photos">без</string>
-    <string name="export_track_already_exists_msg">Трек %1$s вже існує в цільовій директорії.</string>
+    <string name="export_track_already_exists_msg">Файл %1$s вже існує в цільовій директорії.</string>
     <string name="export_all_do_it_for_all">робити це для усіх конфліктів</string>
-    <string name="export_track_errors">Треки не експортовано</string>
+    <string name="export_track_errors">Файли не експортовано</string>
     <string name="generic_overwrite">Перезаписати</string>
     <string name="generic_skip">Пропустити</string>
     <string name="generic_show_errors">Показати помилки</string>
@@ -482,7 +482,7 @@ limitations under the License.
     <string name="settings_import_section">Імпорт</string>
     <string name="stats_sensors_power">Сила</string>
     <string name="stats_sensors_cadence">Каденція</string>
-    <string name="stats_sensors_heart_rate">частота серцебиття</string>
+    <string name="stats_sensors_heart_rate">Частота серцебиття</string>
     <string name="settings_defaults_summary">Переважні одиниці виміру, активність за замовчуванням, Ім\'я треку за замовчуванням</string>
     <string name="settings_open_tracks_summary">Все про проект OpenTracks</string>
     <string name="settings_defaults_title">Одиниці виміру і дії за замовчуванням</string>
@@ -518,4 +518,63 @@ limitations under the License.
     <string name="activity_type_workout">тренування</string>
     <string name="activity_type_swimming_open">плавання у відкритих водоймах</string>
     <string name="activity_type_swimming">плавання</string>
+    <string name="generic_dismiss">Відхилити</string>
+    <string name="settings_export_filename_title">Формат імені файлу</string>
+    <string name="description_pace_nautical">Темп (хв/мм)</string>
+    <string name="gps_recording_status">%1$s: %2$s</string>
+    <string name="description_speed_nautical">Швидкість (вузли)</string>
+    <string name="image_discard">Скасувати</string>
+    <string name="sensor_state_cadence_unit">об/хв</string>
+    <string name="sensor_state_heart_rate_unit">уд/хв</string>
+    <string name="sensor_state_power_unit">Вт</string>
+    <string name="settings_recording_min_required_accuracy_summary">Місцезнаходження ігнорується, якщо його точність перевищує %1$s</string>
+    <string name="settings_announcements_average_heart_rate">Середній пульс</string>
+    <string name="settings_announcements_lap_heart_rate">Пульс за коло</string>
+    <string name="settings_announcements_average_speed_pace">Середня швидкість/темп</string>
+    <string name="gps_recording_without_signal">OpenTracks записує без даних GPS.</string>
+    <string name="settings_announcements_lap_speed_pace">Швидкість/темп за коло</string>
+    <string name="settings_sensor_bluetooth_service_filter_title">Фільтрувати пристрої Bluetooth</string>
+    <string name="settings_sensor_bluetooth_service_filter_off">Показати всі видимі пристрої Bluetooth</string>
+    <string name="menu_export_all_one_file">Експортувати все (один файл для всіх треків)</string>
+    <string name="settings_stats_units_imperial_meter">Британська (милі, метри)</string>
+    <string name="settings_api_title">Публічний API</string>
+    <string name="settings_public_api_dashboard_enabled_summary_off">Записані дані не будуть автоматично передаватись іншим програмам.</string>
+    <string name="settings_public_api_package_title">Назва пакета для публічного API</string>
+    <string name="settings_public_api_dashboard_enabled_summary_on">Програма, яка почала запис, також може отримати доступ до записаних даних.</string>
+    <string name="unit_nautical_mile">Морські милі</string>
+    <string name="settings_public_api_enabled_summary_on">Інші встановлені програми можуть запускати або зупиняти записи.</string>
+    <string name="settings_public_api_enabled_summary_off">Тільки OpenTracks може запускати та зупиняти записи.</string>
+    <string name="track_delete_number_of_tracks">%1$d треків</string>
+    <string name="settings_public_api_dashboard_enabled_title">Автоматична передача даних</string>
+    <string name="settings_public_api_enabled_title">Публічний API</string>
+    <string name="settings_public_api_disabled_toast">Публічний API OpenTracks вимкнено: його можна ввімкнути в налаштуваннях.</string>
+    <string name="track_discarding">Скасування Доріжки</string>
+    <string name="unit_knots">вузли</string>
+    <string name="settings_sensor_heart_rate_max">Зони: максимальна частота серцевих скорочень (уд/хв)</string>
+    <string name="settings_stats_units_nautical">Морська (морські милі, фут)</string>
+    <string name="settings_api_summary">API дистанційного керування та статистики для інших програм</string>
+    <string name="voice_per_kilometer">за кілометр</string>
+    <string name="pace">Темп</string>
+    <string name="lap_speed">Швидкість за коло</string>
+    <string name="speed">Середня швидкість руху</string>
+    <string name="average_heart_rate">Середній пульс</string>
+    <string name="voice_per_mile">за милю</string>
+    <string name="voice_on_device_speaker_title">Використовувати динамік пристрою</string>
+    <string name="lap_time">Час за коло</string>
+    <string name="unit_minute_per_nautical_mile">хв/морська миля</string>
+    <string name="no_compatible_camera_installed">Не встановлено сумісну програму камери</string>
+    <string name="no_compatible_gallery_installed">Не встановлено сумісну програму галереї зображень</string>
+    <string name="report_bug">Повідомити про помилку</string>
+    <string name="select_show_on_map_behavior">Виберіть поведінку \"показати на карті\"</string>
+    <string name="show_on_map_format_ask">Запитувати</string>
+    <string name="voice_per_nautical_mile">за морську милю</string>
+    <string name="always">Завжди</string>
+    <string name="value_integer_knots">%1$d вузлів</string>
+    <string name="value_float_knots">%1$.1f вузлів</string>
+    <string name="total_distance">Загальна відстань</string>
+    <string name="current_heart_rate">Поточний пульс</string>
+    <string name="show_on_dashboard">OpenTracks Dashboard API</string>
+    <string name="introduction_osm_dashboard">Сам OpenTracks не надає карти. Установіть OSMDashboard, щоб переглядати свої записи на карті.</string>
+    <string name="show_on_dashboard_not_installed">Не встановлено програму, що підтримує OpenTracks Dashboard API.</string>
+    <string name="value_float_knots_recommended">%1$.1f вузлів (рекомендовано)</string>
 </resources>

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

@@ -623,4 +623,5 @@ limitations under the License.
     <string name="sensor_state_heart_rate_unit">bpm</string>
     <string name="sensor_state_power_unit">瓦</string>
     <string name="settings_sensor_bluetooth_service_filter_off">显示所有可发现的蓝牙设备</string>
+    <string name="help_data_google_play_services_content">否</string>
 </resources>