Rollback Export Track refactor

labexp · Mar 8, 2021 · 473fa4c · 473fa4c
1 parent 6cfec98
commit 473fa4c
Show file tree

Hide file tree

Showing 4 changed files with 240 additions and 413 deletions.
diff --git a/app/src/main/java/net/osmtracker/db/DataHelper.java b/app/src/main/java/net/osmtracker/db/DataHelper.java
@@ -309,12 +309,13 @@ public static void setTrackName(long trackId, String name, ContentResolver cr) {
 	 * Mark the export date/time of this track.
 	 * @param trackId Id of the track
 	 * @param exportTime Time of export, from {@link System#currentTimeMillis()}
+	 * @param cr {@link ContentResolver} for query
 	 */
-	public void setTrackExportDate(long trackId, long exportTime) {
+	public static void setTrackExportDate(long trackId, long exportTime, ContentResolver cr) {
 		Uri trackUri = ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK, trackId);
 		ContentValues values = new ContentValues();
 		values.put(TrackContentProvider.Schema.COL_EXPORT_DATE, exportTime);
-		contentResolver.update(trackUri, values, null, null);
+		cr.update(trackUri, values, null, null);
 	}
 
 	public static void setTrackUploadDate(long trackId, long uploadTime, ContentResolver cr) {

diff --git a/app/src/main/java/net/osmtracker/gpx/ExportToTempFileTask.java b/app/src/main/java/net/osmtracker/gpx/ExportToTempFileTask.java
@@ -1,9 +1,9 @@
 package net.osmtracker.gpx;
 
 import android.content.Context;
+import android.database.Cursor;
 import android.util.Log;
 
-import net.osmtracker.db.model.Track;
 import net.osmtracker.exception.ExportTrackException;
 
 import java.io.File;
@@ -38,8 +38,9 @@ protected File getExportDirectory(Date startDate) throws ExportTrackException {
 		return tmpFile.getParentFile();
 	}
 
-	public String buildGPXFilename(Track track, File parentDirectory) {
-		filename = super.buildGPXFilename(track, parentDirectory);
+	@Override
+	public String buildGPXFilename(Cursor c, File parentDirectory) {
+		filename = super.buildGPXFilename(c, parentDirectory);
 		return tmpFile.getName();
 	}