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

Removed use of Google Drive's shared with me.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-11 21:51:33 +02:00
parent 840ea69276
commit 41be6916bb
5 changed files with 11 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java
+3 -8
View File
@@ -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
myTracks/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java
+6 -13
View File
@@ -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<String, Object> 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);
}
myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
-7
View File
@@ -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);
myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
+2 -15
View File
@@ -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);
}
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
-6
View File
@@ -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);