upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-14 23:03:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merging Bart's Polish fix.

Browse Source
This commit is contained in:
Rodrigo Damazio
2010-10-07 21:58:07 -03:00
parent 74a4089464 52d03e6b7d
commit ad0ee6b0d6
2 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java
+7 -2
View File
@@ -135,8 +135,13 @@ public class PreferenceManager {
MyTracksSettings.DEFAULT_AUTO_RESUME_TRACK_TIMEOUT)); MyTracksSettings.DEFAULT_AUTO_RESUME_TRACK_TIMEOUT));
} }
if (key == null || key.equals(recordingTrackKey)) { if (key == null || key.equals(recordingTrackKey)) {
service.setRecordingTrackId( long recordingTrackId = sharedPreferences.getLong(recordingTrackKey, -1);
sharedPreferences.getLong(recordingTrackKey, -1)); // Only read the id if it is valid.
// Setting it to -1 should only happen in
// TrackRecordingService.endCurrentTrack()
if (recordingTrackId > 0) {
service.setRecordingTrackId(recordingTrackId);
}
} }
if (key == null || key.equals(splitFrequencyKey)) { if (key == null || key.equals(splitFrequencyKey)) {
service.getSplitManager().setSplitFrequency( service.getSplitManager().setSplitFrequency(
MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+32 -29
View File
@@ -890,35 +890,7 @@ public class TrackRecordingService extends Service implements LocationListener {
@Override @Override
public long startNewTrack() { public long startNewTrack() {
Log.d(MyTracksConstants.TAG, "TrackRecordingService.startNewTrack"); return TrackRecordingService.this.startNewTrack();
Track track = new Track();
TripStatistics trackStats = track.getStatistics();
track.setName("new");
long startTime = System.currentTimeMillis();
trackStats.setStartTime(startTime);
track.setStartId(-1);
Uri trackUri = providerUtils.insertTrack(track);
long trackId = Long.parseLong(trackUri.getLastPathSegment());
track.setId(trackId);
track.setName(String.format(getString(R.string.new_track), trackId));
providerUtils.updateTrack(track);
recordingTrackId = trackId;
currentWaypointId = insertStatisticsMarker(null);
isRecording = true;
isMoving = true;
statsBuilder = new TripStatisticsBuilder();
statsBuilder.resumeAt(startTime);
setUpAnnouncer();
length = 0;
showNotification();
registerLocationListener();
splitManager.restore();
signalManager.restore();
// Reset the number of auto-resume retries.
SharedPreferences sharedPreferences =
getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
setAutoResumeTrackRetries(sharedPreferences, 0);
return trackId;
} }
/** /**
@@ -989,6 +961,37 @@ public class TrackRecordingService extends Service implements LocationListener {
} }
}; };
public long startNewTrack() {
Log.d(MyTracksConstants.TAG, "TrackRecordingService.startNewTrack");
Track track = new Track();
TripStatistics trackStats = track.getStatistics();
track.setName("new");
long startTime = System.currentTimeMillis();
trackStats.setStartTime(startTime);
track.setStartId(-1);
Uri trackUri = providerUtils.insertTrack(track);
recordingTrackId = Long.parseLong(trackUri.getLastPathSegment());
track.setId(recordingTrackId);
track.setName(String.format(getString(R.string.new_track), recordingTrackId));
providerUtils.updateTrack(track);
currentWaypointId = insertStatisticsMarker(null);
isRecording = true;
isMoving = true;
statsBuilder = new TripStatisticsBuilder();
statsBuilder.resumeAt(startTime);
setUpAnnouncer();
length = 0;
showNotification();
registerLocationListener();
splitManager.restore();
signalManager.restore();
// Reset the number of auto-resume retries.
SharedPreferences sharedPreferences =
getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
setAutoResumeTrackRetries(sharedPreferences, 0);
return recordingTrackId;
}
TripStatistics getTripStatistics() { TripStatistics getTripStatistics() {
return statsBuilder.getStatistics(); return statsBuilder.getStatistics();
} }