karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Bug fix: set the final track name when the track ends

Browse Source
This commit is contained in:
Jimmy Shih
2013-12-05 16:25:05 -08:00
parent 3d0846bec6
commit 07edfde08d
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
-6
View File
@@ -22,7 +22,6 @@ import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragme
import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller; import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection; import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
import com.google.android.apps.mytracks.util.TrackIconUtils; import com.google.android.apps.mytracks.util.TrackIconUtils;
import com.google.android.apps.mytracks.util.TrackNameUtils;
import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils; import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
import com.google.android.apps.mytracks.util.TrackUtils; import com.google.android.apps.mytracks.util.TrackUtils;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
@@ -162,11 +161,6 @@ public class TrackEditActivity extends AbstractMyTracksActivity
Button cancel = (Button) findViewById(R.id.track_edit_cancel); Button cancel = (Button) findViewById(R.id.track_edit_cancel);
if (getIntent().getBooleanExtra(EXTRA_NEW_TRACK, false)) { if (getIntent().getBooleanExtra(EXTRA_NEW_TRACK, false)) {
String trackName = TrackNameUtils.getTrackName(
this, -1L, -1L, myTracksProviderUtils.getFirstValidTrackPoint(trackId));
if (trackName != null) {
name.setText(trackName);
}
setTitle(R.string.track_edit_new_track_title); setTitle(R.string.track_edit_new_track_title);
cancel.setVisibility(View.GONE); cancel.setVisibility(View.GONE);
} else { } else {
MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+8 -1
View File
@@ -771,7 +771,14 @@ public class TrackRecordingService extends Service {
// Update the recording track time // Update the recording track time
updateRecordingTrack(track, myTracksProviderUtils.getLastTrackPointId(trackId), false); updateRecordingTrack(track, myTracksProviderUtils.getLastTrackPointId(trackId), false);
} }
String trackName = TrackNameUtils.getTrackName(
this, -1L, -1L, myTracksProviderUtils.getFirstValidTrackPoint(trackId));
if (trackName != null) {
track.setName(trackName);
myTracksProviderUtils.updateTrack(track);
}
if (track.getCategory().equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT)) { if (track.getCategory().equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT)) {
int activityRecognitionType = PreferencesUtils.getInt(this, int activityRecognitionType = PreferencesUtils.getInt(this,