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

In TrackDetailActivity, check if the track id is valid or not

Browse Source
This commit is contained in:
Jimmy Shih
2013-03-01 10:19:29 -08:00
parent 4f7dff1884
commit d94673279a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+7 -4
View File
@@ -92,6 +92,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
// From intent
private long trackId;
private long markerId;
private Track track;
// Preferences
private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
@@ -298,7 +299,6 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
menu.findItem(R.id.track_detail_save_tcx)
.setTitle(getString(R.string.menu_save_format, fileTypes[3]));
Track track = myTracksProviderUtils.getTrack(trackId);
menu.findItem(R.id.track_detail_edit).setVisible(!track.isSharedWithMe());
shareDriveMenuItem = menu.findItem(R.id.track_detail_share_drive);
shareDriveMenuItem.setEnabled(!track.isSharedWithMe());
@@ -377,7 +377,6 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
return true;
case R.id.track_detail_send_google:
AnalyticsUtils.sendPageViews(this, "/action/send_google");
Track track = myTracksProviderUtils.getTrack(trackId);
ChooseUploadServiceDialogFragment.newInstance(track.isSharedWithMe()).show(
getSupportFragmentManager(),
ChooseUploadServiceDialogFragment.CHOOSE_UPLOAD_SERVICE_DIALOG_TAG);
@@ -530,6 +529,11 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
finish();
return;
}
track = myTracksProviderUtils.getTrack(trackId);
if (track == null) {
finish();
return;
}
}
/**
@@ -583,8 +587,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
if (isRecording) {
title = getString(isPaused ? R.string.generic_paused : R.string.generic_recording);
} else {
Track track = myTracksProviderUtils.getTrack(trackId);
title = track != null ? track.getName() : getString(R.string.my_tracks_app_name);
title = track.getName();
}
setTitle(title);
}