forked from upstream-mirrors/OpenTracks
As of ADT 14 as well as Gradle Plugin 5.0 those are not final anymore.
Fixes #544.
Missed in 1862e38a20
This commit is contained in:
@@ -222,31 +222,35 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
|
|||||||
markerIds[i] = new Marker.Id(longMarkerIds[i]);
|
markerIds[i] = new Marker.Id(longMarkerIds[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
Intent intent;
|
if (itemId == R.id.list_context_menu_show_on_map) {
|
||||||
switch (itemId) {
|
if (markerIds.length == 1) {
|
||||||
case R.id.list_context_menu_show_on_map:
|
IntentUtils.showCoordinateOnMap(this, contentProviderUtils.getMarker(markerIds[0]));
|
||||||
if (markerIds.length == 1) {
|
}
|
||||||
IntentUtils.showCoordinateOnMap(this, contentProviderUtils.getMarker(markerIds[0]));
|
return true;
|
||||||
}
|
|
||||||
return true;
|
|
||||||
case R.id.list_context_menu_edit:
|
|
||||||
if (markerIds.length == 1) {
|
|
||||||
intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
|
|
||||||
.putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerIds[0]);
|
|
||||||
startActivity(intent);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
case R.id.list_context_menu_delete:
|
|
||||||
DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds);
|
|
||||||
return true;
|
|
||||||
case R.id.list_context_menu_select_all:
|
|
||||||
for (int i = 0; i < viewBinding.markerList.getCount(); i++) {
|
|
||||||
viewBinding.markerList.setItemChecked(i, true);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (itemId == R.id.list_context_menu_edit) {
|
||||||
|
if (markerIds.length == 1) {
|
||||||
|
Intent intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
|
||||||
|
.putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerIds[0]);
|
||||||
|
startActivity(intent);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemId == R.id.list_context_menu_delete) {
|
||||||
|
DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemId == R.id.list_context_menu_select_all) {
|
||||||
|
for (int i = 0; i < viewBinding.markerList.getCount(); i++) {
|
||||||
|
viewBinding.markerList.setItemChecked(i, true);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -469,31 +469,37 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
|
|||||||
trackIds[i] = new Track.Id(longTrackIds[i]);
|
trackIds[i] = new Track.Id(longTrackIds[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
Intent intent;
|
if (itemId == R.id.list_context_menu_show_on_map) {
|
||||||
switch (itemId) {
|
IntentDashboardUtils.startDashboard(this, false, trackIds);
|
||||||
case R.id.list_context_menu_show_on_map:
|
return true;
|
||||||
IntentDashboardUtils.startDashboard(this, false, trackIds);
|
|
||||||
return true;
|
|
||||||
case R.id.list_context_menu_share:
|
|
||||||
intent = IntentUtils.newShareFileIntent(this, trackIds);
|
|
||||||
intent = Intent.createChooser(intent, null);
|
|
||||||
startActivity(intent);
|
|
||||||
return true;
|
|
||||||
case R.id.list_context_menu_edit:
|
|
||||||
intent = IntentUtils.newIntent(this, TrackEditActivity.class)
|
|
||||||
.putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackIds[0]);
|
|
||||||
startActivity(intent);
|
|
||||||
return true;
|
|
||||||
case R.id.list_context_menu_delete:
|
|
||||||
deleteTracks(trackIds);
|
|
||||||
return true;
|
|
||||||
case R.id.list_context_menu_select_all:
|
|
||||||
int size = viewBinding.trackList.getCount();
|
|
||||||
for (int i = 0; i < size; i++) {
|
|
||||||
viewBinding.trackList.setItemChecked(i, true);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (itemId == R.id.list_context_menu_share) {
|
||||||
|
Intent intent = IntentUtils.newShareFileIntent(this, trackIds);
|
||||||
|
intent = Intent.createChooser(intent, null);
|
||||||
|
startActivity(intent);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (itemId == R.id.list_context_menu_edit) {
|
||||||
|
Intent intent = IntentUtils.newIntent(this, TrackEditActivity.class)
|
||||||
|
.putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackIds[0]);
|
||||||
|
startActivity(intent);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemId == R.id.list_context_menu_delete) {
|
||||||
|
deleteTracks(trackIds);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (itemId == R.id.list_context_menu_select_all) {
|
||||||
|
for (int i = 0; i < viewBinding.trackList.getCount(); i++) {
|
||||||
|
viewBinding.trackList.setItemChecked(i, true);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user