From 41be6916bbd6da77280d975fced8ec03c1ae2b30 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 11 Jul 2019 21:51:33 +0200 Subject: [PATCH] Removed use of Google Drive's shared with me. --- .../apps/mytracks/MarkerListActivity.java | 11 +++-------- .../apps/mytracks/SearchListActivity.java | 19 ++++++------------- .../apps/mytracks/TrackDetailActivity.java | 7 ------- .../apps/mytracks/TrackListActivity.java | 17 ++--------------- .../fragments/MarkerDetailFragment.java | 6 ------ 5 files changed, 11 insertions(+), 49 deletions(-) diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java index 1f15f0b0e..b2bbd35d3 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java @@ -73,19 +73,14 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker // Always disable menu.findItem(R.id.list_context_menu_share).setVisible(false); - // One item menu.findItem(R.id.list_context_menu_show_on_map).setVisible(isSingleSelection); - // One item, track not sharedWithMe - menu.findItem(R.id.list_context_menu_edit) - .setVisible(isSingleSelection && !track.isSharedWithMe()); - // Track not sharedWithMe - menu.findItem(R.id.list_context_menu_delete).setVisible(!track.isSharedWithMe()); + menu.findItem(R.id.list_context_menu_edit).setVisible(isSingleSelection); + menu.findItem(R.id.list_context_menu_delete).setVisible(true); /* * Set select all to the same visibility as delete since delete is the * only action that can be applied to multiple markers. */ - menu.findItem(R.id.list_context_menu_select_all) - .setVisible(showSelectAll && !track.isSharedWithMe()); + menu.findItem(R.id.list_context_menu_select_all).setVisible(showSelectAll); } @Override diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java index 2fba6fc10..bd631d7ae 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java @@ -135,32 +135,25 @@ public class SearchListActivity extends AbstractTrackActivity implements DeleteM public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) { boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT; boolean isSingleSelection = positions.length == 1; - boolean isSingleSelectionShareWithMe; boolean isSingleSelectionTrack; if (isSingleSelection) { Map item = arrayAdapter.getItem(positions[0]); Long trackId = (Long) item.get(TRACK_ID_FIELD); Track track = myTracksProviderUtils.getTrack(trackId); - isSingleSelectionShareWithMe = track.isSharedWithMe(); isSingleSelectionTrack = item.get(MARKER_ID_FIELD) == null; } else { - isSingleSelectionShareWithMe = false; isSingleSelectionTrack = false; } - // Not recording, one item, item is a track, not shareWithMe item - menu.findItem(R.id.list_context_menu_share).setVisible(!isRecording && isSingleSelection - && isSingleSelectionTrack && !isSingleSelectionShareWithMe); + // Not recording, one item, item is a track + menu.findItem(R.id.list_context_menu_share).setVisible(!isRecording && isSingleSelection && isSingleSelectionTrack); // One item, item is a marker menu.findItem(R.id.list_context_menu_show_on_map) .setVisible(isSingleSelection && !isSingleSelectionTrack); - // One item, can be a track or a marker, cannot be a sharedWithMe item - menu.findItem(R.id.list_context_menu_edit) - .setVisible(isSingleSelection && !isSingleSelectionShareWithMe); - // One item. If track, no restriction. If marker, cannot be a - // shareWithMe item - menu.findItem(R.id.list_context_menu_delete).setVisible( - isSingleSelection && (isSingleSelectionTrack || !isSingleSelectionShareWithMe)); + // One item, can be a track or a marker + menu.findItem(R.id.list_context_menu_edit).setVisible(isSingleSelection); + // One item. If track, no restriction. + menu.findItem(R.id.list_context_menu_delete).setVisible(isSingleSelection && (isSingleSelectionTrack)); // Disable select all, no action is available for multiple selection menu.findItem(R.id.list_context_menu_select_all).setVisible(false); } diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java index 69f7234ff..79e54b2c9 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -344,18 +344,11 @@ public class TrackDetailActivity extends AbstractTrackActivity public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.track_detail, menu); - Track track = myTracksProviderUtils.getTrack(trackId); - boolean isSharedWithMe = track == null || track.isSharedWithMe(); - - menu.findItem(R.id.track_detail_edit).setVisible(!isSharedWithMe); - insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker); insertPhotoMenuItem = menu.findItem(R.id.track_detail_insert_photo); insertPhotoMenuItem.setVisible(new Intent(MediaStore.ACTION_IMAGE_CAPTURE).resolveActivity(getPackageManager()) != null); shareMenuItem = menu.findItem(R.id.track_detail_share); - shareMenuItem.setEnabled(!isSharedWithMe); - shareMenuItem.setVisible(!isSharedWithMe); voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency); splitFrequencyMenuItem = menu.findItem(R.id.track_detail_split_frequency); diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java index 5f7b8d0eb..a1ecef6cd 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java @@ -197,23 +197,10 @@ public class TrackListActivity extends AbstractTrackActivity implements FileType public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) { boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT; boolean isSingleSelection = ids.length == 1; - boolean isSingleSelectionShareWithMe; - if (isSingleSelection) { - Track track = myTracksProviderUtils.getTrack(ids[0]); - isSingleSelectionShareWithMe = track.isSharedWithMe(); - } else { - isSingleSelectionShareWithMe = false; - } - // Not recording, one item, not sharedWithMe item - menu.findItem(R.id.list_context_menu_share) - .setVisible(!isRecording && isSingleSelection && !isSingleSelectionShareWithMe); - // Always disable + menu.findItem(R.id.list_context_menu_share).setVisible(!isRecording && isSingleSelection); menu.findItem(R.id.list_context_menu_show_on_map).setVisible(false); - // One item, not sharedWithMe item - menu.findItem(R.id.list_context_menu_edit) - .setVisible(isSingleSelection && !isSingleSelectionShareWithMe); - // delete is always enabled + menu.findItem(R.id.list_context_menu_edit).setVisible(isSingleSelection); menu.findItem(R.id.list_context_menu_select_all).setVisible(showSelectAll); } diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java index d76acfa74..13e39cb85 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java @@ -190,12 +190,6 @@ public class MarkerDetailFragment extends Fragment { updateWaypoint(false); - Track track = myTracksProviderUtils.getTrack(waypoint.getTrackId()); - boolean isSharedWithMe = track == null || track.isSharedWithMe(); - - menu.findItem(R.id.marker_detail_edit).setVisible(!isSharedWithMe); - menu.findItem(R.id.marker_detail_delete).setVisible(!isSharedWithMe); - String photoUrl = waypoint.getPhotoUrl(); boolean hasPhoto = photoUrl != null && !photoUrl.equals(""); menu.findItem(R.id.marker_detail_view_photo).setVisible(hasPhoto);