forked from upstream-mirrors/OpenTracks
Removed use of Google Drive's shared with me.
This commit is contained in:
@@ -73,19 +73,14 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
|
|||||||
|
|
||||||
// Always disable
|
// Always disable
|
||||||
menu.findItem(R.id.list_context_menu_share).setVisible(false);
|
menu.findItem(R.id.list_context_menu_share).setVisible(false);
|
||||||
// One item
|
|
||||||
menu.findItem(R.id.list_context_menu_show_on_map).setVisible(isSingleSelection);
|
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);
|
||||||
menu.findItem(R.id.list_context_menu_edit)
|
menu.findItem(R.id.list_context_menu_delete).setVisible(true);
|
||||||
.setVisible(isSingleSelection && !track.isSharedWithMe());
|
|
||||||
// Track not sharedWithMe
|
|
||||||
menu.findItem(R.id.list_context_menu_delete).setVisible(!track.isSharedWithMe());
|
|
||||||
/*
|
/*
|
||||||
* Set select all to the same visibility as delete since delete is the
|
* Set select all to the same visibility as delete since delete is the
|
||||||
* only action that can be applied to multiple markers.
|
* only action that can be applied to multiple markers.
|
||||||
*/
|
*/
|
||||||
menu.findItem(R.id.list_context_menu_select_all)
|
menu.findItem(R.id.list_context_menu_select_all).setVisible(showSelectAll);
|
||||||
.setVisible(showSelectAll && !track.isSharedWithMe());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -135,32 +135,25 @@ public class SearchListActivity extends AbstractTrackActivity implements DeleteM
|
|||||||
public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) {
|
public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) {
|
||||||
boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
|
boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
|
||||||
boolean isSingleSelection = positions.length == 1;
|
boolean isSingleSelection = positions.length == 1;
|
||||||
boolean isSingleSelectionShareWithMe;
|
|
||||||
boolean isSingleSelectionTrack;
|
boolean isSingleSelectionTrack;
|
||||||
if (isSingleSelection) {
|
if (isSingleSelection) {
|
||||||
Map<String, Object> item = arrayAdapter.getItem(positions[0]);
|
Map<String, Object> item = arrayAdapter.getItem(positions[0]);
|
||||||
Long trackId = (Long) item.get(TRACK_ID_FIELD);
|
Long trackId = (Long) item.get(TRACK_ID_FIELD);
|
||||||
Track track = myTracksProviderUtils.getTrack(trackId);
|
Track track = myTracksProviderUtils.getTrack(trackId);
|
||||||
|
|
||||||
isSingleSelectionShareWithMe = track.isSharedWithMe();
|
|
||||||
isSingleSelectionTrack = item.get(MARKER_ID_FIELD) == null;
|
isSingleSelectionTrack = item.get(MARKER_ID_FIELD) == null;
|
||||||
} else {
|
} else {
|
||||||
isSingleSelectionShareWithMe = false;
|
|
||||||
isSingleSelectionTrack = false;
|
isSingleSelectionTrack = false;
|
||||||
}
|
}
|
||||||
// Not recording, one item, item is a track, not shareWithMe item
|
// Not recording, one item, item is a track
|
||||||
menu.findItem(R.id.list_context_menu_share).setVisible(!isRecording && isSingleSelection
|
menu.findItem(R.id.list_context_menu_share).setVisible(!isRecording && isSingleSelection && isSingleSelectionTrack);
|
||||||
&& isSingleSelectionTrack && !isSingleSelectionShareWithMe);
|
|
||||||
// One item, item is a marker
|
// One item, item is a marker
|
||||||
menu.findItem(R.id.list_context_menu_show_on_map)
|
menu.findItem(R.id.list_context_menu_show_on_map)
|
||||||
.setVisible(isSingleSelection && !isSingleSelectionTrack);
|
.setVisible(isSingleSelection && !isSingleSelectionTrack);
|
||||||
// One item, can be a track or a marker, cannot be a sharedWithMe item
|
// One item, can be a track or a marker
|
||||||
menu.findItem(R.id.list_context_menu_edit)
|
menu.findItem(R.id.list_context_menu_edit).setVisible(isSingleSelection);
|
||||||
.setVisible(isSingleSelection && !isSingleSelectionShareWithMe);
|
// One item. If track, no restriction.
|
||||||
// One item. If track, no restriction. If marker, cannot be a
|
menu.findItem(R.id.list_context_menu_delete).setVisible(isSingleSelection && (isSingleSelectionTrack));
|
||||||
// shareWithMe item
|
|
||||||
menu.findItem(R.id.list_context_menu_delete).setVisible(
|
|
||||||
isSingleSelection && (isSingleSelectionTrack || !isSingleSelectionShareWithMe));
|
|
||||||
// Disable select all, no action is available for multiple selection
|
// Disable select all, no action is available for multiple selection
|
||||||
menu.findItem(R.id.list_context_menu_select_all).setVisible(false);
|
menu.findItem(R.id.list_context_menu_select_all).setVisible(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -344,18 +344,11 @@ public class TrackDetailActivity extends AbstractTrackActivity
|
|||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
getMenuInflater().inflate(R.menu.track_detail, 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);
|
insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
|
||||||
insertPhotoMenuItem = menu.findItem(R.id.track_detail_insert_photo);
|
insertPhotoMenuItem = menu.findItem(R.id.track_detail_insert_photo);
|
||||||
insertPhotoMenuItem.setVisible(new Intent(MediaStore.ACTION_IMAGE_CAPTURE).resolveActivity(getPackageManager()) != null);
|
insertPhotoMenuItem.setVisible(new Intent(MediaStore.ACTION_IMAGE_CAPTURE).resolveActivity(getPackageManager()) != null);
|
||||||
|
|
||||||
shareMenuItem = menu.findItem(R.id.track_detail_share);
|
shareMenuItem = menu.findItem(R.id.track_detail_share);
|
||||||
shareMenuItem.setEnabled(!isSharedWithMe);
|
|
||||||
shareMenuItem.setVisible(!isSharedWithMe);
|
|
||||||
|
|
||||||
voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency);
|
voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency);
|
||||||
splitFrequencyMenuItem = menu.findItem(R.id.track_detail_split_frequency);
|
splitFrequencyMenuItem = menu.findItem(R.id.track_detail_split_frequency);
|
||||||
|
|||||||
@@ -197,23 +197,10 @@ public class TrackListActivity extends AbstractTrackActivity implements FileType
|
|||||||
public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) {
|
public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) {
|
||||||
boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
|
boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
|
||||||
boolean isSingleSelection = ids.length == 1;
|
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);
|
||||||
menu.findItem(R.id.list_context_menu_share)
|
|
||||||
.setVisible(!isRecording && isSingleSelection && !isSingleSelectionShareWithMe);
|
|
||||||
// Always disable
|
|
||||||
menu.findItem(R.id.list_context_menu_show_on_map).setVisible(false);
|
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);
|
||||||
menu.findItem(R.id.list_context_menu_edit)
|
|
||||||
.setVisible(isSingleSelection && !isSingleSelectionShareWithMe);
|
|
||||||
// delete is always enabled
|
|
||||||
menu.findItem(R.id.list_context_menu_select_all).setVisible(showSelectAll);
|
menu.findItem(R.id.list_context_menu_select_all).setVisible(showSelectAll);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-6
@@ -190,12 +190,6 @@ public class MarkerDetailFragment extends Fragment {
|
|||||||
|
|
||||||
updateWaypoint(false);
|
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();
|
String photoUrl = waypoint.getPhotoUrl();
|
||||||
boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
|
boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
|
||||||
menu.findItem(R.id.marker_detail_view_photo).setVisible(hasPhoto);
|
menu.findItem(R.id.marker_detail_view_photo).setVisible(hasPhoto);
|
||||||
|
|||||||
Reference in New Issue
Block a user