react-native-radar 3.1.4 → 3.2.0

package/android/build.gradle

@@ -1,26 +1,24 @@
 buildscript {
     repositories {
-        maven {
-            url 'https://maven.google.com'
-        }
-        jcenter()
+        google()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:7.0.3'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
-        versionName '3.1.4'
+        versionName '3.2.0'
     }
     lintOptions {
         abortOnError false
@@ -28,14 +26,17 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
+    configurations.all {
+        resolutionStrategy {
+            force 'androidx.core:core:1.6.0'
+            force 'androidx.core:core-ktx:1.6.0'
+        }
+    }
 }
 
 repositories {
     mavenCentral()
-    maven {
-        url 'https://maven.google.com'
-    }
-    jcenter()
+    google()
     maven {
         // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
         url "$rootDir/../node_modules/react-native/android"
@@ -44,5 +45,5 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.1.12'
+    api 'io.radar:sdk:3.2.3'
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

package/android/gradle.properties

@@ -0,0 +1 @@
+android.useAndroidX=true

package/android/src/main/AndroidManifest.xml

@@ -1,15 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.radar.react">
 
-    <application>
-        <receiver
-            android:name="io.radar.react.RNRadarReceiver"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="io.radar.sdk.RECEIVED" />
-            </intent-filter>
-        </receiver>
-    </application>
-
 </manifest>

package/android/src/main/java/io/radar/react/RNRadarModule.java

@@ -19,6 +19,8 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.PermissionAwareActivity;
+import com.facebook.react.modules.core.PermissionListener;
 import io.radar.sdk.Radar;
 import io.radar.sdk.RadarTrackingOptions;
 import io.radar.sdk.RadarTripOptions;
@@ -29,6 +31,7 @@ import io.radar.sdk.model.RadarGeofence;
 import io.radar.sdk.model.RadarPlace;
 import io.radar.sdk.model.RadarRouteMatrix;
 import io.radar.sdk.model.RadarRoutes;
+import io.radar.sdk.model.RadarTrip;
 import io.radar.sdk.model.RadarUser;
 
 import org.json.JSONException;
@@ -36,12 +39,15 @@ import org.json.JSONObject;
 
 import java.util.EnumSet;
 
-public class RNRadarModule extends ReactContextBaseJavaModule {
+public class RNRadarModule extends ReactContextBaseJavaModule implements PermissionListener {
 
     private static final String TAG = "RNRadarModule";
+    private static final int PERMISSIONS_REQUEST_CODE = 20160525; // random request code (Radar's birthday!)
+    private Promise mPermissionsRequestPromise;
 
     public RNRadarModule(ReactApplicationContext reactContext) {
         super(reactContext);
+        Radar.setReceiver(new RNRadarReceiver());
     }
 
     @Override
@@ -82,34 +88,57 @@ public class RNRadarModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void getPermissionsStatus(Promise promise) {
+    public void getPermissionsStatus(final Promise promise) {
         if (promise == null) {
             return;
         }
 
-        boolean foreground = ActivityCompat.checkSelfPermission(getReactApplicationContext(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+        Activity activity = getCurrentActivity();
+
+        if (activity == null) {
+            promise.resolve("UNKNOWN");
+
+            return;
+        }
+
+        boolean foreground = ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+        boolean background = foreground;
+        boolean denied = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_FINE_LOCATION);
+        
         if (Build.VERSION.SDK_INT >= 29) {
-            if (foreground) {
-                boolean background = ActivityCompat.checkSelfPermission(getReactApplicationContext(), Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED;
-                promise.resolve(background ? "GRANTED_BACKGROUND" : "GRANTED_FOREGROUND");
-            } else {
-                promise.resolve("DENIED");
-            }
+            background = ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED;
+        }
+
+        if (background) {
+            promise.resolve("GRANTED_BACKGROUND");
+        } else if (foreground) {
+            promise.resolve("GRANTED_FOREGROUND");
+        } else if (denied) {
+            promise.resolve("DENIED");
         } else {
-            promise.resolve(foreground ? "GRANTED_BACKGROUND" : "DENIED");
+            promise.resolve("NOT_DETERMINED");
         }
     }
 
+    @Override
+    public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode == PERMISSIONS_REQUEST_CODE && mPermissionsRequestPromise != null) {
+            getPermissionsStatus(mPermissionsRequestPromise);
+            mPermissionsRequestPromise = null;
+        }
+        return true;
+    }
+
     @ReactMethod
-    public void requestPermissions(boolean background) {
-        Activity activity = getCurrentActivity();
+    public void requestPermissions(boolean background, final Promise promise) {
+        PermissionAwareActivity activity = (PermissionAwareActivity)getCurrentActivity();
+        mPermissionsRequestPromise = promise;
         if (activity != null) {
             if (Build.VERSION.SDK_INT >= 23) {
-                int requestCode = 0;
                 if (background && Build.VERSION.SDK_INT >= 29) {
-                    ActivityCompat.requestPermissions(activity, new String[] { Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION }, requestCode);
+                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
                 } else {
-                    ActivityCompat.requestPermissions(activity, new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, requestCode);
+                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
                 }
             }
         }
@@ -308,7 +337,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule {
             RadarTripOptions options = RadarTripOptions.fromJson(optionsObj);
             Radar.startTrip(options, new Radar.RadarTripCallback() {
                 @Override
-                public void onComplete(@NonNull Radar.RadarStatus status) {
+                public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarTrip trip, @Nullable RadarEvent[] events) {
 
                 }
             });
@@ -321,7 +350,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule {
     public void completeTrip() {
         Radar.completeTrip(new Radar.RadarTripCallback() {
             @Override
-            public void onComplete(@NonNull Radar.RadarStatus status) {
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarTrip trip, @Nullable RadarEvent[] events) {
 
             }
         });
@@ -331,7 +360,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule {
     public void cancelTrip() {
         Radar.cancelTrip(new Radar.RadarTripCallback() {
             @Override
-            public void onComplete(@NonNull Radar.RadarStatus status) {
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarTrip trip, @Nullable RadarEvent[] events) {
 
             }
         });
@@ -539,8 +568,10 @@ public class RNRadarModule extends ReactContextBaseJavaModule {
         near.setLatitude(latitude);
         near.setLongitude(longitude);
         int limit = optionsMap.hasKey("limit") ? optionsMap.getInt("limit") : 10;
+        String country = optionsMap.hasKey("country") ? optionsMap.getString("country") : null;
+        String[] layers = optionsMap.hasKey("layers") ? RNRadarUtils.stringArrayForArray(optionsMap.getArray("layers")) : null;
 
-        Radar.autocomplete(query, near, limit, new Radar.RadarGeocodeCallback() {
+        Radar.autocomplete(query, near, layers, limit, country, new Radar.RadarGeocodeCallback() {
             @Override
             public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarAddress[] addresses) {
                 if (status == Radar.RadarStatus.SUCCESS) {

package/android/src/main/java/io/radar/react/RNRadarReceiver.java

@@ -5,6 +5,7 @@ import android.location.Location;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
@@ -23,49 +24,27 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class RNRadarReceiver extends RadarReceiver {
 
     private ReactNativeHost reactNativeHost;
-    private PendingResult result;
-    private AtomicInteger pendingCount = new AtomicInteger(0);
     private static final String TAG = "RNRadarReceiver";
 
-    private void invokeSendEvent(ReactContext reactContext, String eventName, Object data) {
-        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
-    }
-
     private void sendEvent(final String eventName, final Object data) {
         final ReactInstanceManager reactInstanceManager = reactNativeHost.getReactInstanceManager();
         ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-        if (reactContext == null) {
-            if (result == null) {
-                result = goAsync();
-            }
-            pendingCount.incrementAndGet();
-            reactInstanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
-                @Override
-                public void onReactContextInitialized(ReactContext reactContext) {
-                    invokeSendEvent(reactContext, eventName, data);
-                    reactInstanceManager.removeReactInstanceEventListener(this);
-                    if (pendingCount.decrementAndGet() == 0) {
-                        result.finish();
-                    }
-                }
-            });
-            if (!reactInstanceManager.hasStartedCreatingInitialContext()) {
-                reactInstanceManager.createReactContextInBackground();
-            }
-        } else {
-            invokeSendEvent(reactContext, eventName, data);
+        if (reactContext != null) {
+            reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
         }
     }
 
     @Override
-    public void onEventsReceived(@NonNull Context context, @NonNull RadarEvent[] events, @NonNull RadarUser user) {
+    public void onEventsReceived(@NonNull Context context, @NonNull RadarEvent[] events, @Nullable RadarUser user) {
         try {
             ReactApplication reactApplication = ((ReactApplication)context.getApplicationContext());
             reactNativeHost = reactApplication.getReactNativeHost();
 
             WritableMap map = Arguments.createMap();
             map.putArray("events", RNRadarUtils.arrayForJson(RadarEvent.toJson(events)));
-            map.putMap("user", RNRadarUtils.mapForJson(user.toJson()));
+            if (user != null) {
+                map.putMap("user", RNRadarUtils.mapForJson(user.toJson()));
+            }
 
             sendEvent("events", map);
         } catch (Exception e) {

package/ios/RNRadar.h

@@ -2,6 +2,6 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
-@interface RNRadar : RCTEventEmitter <RadarDelegate, RCTBridgeModule>
+@interface RNRadar : RCTEventEmitter <RadarDelegate, RCTBridgeModule, CLLocationManagerDelegate>
 
 @end

package/ios/RNRadar.m

@@ -7,6 +7,7 @@
 @implementation RNRadar {
     BOOL hasListeners;
     CLLocationManager *locationManager;
+    RCTPromiseResolveBlock permissionsRequestResolver;
 }
 
 RCT_EXPORT_MODULE();
@@ -16,10 +17,18 @@ RCT_EXPORT_MODULE();
     if (self) {
         [Radar setDelegate:self];
         locationManager = [CLLocationManager new];
+        locationManager.delegate = self;
     }
     return self;
 }
 
+- (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status {
+    if (permissionsRequestResolver) {
+        [self getPermissionsStatusWithResolver:permissionsRequestResolver rejecter:nil];
+        permissionsRequestResolver = nil;
+    }
+}
+
 + (BOOL)requiresMainQueueSetup {
     return YES;
 }
@@ -40,13 +49,14 @@ RCT_EXPORT_MODULE();
     hasListeners = NO;
 }
 
-- (void)didReceiveEvents:(NSArray<RadarEvent *> *)events user:(RadarUser *)user {
+- (void)didReceiveEvents:(NSArray<RadarEvent *> *)events user:(RadarUser * _Nullable )user {
     if (hasListeners) {
-        [self sendEventWithName:@"events" body:@{
-            @"events": [RadarEvent arrayForEvents:events],
-            @"user": [user dictionaryValue]
-
-        }];
+        NSMutableDictionary *body = [NSMutableDictionary new];
+        [body setValue:[RadarEvent arrayForEvents:events] forKey:@"events"];
+        if (user) {
+            [body setValue:[user dictionaryValue] forKey:@"user"];
+        }
+        [self sendEventWithName:@"events" body:body];
     }
 }
 
@@ -64,7 +74,7 @@ RCT_EXPORT_MODULE();
         [self sendEventWithName:@"clientLocation" body:@{
             @"location": [Radar dictionaryForLocation:location],
             @"stopped": @(stopped),
-            @"source": [Radar stringForSource:source]
+            @"source": [Radar stringForLocationSource:source]
         }];
     }
 }
@@ -125,6 +135,9 @@ RCT_REMAP_METHOD(getPermissionsStatus, getPermissionsStatusWithResolver:(RCTProm
         case kCLAuthorizationStatusAuthorizedWhenInUse:
             statusStr = @"GRANTED_FOREGROUND";
             break;
+        case kCLAuthorizationStatusNotDetermined:
+            statusStr = @"NOT_DETERMINED";
+            break;
         default:
             statusStr = @"DENIED";
             break;
@@ -132,11 +145,16 @@ RCT_REMAP_METHOD(getPermissionsStatus, getPermissionsStatusWithResolver:(RCTProm
     resolve(statusStr);
 }
 
-RCT_EXPORT_METHOD(requestPermissions:(BOOL)background) {
-    if (background) {
+RCT_EXPORT_METHOD(requestPermissions:(BOOL)background resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    permissionsRequestResolver = resolve;
+
+    CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
+    if (background && status == kCLAuthorizationStatusAuthorizedWhenInUse) {
         [locationManager requestAlwaysAuthorization];
-    } else {
+    } else if (status == kCLAuthorizationStatusNotDetermined) {
         [locationManager requestWhenInUseAuthorization];
+    } else {
+        [self getPermissionsStatusWithResolver:resolve rejecter:reject];
     }
 }
 
@@ -228,15 +246,15 @@ RCT_EXPORT_METHOD(trackOnce:(NSDictionary *)locationDict resolve:(RCTPromiseReso
 }
 
 RCT_EXPORT_METHOD(startTrackingEfficient) {
-    [Radar startTrackingWithOptions:RadarTrackingOptions.efficient];
+    [Radar startTrackingWithOptions:RadarTrackingOptions.presetEfficient];
 }
 
 RCT_EXPORT_METHOD(startTrackingResponsive) {
-    [Radar startTrackingWithOptions:RadarTrackingOptions.responsive];
+    [Radar startTrackingWithOptions:RadarTrackingOptions.presetResponsive];
 }
 
 RCT_EXPORT_METHOD(startTrackingContinuous) {
-    [Radar startTrackingWithOptions:RadarTrackingOptions.continuous];
+    [Radar startTrackingWithOptions:RadarTrackingOptions.presetContinuous];
 }
 
 RCT_EXPORT_METHOD(startTrackingCustom:(NSDictionary *)optionsDict) {
@@ -502,10 +520,13 @@ RCT_EXPORT_METHOD(autocomplete:(NSDictionary *)optionsDict resolve:(RCTPromiseRe
         limit = 10;
     }
 
+    NSArray *layers = optionsDict[@"layers"];
+    NSString *country = optionsDict[@"country"];
+
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
 
-    [Radar autocompleteQuery:query near:near limit:limit completionHandler:^(RadarStatus status, NSArray<RadarAddress *> * _Nullable addresses) {
+    [Radar autocompleteQuery:query near:near layers:layers limit:limit country:country completionHandler:^(RadarStatus status, NSArray<RadarAddress *> * _Nullable addresses) {
         if (status == RadarStatusSuccess && resolver) {
             NSMutableDictionary *dict = [NSMutableDictionary new];
             [dict setObject:[Radar stringForStatus:status] forKey:@"status"];

package/js/index.js

@@ -26,9 +26,9 @@ const getPermissionsStatus = () => (
   NativeModules.RNRadar.getPermissionsStatus()
 );
 
-const requestPermissions = (background) => {
-  NativeModules.RNRadar.requestPermissions(background);
-};
+const requestPermissions = background => (
+  NativeModules.RNRadar.requestPermissions(background)
+);
 
 const getLocation = () => (
   NativeModules.RNRadar.getLocation()

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native module for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.io",
   "license": "Apache-2.0",
-  "version": "3.1.4",
+  "version": "3.2.0",
   "main": "js/index.js",
   "files": [
     "android",
@@ -23,7 +23,6 @@
       "jest-junit"
     ]
   },
-  "dependencies": {},
   "peerDependencies": {
     "react": ">= 16.8.6",
     "react-native": ">= 0.60.0"
@@ -36,6 +35,7 @@
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^23.4.2",
+    "braces": ">=2.3.2",
     "eslint": "^5.6.1",
     "eslint-config-airbnb": "^17.1.0",
     "eslint-plugin-import": "^2.14.0",
@@ -44,12 +44,11 @@
     "eslint-plugin-react": "^7.11.1",
     "jest": "^23.6.0",
     "jest-junit": "^5.2.0",
+    "logkitty": ">=0.7.1",
     "metro-react-native-babel-preset": "^0.51.1",
     "npm-run-all": "^4.1.5",
     "react": "16.8.6",
-    "react-native": "0.60.0",
-    "braces": ">=2.3.2",
-    "logkitty": ">=0.7.1"
+    "react-native": "0.60.0"
   },
   "bugs": {
     "url": "https://github.com/radarlabs/react-native-radar/issues"
@@ -57,5 +56,8 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/radarlabs/react-native-radar.git"
+  },
+  "dependencies": {
+    "@react-native-community/netinfo": "^7.1.3"
   }
 }

package/react-native-radar.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.platform = :ios, "10.0"
 
   s.dependency "React"
-  s.dependency "RadarSDK", "3.1.7"
+  s.dependency "RadarSDK", "~> 3.2.1"
 end