From 44ee7a1a411128b52dfd631288f8ebf9c95fdca7 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 21 Nov 2020 12:41:13 +0100 Subject: [PATCH] Don't request background location permission in the foreground activities any more. --- .../src/de/schildbach/oeffi/directions/DirectionsActivity.java | 3 +-- .../oeffi/directions/DirectionsShortcutActivity.java | 3 +-- .../src/de/schildbach/oeffi/network/NetworkPickerActivity.java | 3 +-- oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java | 3 +-- oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java index b3d46e5..3248d1c 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java @@ -229,8 +229,7 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom locationView.acquireLocation(); else ActivityCompat.requestPermissions(DirectionsActivity.this, - new String[] { Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.ACCESS_BACKGROUND_LOCATION }, locationPermissionRequestCode); + new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, locationPermissionRequestCode); return true; } else if (item.getItemId() == R.id.directions_location_contact) { startActivityForResult(new Intent(Intent.ACTION_PICK, CommonDataKinds.StructuredPostal.CONTENT_URI), diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java index c1dc011..46f8c56 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java @@ -101,8 +101,7 @@ public class DirectionsShortcutActivity extends OeffiActivity Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) maybeStartLocation(); else - ActivityCompat.requestPermissions(this, new String[] { Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.ACCESS_BACKGROUND_LOCATION }, + ActivityCompat.requestPermissions(this, new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, REQUEST_CODE_REQUEST_LOCATION_PERMISSION); } diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index 8a0b4d0..46bcae8 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -188,8 +188,7 @@ public class NetworkPickerActivity extends Activity implements ActivityCompat.On if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) - ActivityCompat.requestPermissions(this, new String[] { Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_BACKGROUND_LOCATION }, + ActivityCompat.requestPermissions(this, new String[] { Manifest.permission.ACCESS_COARSE_LOCATION }, REQUEST_CODE_REQUEST_LOCATION_PERMISSION); } diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java index 3de8e5c..cd0b624 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java @@ -147,8 +147,7 @@ public class PlansPickerActivity extends OeffiMainActivity implements ActivityCo if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) - ActivityCompat.requestPermissions(this, new String[] { Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_BACKGROUND_LOCATION }, + ActivityCompat.requestPermissions(this, new String[] { Manifest.permission.ACCESS_COARSE_LOCATION }, REQUEST_CODE_REQUEST_LOCATION_PERMISSION); } diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java index 949557d..390563f 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java @@ -247,8 +247,7 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware final Button locationPermissionRequestButton = (Button) findViewById( R.id.stations_location_permission_request_button); locationPermissionRequestButton.setOnClickListener(v -> ActivityCompat.requestPermissions(StationsActivity.this, - new String[] { Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.ACCESS_BACKGROUND_LOCATION }, 0)); + new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, 0)); final Button locationSettingsButton = (Button) findViewById(R.id.stations_list_location_settings); locationSettingsButton.setOnClickListener(v -> startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)));