Release: v4.24.1

Fixes https://codeberg.org/OpenTracksApp/OSMDashboard/issues/552

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.1'
+        classpath 'com.android.tools.build:gradle:8.13.2'
     }
 }
 
@@ -46,8 +46,8 @@ android {
 
     defaultConfig {
         applicationId 'de.dennisguse.opentracks'
-        versionCode 6508
+        versionCode 6513
-        versionName "v4.24.0"
+        versionName "v4.24.1"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -170,7 +170,7 @@ dependencies {
     androidTestImplementation 'androidx.test:rules:1.7.0'
     androidTestImplementation 'androidx.test:runner:1.7.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
-    androidTestImplementation 'org.mockito:mockito-android:5.20.0'
+    androidTestImplementation 'org.mockito:mockito-android:5.21.0'
 
     androidTestUtil 'androidx.test:orchestrator:1.6.1'
 }

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

@@ -0,0 +1,6 @@
+v4.24.1: OpenTracks
+
+Bugfix:
+- Restore compatibility with OSM Dashboard v6.4.1 and earlier (introduced in v4.24.0) 
+- Crash when using default track name by number (introduced in v4.24.0)
+

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

@@ -278,7 +278,7 @@ public class CustomContentProvider extends ContentProvider {
                 queryBuilder.appendWhere(MarkerColumns._ID + "=" + ContentUris.parseId(url));
             }
             case MARKERS_BY_TRACKID -> {
-                queryBuilder.setTables(MarkerColumns.TABLE_NAME);
+                queryBuilder.setTables(MarkerColumns.TABLE_NAME + " LEFT OUTER JOIN (SELECT 'unused' AS ICON)"); //TODO Workaround: Column icon was removed in v4.24.0, but is still required for OSM Dashboard v6.4.1.
                 queryBuilder.appendWhere(MarkerColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
             }
             default -> throw new IllegalArgumentException("Unknown url " + url);

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

@@ -75,18 +75,25 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
 
         Statistics initialStatistics = trackStatisticsUpdater.getTrackStatistics();
         String activityTypeLocalized = PreferencesUtils.getDefaultActivityTypeLocalized();
-        Track track = new Track(
+
-                null,
+        trackId = contentProviderUtils.insertTrack(
-                UUID.randomUUID(), //TODO This is not really cool: should happen in ContentProviderUtils?
+                new Track(
-                TrackNameUtils.getTrackName(context, trackId, initialStatistics.startTime().atOffset(zoneOffset)),
+                        null,
-                "",
+                        UUID.randomUUID(), //TODO This is not really cool: should happen in ContentProviderUtils?
-                activityTypeLocalized,
+                        "",
-                ActivityType.findByLocalizedString(context, activityTypeLocalized),
+                        "",
-                zoneOffset,
+                        activityTypeLocalized,
-                initialStatistics
+                        ActivityType.findByLocalizedString(context, activityTypeLocalized),
+                        zoneOffset,
+                        initialStatistics
+                )
         );
 
-        trackId = contentProviderUtils.insertTrack(track);
+        //TODO Move this into ContentProviderUtils?
+        // Generating the name requires already the track.id (generated by the database).
+        TrackBuilder track = new TrackBuilder(contentProviderUtils.getTrack(trackId));
+        track.setName(TrackNameUtils.getTrackName(context, trackId, initialStatistics.startTime().atOffset(zoneOffset)));
+        contentProviderUtils.updateTrack(track.getTrack());
 
         onNewTrackPoint(segmentStartTrackPoint);