forked from upstream-mirrors/OpenTracks
Changed the default new track name from "track %d" to "date time", where "date"
is a short, locale-aware version of the track's start date, and "time" is the track's start time.
This commit is contained in:
@@ -51,8 +51,10 @@ import android.os.Handler;
|
|||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
import android.os.PowerManager;
|
import android.os.PowerManager;
|
||||||
import android.os.PowerManager.WakeLock;
|
import android.os.PowerManager.WakeLock;
|
||||||
|
import android.text.format.DateFormat;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
import java.util.Timer;
|
import java.util.Timer;
|
||||||
import java.util.TimerTask;
|
import java.util.TimerTask;
|
||||||
|
|
||||||
@@ -951,17 +953,18 @@ public class TrackRecordingService extends Service implements LocationListener {
|
|||||||
|
|
||||||
public long startNewTrack() {
|
public long startNewTrack() {
|
||||||
Log.d(MyTracksConstants.TAG, "TrackRecordingService.startNewTrack");
|
Log.d(MyTracksConstants.TAG, "TrackRecordingService.startNewTrack");
|
||||||
|
long startTime = System.currentTimeMillis();
|
||||||
|
|
||||||
Track track = new Track();
|
Track track = new Track();
|
||||||
TripStatistics trackStats = track.getStatistics();
|
TripStatistics trackStats = track.getStatistics();
|
||||||
track.setName("new");
|
|
||||||
long startTime = System.currentTimeMillis();
|
|
||||||
trackStats.setStartTime(startTime);
|
trackStats.setStartTime(startTime);
|
||||||
track.setStartId(-1);
|
track.setStartId(-1);
|
||||||
Uri trackUri = providerUtils.insertTrack(track);
|
Uri trackUri = providerUtils.insertTrack(track);
|
||||||
recordingTrackId = Long.parseLong(trackUri.getLastPathSegment());
|
recordingTrackId = Long.parseLong(trackUri.getLastPathSegment());
|
||||||
track.setId(recordingTrackId);
|
track.setId(recordingTrackId);
|
||||||
track.setName(String.format(getString(R.string.new_track), recordingTrackId));
|
track.setName(getNewTrackName(this, recordingTrackId, startTime));
|
||||||
providerUtils.updateTrack(track);
|
providerUtils.updateTrack(track);
|
||||||
|
|
||||||
currentWaypointId = insertStatisticsMarker(null);
|
currentWaypointId = insertStatisticsMarker(null);
|
||||||
isRecording = true;
|
isRecording = true;
|
||||||
isMoving = true;
|
isMoving = true;
|
||||||
@@ -980,6 +983,14 @@ public class TrackRecordingService extends Service implements LocationListener {
|
|||||||
return recordingTrackId;
|
return recordingTrackId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String getNewTrackName(Context context, long trackId,
|
||||||
|
long startTime) {
|
||||||
|
Date startDate = new Date(startTime);
|
||||||
|
return String.format("%s %s",
|
||||||
|
DateFormat.getDateFormat(context).format(startDate),
|
||||||
|
DateFormat.getTimeFormat(context).format(startDate));
|
||||||
|
}
|
||||||
|
|
||||||
TripStatistics getTripStatistics() {
|
TripStatistics getTripStatistics() {
|
||||||
return statsBuilder.getStatistics();
|
return statsBuilder.getStatistics();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user