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:
Dennis Guse
2020-12-15 23:36:03 +01:00
parent 1409537e56
commit eb2c2b4d78
2 changed files with 58 additions and 48 deletions
@@ -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) {
case R.id.list_context_menu_show_on_map:
if (markerIds.length == 1) { if (markerIds.length == 1) {
IntentUtils.showCoordinateOnMap(this, contentProviderUtils.getMarker(markerIds[0])); IntentUtils.showCoordinateOnMap(this, contentProviderUtils.getMarker(markerIds[0]));
} }
return true; return true;
case R.id.list_context_menu_edit: }
if (itemId == R.id.list_context_menu_edit) {
if (markerIds.length == 1) { if (markerIds.length == 1) {
intent = IntentUtils.newIntent(this, MarkerEditActivity.class) Intent intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
.putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerIds[0]); .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerIds[0]);
startActivity(intent); startActivity(intent);
} }
return true; return true;
case R.id.list_context_menu_delete: }
if (itemId == R.id.list_context_menu_delete) {
DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds); DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds);
return true; return true;
case R.id.list_context_menu_select_all: }
if (itemId == R.id.list_context_menu_select_all) {
for (int i = 0; i < viewBinding.markerList.getCount(); i++) { for (int i = 0; i < viewBinding.markerList.getCount(); i++) {
viewBinding.markerList.setItemChecked(i, true); viewBinding.markerList.setItemChecked(i, true);
} }
return false; return false;
default:
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) {
case R.id.list_context_menu_show_on_map:
IntentDashboardUtils.startDashboard(this, false, trackIds); IntentDashboardUtils.startDashboard(this, false, trackIds);
return true; return true;
case R.id.list_context_menu_share: }
intent = IntentUtils.newShareFileIntent(this, trackIds);
if (itemId == R.id.list_context_menu_share) {
Intent intent = IntentUtils.newShareFileIntent(this, trackIds);
intent = Intent.createChooser(intent, null); intent = Intent.createChooser(intent, null);
startActivity(intent); startActivity(intent);
return true; return true;
case R.id.list_context_menu_edit: }
intent = IntentUtils.newIntent(this, TrackEditActivity.class)
if (itemId == R.id.list_context_menu_edit) {
Intent intent = IntentUtils.newIntent(this, TrackEditActivity.class)
.putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackIds[0]); .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackIds[0]);
startActivity(intent); startActivity(intent);
return true; return true;
case R.id.list_context_menu_delete: }
if (itemId == R.id.list_context_menu_delete) {
deleteTracks(trackIds); deleteTracks(trackIds);
return true; return true;
case R.id.list_context_menu_select_all: }
int size = viewBinding.trackList.getCount(); if (itemId == R.id.list_context_menu_select_all) {
for (int i = 0; i < size; i++) { for (int i = 0; i < viewBinding.trackList.getCount(); i++) {
viewBinding.trackList.setItemChecked(i, true); viewBinding.trackList.setItemChecked(i, true);
} }
return false; return false;
} }
return false; return false;
} }