From 2b3d5944357be6e9b4bc4f809ac8bb1410f43c9b Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Sat, 27 Mar 2021 18:00:03 +0300 Subject: [PATCH] [android]: Fix "Ask every time" location option Signed-off-by: Roman Tsisyk --- android/src/com/mapswithme/maps/MwmActivity.java | 11 ++++++----- android/src/com/mapswithme/util/PermissionsUtils.java | 7 ------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index f4b13119e8..08e5a3ff78 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -2638,12 +2638,13 @@ public class MwmActivity extends BaseMwmFragmentActivity { if (!PermissionsUtils.isLocationGranted(getApplicationContext())) { - if (PermissionsUtils.isLocationExplanationNeeded(MwmActivity.this)) - PermissionsUtils.requestLocationPermission(MwmActivity.this, REQ_CODE_LOCATION_PERMISSION); - else + PermissionsUtils.requestLocationPermission(MwmActivity.this, REQ_CODE_LOCATION_PERMISSION); + if (!PermissionsUtils.isLocationGranted(getApplicationContext())) + { Utils.showSnackbar(getActivity(), findViewById(R.id.coordinator), findViewById(R.id.menu_frame), - R.string.enable_location_services); - return; + R.string.enable_location_services); + return; + } } myPositionClick(); diff --git a/android/src/com/mapswithme/util/PermissionsUtils.java b/android/src/com/mapswithme/util/PermissionsUtils.java index 2a9c48903e..b6c0142f23 100644 --- a/android/src/com/mapswithme/util/PermissionsUtils.java +++ b/android/src/com/mapswithme/util/PermissionsUtils.java @@ -16,7 +16,6 @@ import java.util.Map; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; -import static androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale; public final class PermissionsUtils { @@ -53,12 +52,6 @@ public final class PermissionsUtils return checkPermissions(context).isLocationGranted(); } - public static boolean isLocationExplanationNeeded(@NonNull Activity activity) - { - return shouldShowRequestPermissionRationale(activity, ACCESS_COARSE_LOCATION) - || shouldShowRequestPermissionRationale(activity, ACCESS_FINE_LOCATION); - } - public static boolean isExternalStorageGranted(@NonNull Context context) { return checkPermissions(context).isExternalStorageGranted();