Cleanup: ContentProviderUtils.getMarkerCursor() has an optional parameter.

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

@@ -255,7 +255,7 @@ public class ContentProviderUtils {
      * @param selectionArgs the selection arguments. Can be null
      * @param sortOrder     the sort order. Can be null
      */
-    public Cursor getTrackCursor(String selection, String[] selectionArgs, String sortOrder) {
+    Cursor getTrackCursor(String selection, String[] selectionArgs, String sortOrder) {
         return contentResolver.query(TracksColumns.CONTENT_URI, null, selection, selectionArgs, sortOrder);
     }
 
@@ -322,6 +322,7 @@ public class ContentProviderUtils {
         return values;
     }
 
+    //TODO Align with fillTrackPoint
     public Marker createMarker(Cursor cursor) {
         int idIndex = cursor.getColumnIndexOrThrow(MarkerColumns._ID);
         int nameIndex = cursor.getColumnIndexOrThrow(MarkerColumns.NAME);
@@ -430,6 +431,10 @@ public class ContentProviderUtils {
         return null;
     }
 
+    public Cursor getMarkerCursor(@NonNull Track.Id trackId) {
+        return getMarkerCursor(trackId, -1);
+    }
+
     /**
      * The caller owns the returned cursor and is responsible for closing it.
      *
@@ -450,7 +455,7 @@ public class ContentProviderUtils {
     @VisibleForTesting
     public List<Marker> getMarkers(Track.Id trackId) {
         ArrayList<Marker> markers = new ArrayList<>();
-        try (Cursor cursor = getMarkerCursor(trackId, -1)) {
+        try (Cursor cursor = getMarkerCursor(trackId)) {
             if (cursor.moveToFirst()) {
                 do {
                     markers.add(createMarker(cursor));

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(), -1)) {
+        try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId())) {
             if (cursor != null && cursor.moveToFirst()) {
                 for (int i = 0; i < cursor.getCount(); i++) {
                     if (Thread.interrupted()) {

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(), -1)) {
+        try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId())) {
             if (cursor != null && cursor.moveToFirst()) {
                 for (int i = 0; i < cursor.getCount(); i++) {
                     if (Thread.interrupted()) {

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<Track> tracks, ZipOutputStream zipOutputStream) throws InterruptedException, IOException {
         for (Track track : tracks) {
-            try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId(), -1)) {
+            try (Cursor cursor = contentProviderUtils.getMarkerCursor(track.getId())) {
                 if (cursor != null && cursor.moveToFirst()) {
                     for (int i = 0; i < cursor.getCount(); i++) {
                         if (Thread.interrupted()) {

src/main/java/de/dennisguse/opentracks/io/file/importer/KMZTrackImporter.java

@@ -17,6 +17,7 @@
 package de.dennisguse.opentracks.io.file.importer;
 
 import android.content.Context;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Log;

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(), -1);
+        cursor = contentProviderUtils.getMarkerCursor(marker.getTrackId());
         if (cursor == null) {
             finish();
         }