From f2e8fcc1af792939091edc1ecd7f2fa5734d50ec Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 11 Feb 2016 13:28:29 +0100 Subject: [PATCH] [android] #3895 - handles the case of not requested/accepted permissions --- .../java/com/mapbox/mapboxsdk/testapp/MainActivity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java index ff7343182..7fb69fb2b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java @@ -552,7 +552,12 @@ public class MainActivity extends AppCompatActivity { mLocationFAB.setColorFilter(ContextCompat.getColor(this, R.color.primary)); } } else { - mMapboxMap.setMyLocationEnabled(false); + if ((ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) + == PackageManager.PERMISSION_GRANTED) || + (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) + == PackageManager.PERMISSION_GRANTED)){ + mMapboxMap.setMyLocationEnabled(false); + } mLocationFAB.setColorFilter(Color.TRANSPARENT); } }