Cleanup: removed descending iterator for TrackPoints.

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

@@ -364,7 +364,7 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
         int samplingFrequency = -1;
         boolean includeNextPoint = false;
 
-        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, localLastSeenTrackPointIdId + 1, false)) {
+        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, localLastSeenTrackPointIdId + 1)) {
 
             while (trackPointIterator.hasNext()) {
                 TrackPoint trackPoint = trackPointIterator.next();

src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java

@@ -680,27 +680,22 @@ public class ContentProviderUtils {
      * Creates a location cursor. The caller owns the returned cursor and is responsible for closing it.
      *
      * @param trackId           the track id
-     * @param startTrackPointId the starting trackPoint id. -1L to ignore
-     * @param maxLocations      maximum number of locations to return. -1 for no limit
-     * @param descending        true to sort the result in descending order (latest location first)
+     * @param startTrackPointId the starting trackPoint id. `null` to ignore
+     * @param maxLocations      maximum number of locations to return. `null` for no limit
      */
-    public Cursor getTrackPointCursor(Track.Id trackId, long startTrackPointId, int maxLocations, boolean descending) {
+    public Cursor getTrackPointCursor(Track.Id trackId, Long startTrackPointId, Integer maxLocations) {
         String selection;
         String[] selectionArgs;
-        if (startTrackPointId >= 0) {
-            String comparison = descending ? "<=" : ">=";
-            selection = TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns._ID + comparison + "?";
+        if (startTrackPointId != null) {
+            selection = TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns._ID + ">=?";
             selectionArgs = new String[]{Long.toString(trackId.getId()), Long.toString(startTrackPointId)};
         } else {
             selection = TrackPointsColumns.TRACKID + "=?";
             selectionArgs = new String[]{Long.toString(trackId.getId())};
         }
 
-        String sortOrder = TrackPointsColumns._ID;
-        if (descending) {
-            sortOrder += " DESC";
-        }
-        if (maxLocations >= 0) {
+        String sortOrder = TrackPointsColumns.DEFAULT_SORT_ORDER;
+        if (maxLocations != null) {
             sortOrder += " LIMIT " + maxLocations;
         }
         return getTrackPointCursor(null, selection, selectionArgs, sortOrder);
@@ -784,11 +779,10 @@ public class ContentProviderUtils {
      * When done with iteration, {@link TrackPointIterator#close()} must be called.
      *
      * @param trackId           the track id
-     * @param startTrackPointId the starting trackPoint id. -1L to ignore
-     * @param descending        true to sort the result in descending order (latest location first)
+     * @param startTrackPointId the starting trackPoint id. `null` to ignore
      */
-    public TrackPointIterator getTrackPointLocationIterator(final Track.Id trackId, final long startTrackPointId, final boolean descending) {
-        return new TrackPointIterator(this, trackId, startTrackPointId, descending);
+    public TrackPointIterator getTrackPointLocationIterator(final Track.Id trackId, final Long startTrackPointId) {
+        return new TrackPointIterator(this, trackId, startTrackPointId);
     }
 
     private TrackPoint findTrackPointBy(String selection, String[] selectionArgs) {
@@ -816,7 +810,7 @@ public class ContentProviderUtils {
     public List<TrackPoint> getTrackPoints(Track.Id trackId) {
         List<TrackPoint> trackPoints = null;
 
-        try (Cursor trackPointCursor = getTrackPointCursor(trackId, -1L, -1, false)) {
+        try (Cursor trackPointCursor = getTrackPointCursor(trackId, -1L, -1)) {
             if (trackPointCursor != null) {
                 trackPointCursor.moveToFirst();
                 trackPoints = new ArrayList<>(trackPointCursor.getCount());

src/main/java/de/dennisguse/opentracks/content/provider/TrackPointIterator.java

@@ -18,16 +18,14 @@ public class TrackPointIterator implements Iterator<TrackPoint>, AutoCloseable {
 
     private final ContentProviderUtils contentProviderUtils;
     private final Track.Id trackId;
-    private final boolean descending;
     private final CachedTrackPointsIndexes indexes;
     private long lastTrackPointId = -1L;
     private Cursor cursor;
 
 
-    public TrackPointIterator(ContentProviderUtils contentProviderUtils, Track.Id trackId, long startTrackPointId, boolean descending) {
+    public TrackPointIterator(ContentProviderUtils contentProviderUtils, Track.Id trackId, Long startTrackPointId) {
         this.contentProviderUtils = contentProviderUtils;
         this.trackId = trackId;
-        this.descending = descending;
 
         cursor = getCursor(startTrackPointId);
         indexes = cursor != null ? new CachedTrackPointsIndexes(cursor)
@@ -40,14 +38,14 @@ public class TrackPointIterator implements Iterator<TrackPoint>, AutoCloseable {
      * @param trackPointId the starting track point id
      */
     private Cursor getCursor(long trackPointId) {
-        return contentProviderUtils.getTrackPointCursor(trackId, trackPointId, contentProviderUtils.getDefaultCursorBatchSize(), descending);
+        return contentProviderUtils.getTrackPointCursor(trackId, trackPointId, contentProviderUtils.getDefaultCursorBatchSize());
     }
 
     /**
      * Advances the cursor to the next batch. Returns true if successful.
      */
     private boolean advanceCursorToNextBatch() {
-        long trackPointId = lastTrackPointId == -1L ? -1L : lastTrackPointId + (descending ? -1 : 1);
+        long trackPointId = lastTrackPointId == -1L ? -1L : lastTrackPointId + 1;
         Log.d(TAG, "Advancing track point id: " + trackPointId);
         cursor.close();
         cursor = getCursor(trackPointId);

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

@@ -126,7 +126,7 @@ public class FileTrackExporter implements TrackExporter {
         boolean isLastLocationValid = false;
         TrackPoint lastTrackPoint = null;
 
-        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false)) {
+        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L)) {
 
             while (trackPointIterator.hasNext()) {
                 if (Thread.interrupted()) {

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

@@ -16,7 +16,6 @@
 package de.dennisguse.opentracks.io.file.exporter;
 
 import android.content.Context;
-import android.database.Cursor;
 import android.location.Location;
 
 import java.io.OutputStream;
@@ -403,15 +402,12 @@ public class KmlTrackWriter implements TrackWriter {
         if (trackPointId == -1L) {
             return location.getBearing();
         }
-        TrackPoint viewLocation;
-        try (Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackPointId, 10, true)) {
-            if (cursor == null || cursor.getCount() == 0) {
-                return location.getBearing();
-            }
-            cursor.moveToPosition(cursor.getCount() - 1);
-            viewLocation = contentProviderUtils.createTrackPoint(cursor);
+        TrackPoint viewLocation = contentProviderUtils.getLastValidTrackPoint(trackId);
+        if (viewLocation != null) {
+            return viewLocation.bearingTo(location);
         }
-        return viewLocation.bearingTo(location);
+
+        return location.getBearing();
     }
 
     private String getCoordinates(Location location, String separator) {

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

@@ -160,7 +160,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
         // TODO Should not be necessary anymore?
         TrackStatisticsUpdater markerTrackStatisticsUpdater = new TrackStatisticsUpdater(track.getTrackStatistics().getStartTime_ms());
 
-        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false)) {
+        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L)) {
 
             while (true) {
                 if (marker == null) {

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

@@ -352,7 +352,7 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
 
         trackStatisticsUpdater = new TrackStatisticsUpdater(track.getTrackStatistics().getStartTime_ms());
 
-        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false)) {
+        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L)) {
             trackStatisticsUpdater.addTrackPoint(trackPointIterator, recordingDistanceInterval);
         } catch (RuntimeException e) {
             Log.e(TAG, "RuntimeException", e);