Merge pull request #232 from xsaco07/fix_gpx_filename

Fix gpx filename

Author: EmmanuelAB

app/src/main/java/net/osmtracker/activity/TrackDetailEditor.java

@@ -1,18 +1,22 @@
 package net.osmtracker.activity;
 
-import net.osmtracker.R;
-import net.osmtracker.db.TrackContentProvider;
-import net.osmtracker.db.model.Track;
-
 import android.app.Activity;
 import android.content.ContentUris;
 import android.content.ContentValues;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.Spinner;
 
+import net.osmtracker.R;
+import net.osmtracker.db.DataHelper;
+import net.osmtracker.db.TrackContentProvider;
+import net.osmtracker.db.model.Track;
+
+import java.util.Date;
+
 /**
  * Base class for activities that edit track details.
  *
@@ -86,11 +90,32 @@ protected boolean save() {
 
 		Uri trackUri = ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK, trackId);
 		ContentValues values = new ContentValues();
-		
+
+		Cursor cursor = getContentResolver().query(trackUri, null, null,
+				null, null);
+
+		long startDateLong = 0;
+		String tname = "";
+		if (cursor != null && cursor.moveToFirst()) {
+			startDateLong = cursor.getLong(cursor.getColumnIndex(TrackContentProvider.Schema.COL_START_DATE));
+			tname = cursor.getString(cursor.getColumnIndex(TrackContentProvider.Schema.COL_NAME));
+			cursor.close();
+		}
+
+		// Saved track startDate
+		Date startDate = new Date(startDateLong);
+
 		// Save name field, if changed, to db.
 		// String class required for equals to work, and for trim().
 		String enteredName = etName.getText().toString().trim();
-		if ((enteredName.length() > 0)) {
+
+		// Get default track name
+        String defaultDate = DataHelper.FILENAME_FORMATTER.format(startDate);
+
+        // If no changes were made don't append the date
+		if ((enteredName.length() > 0 && !enteredName.equals(tname))) {
+			// Append date to avoid duplicated tracks names
+			enteredName += "_" + defaultDate;
 			values.put(TrackContentProvider.Schema.COL_NAME, enteredName);
 		}
 

app/src/main/java/net/osmtracker/activity/TrackManager.java

@@ -38,7 +38,6 @@
 
 import java.io.File;
 import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -523,7 +522,6 @@ private long createNewTrack() throws CreateTrackException {
 
 		// Create entry in TRACK table
 		ContentValues values = new ContentValues();
-		//values.put(TrackContentProvider.Schema.COL_NAME, DATE_FORMAT.format(new Date(startDate.getTime())));
         values.put(TrackContentProvider.Schema.COL_NAME, DataHelper.FILENAME_FORMATTER.format(new Date()));
         values.put(TrackContentProvider.Schema.COL_START_DATE, startDate.getTime());
 		values.put(TrackContentProvider.Schema.COL_ACTIVE, TrackContentProvider.Schema.VAL_TRACK_ACTIVE);

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

@@ -9,7 +9,6 @@
 
 import net.osmtracker.OSMTracker;
 import net.osmtracker.R;
-import net.osmtracker.db.DataHelper;
 import net.osmtracker.db.TrackContentProvider;
 import net.osmtracker.exception.ExportTrackException;
 
@@ -49,8 +48,6 @@ protected File getExportDirectory(Date startDate) throws ExportTrackException {
 
 		if (directoryPerTrack) {
 
-			// At least use the start date as the folder name
-			String trackIsoDate =  DataHelper.FILENAME_FORMATTER.format(startDate);
 			String trackName = "";
 
 			// Get the name of the track with the received start date
@@ -59,17 +56,15 @@ protected File getExportDirectory(Date startDate) throws ExportTrackException {
 
 			Cursor c = context.getContentResolver().query(
 					TrackContentProvider.CONTENT_URI_TRACK, null, selection, args, null);
-
+			
 			if(c != null && c.moveToFirst()){
 				int i = c.getColumnIndex(TrackContentProvider.Schema.COL_NAME);
 				trackName = c.getString(i);
 			}
 			if(trackName != null && trackName.length() >= 1) {
 				trackName = trackName.replace("/", "_");
-				perTrackDirectory = File.separator + trackName.trim() + "_" + trackIsoDate;
+				perTrackDirectory = File.separator + trackName.trim();
 			}
-			else
-				perTrackDirectory = File.separator + trackIsoDate;
 
 		}
 

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

@@ -234,7 +234,6 @@ private void exportTrackAsGpx(long trackId) throws ExportTrackException {
 
 				File trackFile = new File(trackGPXExportDirectory, filenameBase);
 
-
 				Cursor cTrackPoints = cr.query(TrackContentProvider.trackPointsUri(trackId), null,
 						null, null, TrackContentProvider.Schema.COL_TIMESTAMP + " asc");
 				Cursor cWayPoints = cr.query(TrackContentProvider.waypointsUri(trackId), null, null,
@@ -539,25 +538,21 @@ protected String buildGPXFilename(Cursor c) {
 		final String filenameOutput = PreferenceManager.getDefaultSharedPreferences(context).getString(
 				OSMTracker.Preferences.KEY_OUTPUT_FILENAME,
 				OSMTracker.Preferences.VAL_OUTPUT_FILENAME);
-		StringBuffer filenameBase = new StringBuffer();
+
+		StringBuilder filenameBase = new StringBuilder();
 		final int colName = c.getColumnIndexOrThrow(TrackContentProvider.Schema.COL_NAME);
+
+		String tname = c.getString(colName);
+
 		if ((! c.isNull(colName))
-			&& (! filenameOutput.equals(OSMTracker.Preferences.VAL_OUTPUT_FILENAME_DATE)))
-		{
-			final String tname_raw =
-				c.getString(colName).trim().replace(':', ';');
-			final String sanitized =
-				FILENAME_CHARS_BLACKLIST_PATTERN.matcher(tname_raw).replaceAll("_");
+			&& (! filenameOutput.equals(OSMTracker.Preferences.VAL_OUTPUT_FILENAME_DATE))) {
+
+			final String tname_raw = tname.trim().replace(':', ';');
+			final String sanitized = FILENAME_CHARS_BLACKLIST_PATTERN.matcher(tname_raw).replaceAll("_");
+
 			filenameBase.append(sanitized);
 		}
-		if ((filenameBase.length() == 0)
-			|| ! filenameOutput.equals(OSMTracker.Preferences.VAL_OUTPUT_FILENAME_NAME))
-		{
-			final long startDate = c.getLong(c.getColumnIndex(TrackContentProvider.Schema.COL_START_DATE));
-			if (filenameBase.length() > 0)
-				filenameBase.append('_');
-			filenameBase.append(DataHelper.FILENAME_FORMATTER.format(new Date(startDate)));
-		}
+
 		filenameBase.append(DataHelper.EXTENSION_GPX);
 		return filenameBase.toString();
 	}