Refactor: Move segment ID database logic from GPSLogger to DataHelper

Author: jamescr

app/src/main/java/net/osmtracker/db/DataHelper.java

@@ -17,6 +17,8 @@
 import net.osmtracker.db.model.TrackPoint;
 import net.osmtracker.db.model.WayPoint;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -408,6 +410,24 @@ public static long getActiveTrackId(ContentResolver cr) {
 		return currentTrackId;
 	}
 
+	/**
+	 * Find the segment ID for a track
+	 * @param trackId Id of the track
+	 * @param cr  {@link ContentResolver} for query
+	 * @return  the segment ID for the track, or 0 if not found
+	 */
+	public static long getSegmentIdFor(long trackId, @NotNull ContentResolver cr) {
+		Cursor ca = cr.query(ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK,
+						trackId),null, null, null, null);
+
+		if (! ca.moveToFirst())	{
+			Log.v(TAG, "Track " + trackId + " not found");
+			return 0;  // <--- Early return ---
+		}
+
+		return Track.build(trackId, ca, cr, true).getMaxSegId();
+	}
+
 	/**
 	 * Change the name of this track.
 	 * @param trackId Id of the track

app/src/main/java/net/osmtracker/gpx/ExportTrackTask.java

@@ -351,6 +351,7 @@ protected void writeTrackPoints(String trackName, Writer fw, Cursor c, boolean f
 		int prevSegId=-1;
 		for(c.moveToFirst(); !c.isAfterLast(); c.moveToNext(),i++) {
 			StringBuffer out = new StringBuffer();
+
 			int segId = c.getInt(c.getColumnIndex(TrackContentProvider.Schema.COL_SEG_ID));
 			if(prevSegId != -1 && segId != prevSegId) {
 				fw.write("\t\t" + "</trkseg>" + "\n");
@@ -634,4 +635,4 @@ public String sanitizeTrackName(String trackName){
 	public String getErrorMsg() {
 		return errorMsg;
 	}
-}
+}

app/src/main/java/net/osmtracker/service/gps/GPSLogger.java

@@ -6,8 +6,6 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
-import android.content.ContentResolver;
-import android.content.ContentUris;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -26,14 +24,11 @@
 import androidx.core.content.ContextCompat;
 import androidx.preference.PreferenceManager;
 
-import android.database.Cursor;
-
 import net.osmtracker.OSMTracker;
 import net.osmtracker.R;
 import net.osmtracker.activity.TrackLogger;
 import net.osmtracker.db.DataHelper;
 import net.osmtracker.db.TrackContentProvider;
-import net.osmtracker.db.model.Track;
 import net.osmtracker.listener.PressureListener;
 import net.osmtracker.listener.SensorListener;
 
@@ -114,7 +109,6 @@ public class GPSLogger extends Service implements LocationListener {
 	 */
 	private PressureListener pressureListener = new PressureListener();
 
-
 	/**
 	 * Receives Intent for way point and notes tracking, and stop/start logging.
 	 */
@@ -324,31 +318,13 @@ public void onDestroy() {
 		super.onDestroy();
 	}
 
-	private long getSegIdFor(long trackId) {
-		ContentResolver cr = getContentResolver();
-		try(Cursor cursor =
-		    cr.query(ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK, trackId),
-			     null, null, null, null)) {
-
-			if (! cursor.moveToFirst())	{
-				Log.v(TAG, "Track "+trackId+" not found");
-				return 0;  // <--- Early return ---
-			}
-
-			return Track
-				.build(trackId, cursor, cr, true)
-				.getMaxSegId();
-		}
-	}
-
 	/**
 	 * Start GPS tracking.
 	 */
 	private void startTracking(long trackId) {
 		currentTrackId = trackId;
-		currentSegmentId = getSegIdFor(trackId)+1;
-		Log.v(TAG, "Starting track logging for track #" + trackId +
-		      "/" + currentSegmentId);
+		currentSegmentId = DataHelper.getSegmentIdFor(trackId, getContentResolver()) + 1;
+		Log.v(TAG, "Starting track logging for track #" + trackId + " segment #" +"/" + currentSegmentId);
 		// Refresh notification with correct Track ID
 		NotificationManager nmgr = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 		nmgr.notify(NOTIFICATION_ID, getNotification());