From 8258d607c3c9d9371c8d7a12c50a9063d84d1455 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 26 Nov 2025 19:56:32 +0100 Subject: [PATCH] Cleanup: ContentProviderUtils.getMarkerCursor() had an unused parameter. --- .../opentracks/data/ContentProviderUtils.java | 21 +++++++------------ .../opentracks/data/TrackDataHub.java | 2 +- .../io/file/exporter/GPXTrackExporter.java | 2 +- .../io/file/exporter/KMLTrackExporter.java | 2 +- .../io/file/exporter/KMZTrackExporter.java | 2 +- .../ui/markers/MarkerDetailActivity.java | 2 +- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java index 43bb39fab..0b0cfd3b0 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java @@ -25,7 +25,6 @@ import android.net.Uri; import android.text.TextUtils; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import java.io.File; @@ -434,20 +433,16 @@ public class ContentProviderUtils { /** * The caller owns the returned cursor and is responsible for closing it. * - * @param trackId the track id - * @param minMarkerId the minimum marker id. null to ignore - * @param maxCount the maximum number of markers to return. -1 for no limit + * @param trackId the track id + * @param maxCount the maximum number of markers to return. -1 for no limit */ - public Cursor getMarkerCursor(@NonNull Track.Id trackId, @Nullable Marker.Id minMarkerId, int maxCount) { + public Cursor getMarkerCursor(@NonNull Track.Id trackId, int maxCount) { String selection; String[] selectionArgs; - if (minMarkerId != null) { - selection = MarkerColumns.TRACKID + "=? AND " + MarkerColumns._ID + ">=?"; - selectionArgs = new String[]{Long.toString(trackId.id()), Long.toString(minMarkerId.id())}; - } else { - selection = MarkerColumns.TRACKID + "=?"; - selectionArgs = new String[]{Long.toString(trackId.id())}; - } + + selection = MarkerColumns.TRACKID + "=?"; + selectionArgs = new String[]{Long.toString(trackId.id())}; + return getMarkerCursor(null, selection, selectionArgs, MarkerColumns._ID, maxCount); } @@ -455,7 +450,7 @@ public class ContentProviderUtils { @VisibleForTesting public List getMarkers(Track.Id trackId) { ArrayList markers = new ArrayList<>(); - try (Cursor cursor = getMarkerCursor(trackId, null, -1)) { + try (Cursor cursor = getMarkerCursor(trackId, -1)) { if (cursor.moveToFirst()) { do { markers.add(createMarker(cursor)); diff --git a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java index e289be1b4..8bef4195b 100644 --- a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java @@ -276,7 +276,7 @@ public class TrackDataHub { trackDataListener.clearMarkers(); } - try (Cursor cursor = contentProviderUtils.getMarkerCursor(selectedTrackId, null, MAX_DISPLAYED_MARKERS)) { + try (Cursor cursor = contentProviderUtils.getMarkerCursor(selectedTrackId, MAX_DISPLAYED_MARKERS)) { if (cursor != null && cursor.moveToFirst()) { do { Marker marker = contentProviderUtils.createMarker(cursor); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java index 7e1a4ca93..c74a2a7db 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java @@ -238,7 +238,7 @@ public class GPXTrackExporter implements TrackExporter { } private void writeMarkers(Track track) throws InterruptedException { - try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId(), null, -1)) { + try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId(), -1)) { if (cursor != null && cursor.moveToFirst()) { for (int i = 0; i < cursor.getCount(); i++) { if (Thread.interrupted()) { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java index 8c8d783df..df48289e7 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java @@ -136,7 +136,7 @@ public class KMLTrackExporter implements TrackExporter { private void writeMarkers(Track track) throws InterruptedException { boolean hasMarkers = false; - try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId(), null, -1)) { + try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId(), -1)) { if (cursor != null && cursor.moveToFirst()) { for (int i = 0; i < cursor.getCount(); i++) { if (Thread.interrupted()) { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMZTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMZTrackExporter.java index 388480882..debe6800d 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMZTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMZTrackExporter.java @@ -89,7 +89,7 @@ public class KMZTrackExporter implements TrackExporter { private void addImages(Context context, List tracks, ZipOutputStream zipOutputStream) throws InterruptedException, IOException { for (Track track : tracks) { - try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId(), null, -1)) { + try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId(), -1)) { if (cursor != null && cursor.moveToFirst()) { for (int i = 0; i < cursor.getCount(); i++) { if (Thread.interrupted()) { diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java index bfbded0a6..d281b8b66 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java @@ -68,7 +68,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark Marker marker = contentProviderUtils.getMarker(markerId); //TODO only load used data: ID + name - cursor = contentProviderUtils.getMarkerCursor(marker.getTrackId(), null, -1); + cursor = contentProviderUtils.getMarkerCursor(marker.getTrackId(), -1); if (cursor == null) { finish(); }