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

For "Shared with me" tracks, do not allow sending to Google Drive,

Browse Source 
do not allow sharing with Google Drive.

For Drive tracks, exclude shared tracks.
This commit is contained in:
Jimmy Shih
2013-02-05 13:06:10 -08:00
parent 69f2b18f10
commit c0ec72f66a
5 changed files with 56 additions and 36 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
@@ -297,11 +297,13 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
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());
shareDriveMenuItem.setVisible(!track.isSharedWithMe());
insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
playMenuItem = menu.findItem(R.id.track_detail_play);
shareMenuItem = menu.findItem(R.id.track_detail_share);
shareDriveMenuItem = menu.findItem(R.id.track_detail_share_drive);
sendGoogleMenuItem = menu.findItem(R.id.track_detail_send_google);
saveMenuItem = menu.findItem(R.id.track_detail_save);
voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency);
@@ -398,8 +400,9 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
return true;
case R.id.track_detail_send_google:
AnalyticsUtils.sendPageViews(this, "/action/send_google");
ChooseUploadServiceDialogFragment.newInstance(new SendRequest(trackId)).show(
getSupportFragmentManager(),
Track track = myTracksProviderUtils.getTrack(trackId);
ChooseUploadServiceDialogFragment.newInstance(
new SendRequest(trackId), track.isSharedWithMe()).show(getSupportFragmentManager(),
ChooseUploadServiceDialogFragment.CHOOSE_UPLOAD_SERVICE_DIALOG_TAG);
return true;
case R.id.track_detail_save_gpx:
@@ -524,7 +527,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
if (shareMenuItem != null) {
shareMenuItem.setVisible(!isRecording);
}
if (shareDriveMenuItem != null) {
if (shareDriveMenuItem != null && shareDriveMenuItem.isEnabled()) {
shareDriveMenuItem.setVisible(!isRecording);
}
if (sendGoogleMenuItem != null) {