mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-06 17:38:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DirectionsActivity: remove superfluous code for requesting READ_CONTACTS permission

Browse source
This commit is contained in:
Andreas Schildbach 2022-09-07 21:14:08 +02:00
parent 8f095e9296
commit b012e7feb1
3 changed files with 14 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

1
oeffi/res/values-de/directions.xml
View file

@ -4,7 +4,6 @@
<string name="directions_location_context_current_location">Mein aktueller Standort</string>
<string name="directions_location_context_contact">Adresse aus Kontakt</string>
<string name="directions_location_context_favorite_station">Haltestellen-Favorit</string>
<string name="directions_location_choose_error_permission">Berechtigungs-Problem:\n%1$s</string>
<string name="directions_products_prompt">Verkehrsmittel auswählen</string>
<string-array name="directions_products">

1
oeffi/res/values/directions.xml
View file

@ -5,7 +5,6 @@
<string name="directions_location_context_current_location">My current location</string>
<string name="directions_location_context_contact">Contact address</string>
<string name="directions_location_context_favorite_station">Favorite station</string>
<string name="directions_location_choose_error_permission">Permission problem:\n%1$s</string>
<string name="directions_products_prompt">Pick means of transport</string>
<string-array name="directions_products">

48
oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
View file

@ -167,9 +167,6 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
private static final int DIALOG_CLEAR_HISTORY = 1;
private static final int REQUEST_CODE_CONTACTS_PERMISSION_FROM = 1;
private static final int REQUEST_CODE_CONTACTS_PERMISSION_VIA = 2;
private static final int REQUEST_CODE_CONTACTS_PERMISSION_TO = 3;
private static final int REQUEST_CODE_LOCATION_PERMISSION_FROM = 4;
private static final int REQUEST_CODE_LOCATION_PERMISSION_VIA = 5;
private static final int REQUEST_CODE_LOCATION_PERMISSION_TO = 6;
@ -201,16 +198,14 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
private class LocationContextMenuItemClickListener implements PopupMenu.OnMenuItemClickListener {
private final LocationView locationView;
private final int contactsPermissionRequestCode;
private final int locationPermissionRequestCode;
private final int pickContactRequestCode;
private final int pickStationRequestCode;
public LocationContextMenuItemClickListener(final LocationView locationView,
final int contactsPermissionRequestCode, final int locationPermissionRequestCode,
final int locationPermissionRequestCode,
final int pickContactRequestCode, final int pickStationRequestCode) {
this.locationView = locationView;
this.contactsPermissionRequestCode = contactsPermissionRequestCode;
this.locationPermissionRequestCode = locationPermissionRequestCode;
this.pickContactRequestCode = pickContactRequestCode;
this.pickStationRequestCode = pickStationRequestCode;
@ -226,12 +221,7 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, locationPermissionRequestCode);
return true;
} else if (item.getItemId() == R.id.directions_location_contact) {
if (ContextCompat.checkSelfPermission(DirectionsActivity.this,
Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED)
startActivityForResult(INTENT_PICK_CONTACTS, pickContactRequestCode);
else
ActivityCompat.requestPermissions(DirectionsActivity.this,
new String[] { Manifest.permission.READ_CONTACTS }, contactsPermissionRequestCode);
startActivityForResult(INTENT_PICK_CONTACTS, pickContactRequestCode);
return true;
} else if (item.getItemId() == R.id.directions_location_favorite_station) {
if (network != null)
@ -318,14 +308,14 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
viewFromLocation.setAdapter(autoCompleteAdapter);
viewFromLocation.setListener(locationChangeListener);
viewFromLocation.setContextMenuItemClickListener(new LocationContextMenuItemClickListener(viewFromLocation,
REQUEST_CODE_CONTACTS_PERMISSION_FROM, REQUEST_CODE_LOCATION_PERMISSION_FROM,
REQUEST_CODE_LOCATION_PERMISSION_FROM,
REQUEST_CODE_PICK_CONTACT_FROM, REQUEST_CODE_PICK_STATION_FROM));
viewViaLocation = findViewById(R.id.directions_via);
viewViaLocation.setAdapter(autoCompleteAdapter);
viewViaLocation.setListener(locationChangeListener);
viewViaLocation.setContextMenuItemClickListener(new LocationContextMenuItemClickListener(viewViaLocation,
REQUEST_CODE_CONTACTS_PERMISSION_VIA, REQUEST_CODE_LOCATION_PERMISSION_VIA,
REQUEST_CODE_LOCATION_PERMISSION_VIA,
REQUEST_CODE_PICK_CONTACT_VIA, REQUEST_CODE_PICK_STATION_VIA));
viewToLocation = findViewById(R.id.directions_to);
@ -343,7 +333,7 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
}
});
viewToLocation.setContextMenuItemClickListener(new LocationContextMenuItemClickListener(viewToLocation,
REQUEST_CODE_CONTACTS_PERMISSION_TO, REQUEST_CODE_LOCATION_PERMISSION_TO,
REQUEST_CODE_LOCATION_PERMISSION_TO,
REQUEST_CODE_PICK_CONTACT_TO, REQUEST_CODE_PICK_STATION_TO));
viewProducts = findViewById(R.id.directions_products);
@ -1169,13 +1159,7 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
@Override
public void onRequestPermissionsResult(final int requestCode, final String[] permissions,
final int[] grantResults) {
if (requestCode == REQUEST_CODE_CONTACTS_PERMISSION_FROM)
startActivityForResult(INTENT_PICK_CONTACTS, REQUEST_CODE_PICK_CONTACT_FROM);
else if (requestCode == REQUEST_CODE_CONTACTS_PERMISSION_VIA)
startActivityForResult(INTENT_PICK_CONTACTS, REQUEST_CODE_PICK_CONTACT_VIA);
else if (requestCode == REQUEST_CODE_CONTACTS_PERMISSION_TO)
startActivityForResult(INTENT_PICK_CONTACTS, REQUEST_CODE_PICK_CONTACT_TO);
else if (requestCode == REQUEST_CODE_LOCATION_PERMISSION_FROM)
if (requestCode == REQUEST_CODE_LOCATION_PERMISSION_FROM)
viewFromLocation.acquireLocation();
else if (requestCode == REQUEST_CODE_LOCATION_PERMISSION_VIA)
viewViaLocation.acquireLocation();
@ -1184,18 +1168,14 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
}
private void resultPickContact(final Intent result, final LocationView targetLocationView) {
try {
final Cursor c = managedQuery(result.getData(), null, null, null, null);
if (c.moveToFirst()) {
final String data = c
.getString(c.getColumnIndexOrThrow(CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS));
final Location location = new Location(LocationType.ADDRESS, null, null, data.replace("\n", " "));
targetLocationView.setLocation(location);
log.info("Picked {} from contacts", location);
requestFocusFirst();
}
} catch (final SecurityException x) {
new Toast(this).longToast(R.string.directions_location_choose_error_permission, x.getMessage());
final Cursor c = managedQuery(result.getData(), null, null, null, null);
if (c.moveToFirst()) {
final String data = c
.getString(c.getColumnIndexOrThrow(CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS));
final Location location = new Location(LocationType.ADDRESS, null, null, data.replace("\n", " "));
targetLocationView.setLocation(location);
log.info("Picked {} from contacts", location);
requestFocusFirst();
}
}