Fix delivery of android events. Fix incorrect android permissions logic

radarlabs · Jul 30, 2018 · e367a20 · e367a20
1 parent f209463
commit e367a20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/android/src/main/java/io/radar/react/RNRadarModule.java b/android/src/main/java/io/radar/react/RNRadarModule.java
@@ -47,7 +47,7 @@ public void setPlacesProvider(String providerStr) {
     @ReactMethod
     public void getPermissionsStatus(Promise promise) {
         promise.resolve(RNRadarUtils.stringForPermissionsStatus(
-            ActivityCompat.checkSelfPermission(getReactApplicationContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED
+            ActivityCompat.checkSelfPermission(getReactApplicationContext(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
         ));
     }
 

diff --git a/android/src/main/java/io/radar/react/RNRadarReceiver.java b/android/src/main/java/io/radar/react/RNRadarReceiver.java
@@ -29,11 +29,13 @@ private void sendEvent(final String eventName, final Object data) {
         final ReactInstanceManager reactInstanceManager = mReactNativeHost.getReactInstanceManager();
         ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
         if (reactContext == null) {
+            final PendingResult result = goAsync();
             reactInstanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
                 @Override
                 public void onReactContextInitialized(ReactContext reactContext) {
                     invokeSendEvent(reactContext, eventName, data);
                     reactInstanceManager.removeReactInstanceEventListener(this);
+                    result.finish();
                 }
             });
             if (!reactInstanceManager.hasStartedCreatingInitialContext()) {