diff options
author | Tobrun <tobrun@mapbox.com> | 2017-03-30 13:31:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-30 13:31:04 +0200 |
commit | a82779917454269c99b490dc1e2e6c9efafa2e9e (patch) | |
tree | 8e94462f90aac01a5177a80e13a667ebb3f110ba /platform | |
parent | 74bf366666a1f2aeba4333fabeba3906faebb434 (diff) | |
download | qtlocation-mapboxgl-a82779917454269c99b490dc1e2e6c9efafa2e9e.tar.gz |
[android] - fixup location permissions in test app pre Android Marshmallow (#8559)
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java index e8e1c17816..074be98f5c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java @@ -8,6 +8,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.StringRes; @@ -132,7 +133,7 @@ public class FeatureOverviewActivity extends AppCompatActivity { @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + if (!isRuntimePermissionsRequired() || isPermissionAccepted(grantResults)) { startFeature(features.get(requestCode)); } else { Snackbar.make( @@ -142,6 +143,14 @@ public class FeatureOverviewActivity extends AppCompatActivity { } } + private boolean isRuntimePermissionsRequired() { + return android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; + } + + private boolean isPermissionAccepted(@NonNull int[] grantResults) { + return grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED; + } + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); |