Don't handle permissions other than our own #194

Yermo · Jan 13, 2018 · 107a98c · 107a98c
1 parent 93d7112
commit 107a98c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
@@ -23,7 +23,6 @@
                   zoomLevel="3"
                   mapStyle="light"
                   hideAttribution="true"
-                  showUserLocation="true"
                   hideCompass="false"
                   accessToken="sk.eyJ1IjoiZWRkeXZlcmJydWdnZW4iLCJhIjoia1JpRW82NCJ9.OgnvpsKzB3GJhzyofQNUBw">
               </map:MapboxView>

diff --git a/src/mapbox.android.ts b/src/mapbox.android.ts
@@ -28,7 +28,7 @@ let _polylines = [];
 let _markerIconDownloadCache = [];
 let _locationEngine = null;
 
-const ACCESS_FINE_LOCATION_PERMISSION_REQUEST_CODE = 111; // irrelevant really, since we simply invoke onPermissionGranted
+const ACCESS_FINE_LOCATION_PERMISSION_REQUEST_CODE = 111;
 
 
 /*************** XML definition START ****************/
@@ -176,6 +176,7 @@ const _fineLocationPermissionGranted = () => {
     hasPermission = android.content.pm.PackageManager.PERMISSION_GRANTED ===
         android.support.v4.content.ContextCompat.checkSelfPermission(application.android.foregroundActivity, android.Manifest.permission.ACCESS_FINE_LOCATION);
   }
+  console.log("******* _fineLocationPermissionGranted: " + hasPermission);
   return hasPermission;
 };
 
@@ -381,7 +382,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
     });
   }
 
-  requestFineLocationPermission(): Promise<boolean> {
+  requestFineLocationPermission(): Promise<any> {
     return new Promise((resolve, reject) => {
       if (_fineLocationPermissionGranted()) {
         resolve();
@@ -390,12 +391,16 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
 
       // grab the permission dialog result
       application.android.on(application.AndroidApplication.activityRequestPermissionsEvent, (args: any) => {
+        if (args.requestCode !== ACCESS_FINE_LOCATION_PERMISSION_REQUEST_CODE) {
+          return;
+        }
         for (let i = 0; i < args.permissions.length; i++) {
           if (args.grantResults[i] === android.content.pm.PackageManager.PERMISSION_DENIED) {
             reject("Permission denied");
             return;
           }
         }
+        console.log("****** requestFineLocationPermission @ " + new Date().getTime());
         resolve();
       });
 
@@ -448,7 +453,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                   _addMarkers(settings.markers, _mapbox.mapView);
 
                   if (settings.showUserLocation) {
-                    this.requestFineLocationPermission().then((granted: boolean) => {
+                    this.requestFineLocationPermission().then(() => {
                       _showLocation(_mapbox.mapView, mbMap);
                     });
                   }

diff --git a/src/mapbox.common.ts b/src/mapbox.common.ts
@@ -254,7 +254,7 @@ export interface AnimateCameraOptions {
 }
 
 export interface MapboxCommonApi {
-  requestFineLocationPermission(): Promise<boolean>;
+  requestFineLocationPermission(): Promise<any>;
   hasFineLocationPermission(): Promise<boolean>;
 }
 
@@ -346,14 +346,14 @@ export abstract class MapboxCommon implements MapboxCommonApi {
     return result;
   }
 
-  requestFineLocationPermission(): Promise<boolean> {
-    return new Promise((resolve) => {
-      resolve(true);
+  requestFineLocationPermission(): Promise<any> {
+    return new Promise(resolve => {
+      resolve();
     });
   }
 
   hasFineLocationPermission(): Promise<boolean> {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       resolve(true);
     });
   }