FIX: Ensure permission denied in geolocation.getCurrentPosition rejec…

…ts the Promise fixes facebook#22535 Moves the permission request logic on Android M and above to Native side to mimic IOS behavior. Changelog: ---------- [Android] [Fixed] - Ensure permission denied in geolocation.getCurrentPosition rejects the promise Test Plan: ---------- Verified via my test project which requests location via Geolocation service. If the permission request is denied by the user the promise is rejected as well. https://github.com/Jyrno42/rn-geoloctest
Jyrno42 · Jan 2, 2019 · d1f02cd · d1f02cd
1 parent 117dcd9
commit d1f02cd
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 21 deletions.
diff --git a/Libraries/Geolocation/Geolocation.js b/Libraries/Geolocation/Geolocation.js
@@ -82,27 +82,12 @@ const Geolocation = {
       typeof geo_success === 'function',
       'Must provide a valid geo_success callback.',
     );
-    let hasPermission = true;
-    // Supports Android's new permission model. For Android older devices,
-    // it's always on.
-    if (Platform.OS === 'android' && Platform.Version >= 23) {
-      hasPermission = await PermissionsAndroid.check(
-        PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,
-      );
-      if (!hasPermission) {
-        const status = await PermissionsAndroid.request(
-          PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,
-        );
-        hasPermission = status === PermissionsAndroid.RESULTS.GRANTED;
-      }
-    }
-    if (hasPermission) {
-      RCTLocationObserver.getCurrentPosition(
-        geo_options || {},
-        geo_success,
-        geo_error || logError,
-      );
-    }
+    // Permission checks/requests are done on the native side
+    RCTLocationObserver.getCurrentPosition(
+      geo_options || {},
+      geo_success,
+      geo_error || logError,
+    );
   },
 
   /*

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK
@@ -14,5 +14,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
+        react_native_target("java/com/facebook/react/modules/permissions:permissions"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
@@ -7,16 +7,19 @@
 
 package com.facebook.react.modules.location;
 
+import android.Manifest;
 import android.content.Context;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.location.LocationProvider;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.PromiseImpl;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -26,6 +29,7 @@
 import com.facebook.react.common.SystemClock;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
+import com.facebook.react.modules.permissions.PermissionsModule;
 import javax.annotation.Nullable;
 
 /**
@@ -112,6 +116,50 @@ private static LocationOptions fromReactMap(ReadableMap map) {
    */
   @ReactMethod
   public void getCurrentPosition(
+      final ReadableMap options,
+      final Callback success,
+      final Callback error) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      final PermissionsModule perms = getReactApplicationContext().getNativeModule(PermissionsModule.class);
+      perms.checkPermission(Manifest.permission.ACCESS_FINE_LOCATION, new PromiseImpl(new Callback() {
+        @Override
+        public void invoke(Object... args) {
+          boolean hasPermission = (boolean) args[0];
+
+          if (!hasPermission) {
+            perms.requestPermission(Manifest.permission.ACCESS_FINE_LOCATION, new PromiseImpl(new Callback() {
+              @Override
+              public void invoke(Object... args) {
+                String result = (String) args[0];
+                if (result == "granted") {
+                  loadCurrentPosition(options, success, error);
+                } else {
+                  error.invoke(PositionError.buildError(PositionError.PERMISSION_DENIED, "Location permission was not granted."));
+                }
+              }
+            }, new Callback() {
+              @Override
+              public void invoke(Object... args) {
+                error.invoke(PositionError.buildError(PositionError.PERMISSION_DENIED, "Failed to request location permission."));
+              }
+            }));
+          } else {
+            loadCurrentPosition(options, success, error);
+          }
+        }
+      }, new Callback() {
+        @Override
+        public void invoke(Object... args) {
+          error.invoke(PositionError.buildError(PositionError.PERMISSION_DENIED, "Failed to check location permission."));
+        }
+      }));
+      return;
+    }
+
+    loadCurrentPosition(options, success, error);
+  }
+
+  private void loadCurrentPosition(
       ReadableMap options,
       final Callback success,
       Callback error) {