react-native-radar 3.13.0-beta.1 → 3.14.0

package/README.md

@@ -16,6 +16,8 @@ Then, see the Radar React Native module documentation [here](https://radar.com/d
 
 See an example app in `example/`.
 
+Setup Radar public key check pre-commit hook with `cp -r hooks .git` to prevent accidental key leak when working with the Example app.
+
 ## Support
 
 Have questions? We're here to help! Email us at [support@radar.com](mailto:support@radar.com).

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.13.0-beta.1'
+        versionName '3.14.0'
     }
     lintOptions {
         abortOnError false
@@ -45,6 +45,6 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.13.1-beta.2'
+    api 'io.radar:sdk:3.15.0'
 }
 

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

@@ -32,7 +32,6 @@ import io.radar.sdk.model.RadarAddress;
 import io.radar.sdk.model.RadarContext;
 import io.radar.sdk.model.RadarEvent;
 import io.radar.sdk.model.RadarGeofence;
-import io.radar.sdk.model.RadarLocationPermissionStatus;
 import io.radar.sdk.model.RadarPlace;
 import io.radar.sdk.model.RadarRouteMatrix;
 import io.radar.sdk.model.RadarRoutes;
@@ -64,10 +63,6 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         verifiedReceiver = new RNRadarVerifiedReceiver();
     }
 
-    public static void onActivityCreate(Activity activity, Context context) {
-        Radar.onActivityCreate(activity, context);
-    }
-
     @ReactMethod
     public void addListener(String eventName) {
         if (listenerCount == 0) {
@@ -101,7 +96,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         this.fraud = fraud;
         SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "ReactNative");
-        editor.putString("x_platform_sdk_version", "3.13.0-beta.1");
+        editor.putString("x_platform_sdk_version", "3.14.0");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -223,7 +218,8 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
             return;
         }
 
-        boolean foreground = ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+        boolean foreground = ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED || 
+                             ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
         boolean background = foreground;
         boolean denied = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_FINE_LOCATION);
         
@@ -251,6 +247,22 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         return true;
     }
 
+
+    @ReactMethod
+    public void requestPermissions(boolean background, final Promise promise) {
+        PermissionAwareActivity activity = (PermissionAwareActivity)getCurrentActivity();
+        mPermissionsRequestPromise = promise;
+        if (activity != null) {
+            if (Build.VERSION.SDK_INT >= 23) {
+                if (background && Build.VERSION.SDK_INT >= 29) {
+                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
+                } else {
+                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
+                }
+            }
+        }
+    }
+
     @ReactMethod
     public void getLocation(String desiredAccuracy, final Promise promise) {
         
@@ -387,7 +399,12 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
 
                 try {
                     if (status == Radar.RadarStatus.SUCCESS) {
-                        promise.resolve(token != null ? RNRadarUtils.mapForJson(token.toJson()) : null);
+                        WritableMap map = Arguments.createMap();
+                        map.putString("status", status.toString());
+                        if (token != null) {
+                            map.putMap("token", RNRadarUtils.mapForJson(token.toJson()));
+                        }
+                        promise.resolve(map);
                     } else {
                         promise.reject(status.toString(), status.toString());
                     }
@@ -412,7 +429,12 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
 
                 try {
                     if (status == Radar.RadarStatus.SUCCESS) {
-                        promise.resolve(token != null ? RNRadarUtils.mapForJson(token.toJson()) : null);
+                        WritableMap map = Arguments.createMap();
+                        map.putString("status", status.toString());
+                        if (token != null) {
+                            map.putMap("token", RNRadarUtils.mapForJson(token.toJson()));
+                        }
+                        promise.resolve(map);
                     } else {
                         promise.reject(status.toString(), status.toString());
                     }
@@ -455,7 +477,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     @ReactMethod
     public void startTrackingVerified(ReadableMap optionsMap) {
         boolean beacons = false;
-        int interval = 1;
+        int interval = 1200;
 
         if (optionsMap != null) {
             beacons = optionsMap.hasKey("beacons") ? optionsMap.getBoolean("beacons") : beacons;
@@ -504,6 +526,11 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         Radar.stopTracking();
     }
 
+    @ReactMethod
+    public void stopTrackingVerified() {
+        Radar.stopTrackingVerified();
+    }
+
     @ReactMethod
     public void isTracking(final Promise promise) {
         if (promise == null) {
@@ -1283,33 +1310,4 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
             Radar.logConversion(name, metadataObj, callback);
         }
     }
-
-    @ReactMethod
-    public void requestForegroundLocationPermission() {
-        Radar.requestForegroundLocationPermission();
-    }
-
-    @ReactMethod
-    public void requestBackgroundLocationPermission() {
-        Radar.requestBackgroundLocationPermission();
-    }
-
-    @ReactMethod
-    public void getLocationPermissionStatus(final Promise promise) {
-        if (promise == null) {
-            return;
-        }
-        try {
-            RadarLocationPermissionStatus options = Radar.getLocationPermissionStatus();
-            promise.resolve(RNRadarUtils.mapForJson(options.toJson()));
-        } catch(JSONException e) {
-            Log.e(TAG, "JSONException", e);
-            promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
-        }
-    }
-
-    @ReactMethod
-    public void openAppSettings() {
-        Radar.openAppSettings();
-    }
 }

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

@@ -20,7 +20,6 @@ import io.radar.sdk.Radar;
 import io.radar.sdk.RadarReceiver;
 import io.radar.sdk.model.RadarEvent;
 import io.radar.sdk.model.RadarUser;
-import io.radar.sdk.model.RadarLocationPermissionStatus;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class RNRadarReceiver extends RadarReceiver {
@@ -112,16 +111,4 @@ public class RNRadarReceiver extends RadarReceiver {
         }
     }
 
-    @Override
-    public void onLocationPermissionStatusUpdated(@NonNull Context context, @NonNull RadarLocationPermissionStatus status) {
-        try {
-            ReactApplication reactApplication = ((ReactApplication)context.getApplicationContext());
-            reactNativeHost = reactApplication.getReactNativeHost();
-
-            sendEvent("locationPermissionStatus", RNRadarUtils.mapForJson(status.toJson()));
-        } catch (Exception e) {
-            Log.e(TAG, "Exception", e);
-        }
-    }
-
 }

package/dist/package.json

@@ -3,7 +3,7 @@
     "description": "React Native module for Radar, the leading geofencing and location tracking platform",
     "homepage": "https://radar.com",
     "license": "Apache-2.0",
-    "version": "3.13.0-beta.1",
+    "version": "3.14.0",
     "main": "dist/src/index.js",
     "files": [
         "android",

package/dist/src/@types/RadarNativeInterface.d.ts

@@ -1,4 +1,4 @@
-import { Location, RadarAutocompleteOptions, RadarContextCallback, RadarAddressCallback, RadarEventChannel, RadarGeocodeOptions, RadarGetDistanceOptions, RadarLocationCallback, RadarLogConversionCallback, RadarLogConversionOptions, RadarLogLevel, RadarMockTrackingOptions, RadarNotificationOptions, RadarPermissionsStatus, RadarReverseGeocodeOptions, RadarRouteCallback, RadarRouteMatrix, RadarSearchGeofencesCallback, RadarSearchGeofencesOptions, RadarSearchPlacesCallback, RadarSearchPlacesOptions, RadarStartTripOptions, RadarTrackCallback, RadarTrackOnceOptions, RadarTrackVerifiedCallback, RadarTrackingOptions, RadarTrackingOptionsDesiredAccuracy, RadarTrackingOptionsForegroundService, RadarTrackVerifiedOptions, RadarTripCallback, RadarTripOptions, RadarUpdateTripOptions, RadarVerifiedTrackingOptions, RadarListenerCallback, RadarGetMatrixOptions, RadarMetadata, RadarIPGeocodeCallback, RadarLocationPermissionStatus } from "./types";
+import { Location, RadarAutocompleteOptions, RadarContextCallback, RadarAddressCallback, RadarEventChannel, RadarGeocodeOptions, RadarGetDistanceOptions, RadarLocationCallback, RadarLogConversionCallback, RadarLogConversionOptions, RadarLogLevel, RadarMockTrackingOptions, RadarNotificationOptions, RadarPermissionsStatus, RadarReverseGeocodeOptions, RadarRouteCallback, RadarRouteMatrix, RadarSearchGeofencesCallback, RadarSearchGeofencesOptions, RadarSearchPlacesCallback, RadarSearchPlacesOptions, RadarStartTripOptions, RadarTrackCallback, RadarTrackOnceOptions, RadarTrackVerifiedCallback, RadarTrackingOptions, RadarTrackingOptionsDesiredAccuracy, RadarTrackingOptionsForegroundService, RadarTrackVerifiedOptions, RadarTripCallback, RadarTripOptions, RadarUpdateTripOptions, RadarVerifiedTrackingOptions, RadarListenerCallback, RadarGetMatrixOptions, RadarMetadata, RadarIPGeocodeCallback } from "./types";
 export interface RadarNativeInterface {
     initialize: (publishableKey: string, fraud?: boolean) => void;
     setLogLevel: (level: RadarLogLevel) => void;
@@ -10,10 +10,7 @@ export interface RadarNativeInterface {
     getMetadata: () => Promise<RadarMetadata>;
     setAnonymousTrackingEnabled: (enabled: boolean) => void;
     getPermissionsStatus: () => Promise<RadarPermissionsStatus>;
-    requestForegroundLocationPermission: () => void;
-    requestBackgroundLocationPermission: () => void;
-    getLocationPermissionStatus: () => Promise<RadarLocationPermissionStatus>;
-    openAppSettings: () => void;
+    requestPermissions: (background: boolean) => Promise<RadarPermissionsStatus>;
     getLocation: (desiredAccuracy?: RadarTrackingOptionsDesiredAccuracy) => Promise<RadarLocationCallback>;
     trackOnce: (options?: RadarTrackOnceOptions | Location) => Promise<RadarTrackCallback>;
     trackVerified: (options?: RadarTrackVerifiedOptions) => Promise<RadarTrackVerifiedCallback>;
@@ -25,9 +22,10 @@ export interface RadarNativeInterface {
     startTrackingVerified: (options?: RadarVerifiedTrackingOptions) => void;
     mockTracking: (options: RadarMockTrackingOptions) => void;
     stopTracking: () => void;
+    stopTrackingVerified: () => void;
     getTrackingOptions: () => Promise<RadarTrackingOptions>;
     isUsingRemoteTrackingOptions: () => Promise<boolean>;
-    isTracking: () => boolean;
+    isTracking: () => Promise<boolean>;
     setForegroundServiceOptions: (options: RadarTrackingOptionsForegroundService) => void;
     setNotificationOptions: (options: RadarNotificationOptions) => void;
     getTripOptions: () => Promise<RadarTripOptions>;

package/dist/src/@types/types.d.ts

@@ -243,13 +243,10 @@ export interface RadarErrorCallback {
 export interface RadarLogUpdateCallback {
     (status: string): void;
 }
-export interface RadarLocationPermissionStatusCallback {
-    (status: RadarLocationPermissionStatus): void;
-}
-export type RadarListenerCallback = RadarEventUpdateCallback | RadarLocationUpdateCallback | RadarClientLocationUpdateCallback | RadarErrorCallback | RadarLogUpdateCallback | RadarLocationPermissionStatusCallback;
+export type RadarListenerCallback = RadarEventUpdateCallback | RadarLocationUpdateCallback | RadarClientLocationUpdateCallback | RadarErrorCallback | RadarLogUpdateCallback;
 export type RadarPermissionsStatus = "GRANTED_FOREGROUND" | "GRANTED_BACKGROUND" | "DENIED" | "NOT_DETERMINED" | "UNKNOWN";
 export type RadarLocationSource = "FOREGROUND_LOCATION" | "BACKGROUND_LOCATION" | "MANUAL_LOCATION" | "VISIT_ARRIVAL" | "VISIT_DEPARTURE" | "GEOFENCE_ENTER" | "GEOFENCE_DWELL" | "GEOFENCE_EXIT" | "MOCK_LOCATION" | "BEACON_ENTER" | "BEACON_EXIT" | "UNKNOWN";
-export type RadarEventChannel = "clientLocation" | "location" | "error" | "events" | "log" | "token" | "locationPermissionStatus";
+export type RadarEventChannel = "clientLocation" | "location" | "error" | "events" | "log" | "token";
 export type RadarLogLevel = "info" | "debug" | "warning" | "error" | "none";
 export interface RadarRouteMatrix {
     status: string;
@@ -474,6 +471,8 @@ export interface RadarFraud {
     compromised: boolean;
     jumped: boolean;
     inaccurate: boolean;
+    blocked: boolean;
+    sharing: boolean;
 }
 export type RadarTrackingOptionsReplay = "all" | "stops" | "none";
 export type RadarTrackingOptionsSync = "none" | "stopsAndExits" | "all";
@@ -491,24 +490,3 @@ export interface RadarTrackingOptionsForegroundService {
     iconColor?: string;
 }
 export type RadarTripStatus = "unknown" | "started" | "approaching" | "arrived" | "expired" | "completed" | "canceled";
-export interface RadarLocationPermissionStatusAndroid {
-    status: LocationPermissionState;
-    foregroundPermissionResult: boolean;
-    backgroundPermissionResult: boolean;
-    shouldShowRequestPermissionRationaleFG: boolean;
-    shouldShowRequestPermissionRationaleBG: boolean;
-    previouslyDeniedForeground: boolean;
-    inLocationPopup: boolean;
-    approximatePermissionResult: boolean;
-    previouslyDeniedBackground: boolean;
-}
-export interface RadarLocationPermissionStatusIOS {
-    status: LocationPermissionState;
-    locationManagerStatus: LocationManagerStatus;
-    backgroundPopupAvailable: boolean;
-    inForegroundPopup: boolean;
-    userRejectedBackgroundPermission: boolean;
-}
-export type RadarLocationPermissionStatus = RadarLocationPermissionStatusAndroid | RadarLocationPermissionStatusIOS;
-export type LocationPermissionState = "NO_PERMISSION_GRANTED" | "FOREGROUND_PERMISSION_GRANTED" | "APPROXIMATE_PERMISSION_GRANTED" | "FOREGROUND_PERMISSION_REJECTED_ONCE" | "FOREGROUND_PERMISSION_REJECTED" | "FOREGROUND_PERMISSION_PENDING" | "BACKGROUND_PERMISSION_GRANTED" | "BACKGROUND_PERMISSION_REJECTED" | "BACKGROUND_PERMISSION_REJECTED_ONCE" | "BACKGROUND_PERMISSION_PENDING" | "PERMISSION_RESTRICTED" | "UNKNOWN";
-export type LocationManagerStatus = "NotDetermined" | "Restricted" | "Denied" | "AuthorizedAlways" | "AuthorizedWhenInUse" | "Unknown";

package/dist/src/index.native.js

@@ -27,10 +27,7 @@ const setMetadata = (metadata) => {
 const getMetadata = () => react_native_1.NativeModules.RNRadar.getMetadata();
 const setAnonymousTrackingEnabled = (enabled) => react_native_1.NativeModules.RNRadar.setAnonymousTrackingEnabled(enabled);
 const getPermissionsStatus = () => react_native_1.NativeModules.RNRadar.getPermissionsStatus();
-const requestForegroundLocationPermission = () => react_native_1.NativeModules.RNRadar.requestForegroundLocationPermission();
-const requestBackgroundLocationPermission = () => react_native_1.NativeModules.RNRadar.requestBackgroundLocationPermission();
-const getLocationPermissionStatus = () => react_native_1.NativeModules.RNRadar.getLocationPermissionStatus();
-const openAppSettings = () => react_native_1.NativeModules.RNRadar.openAppSettings();
+const requestPermissions = (background) => react_native_1.NativeModules.RNRadar.requestPermissions(background);
 const getLocation = (desiredAccuracy) => react_native_1.NativeModules.RNRadar.getLocation(desiredAccuracy);
 const trackOnce = (options) => {
     let backCompatibleOptions = options;
@@ -50,6 +47,7 @@ const startTrackingCustom = (options) => react_native_1.NativeModules.RNRadar.st
 const startTrackingVerified = (options) => react_native_1.NativeModules.RNRadar.startTrackingVerified(options);
 const mockTracking = (options) => react_native_1.NativeModules.RNRadar.mockTracking(options);
 const stopTracking = () => react_native_1.NativeModules.RNRadar.stopTracking();
+const stopTrackingVerified = () => react_native_1.NativeModules.RNRadar.stopTrackingVerified();
 const getTrackingOptions = () => react_native_1.NativeModules.RNRadar.getTrackingOptions();
 const isUsingRemoteTrackingOptions = () => react_native_1.NativeModules.RNRadar.isUsingRemoteTrackingOptions();
 const isTracking = () => react_native_1.NativeModules.RNRadar.isTracking();
@@ -97,10 +95,7 @@ const Radar = {
     setAnonymousTrackingEnabled,
     isUsingRemoteTrackingOptions,
     getPermissionsStatus,
-    requestForegroundLocationPermission,
-    requestBackgroundLocationPermission,
-    getLocationPermissionStatus,
-    openAppSettings,
+    requestPermissions,
     getLocation,
     trackOnce,
     trackVerified,
@@ -112,6 +107,7 @@ const Radar = {
     startTrackingVerified,
     mockTracking,
     stopTracking,
+    stopTrackingVerified,
     isTracking,
     getTrackingOptions,
     setForegroundServiceOptions,

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.13.5"
+github "radarlabs/radar-sdk-ios" "3.15.0"

package/ios/RNRadar.m

@@ -24,35 +24,6 @@ RCT_EXPORT_MODULE();
     return self;
 }
 
-+ (NSDictionary *)mapLocationPermissionStatus:(NSDictionary *)status {
-    NSString *statusString = status[@"locationPermissionState"];
-    NSString *newStatusString;
-
-    if ([statusString isEqualToString:@"NoPermissionGranted"]) {
-        newStatusString = @"NO_PERMISSION_GRANTED";
-    } else if ([statusString isEqualToString:@"ForegroundPermissionGranted"]) {
-        newStatusString = @"FOREGROUND_PERMISSION_GRANTED";
-    } else if ([statusString isEqualToString:@"ForegroundPermissionRejected"]) {
-        newStatusString = @"FOREGROUND_PERMISSION_REJECTED";
-    } else if ([statusString isEqualToString:@"ForegroundPermissionPending"]) {
-        newStatusString = @"FOREGROUND_PERMISSION_PENDING";
-    } else if ([statusString isEqualToString:@"BackgroundPermissionGranted"]) {
-        newStatusString = @"BACKGROUND_PERMISSION_GRANTED";
-    } else if ([statusString isEqualToString:@"BackgroundPermissionRejected"]) {
-        newStatusString = @"BACKGROUND_PERMISSION_REJECTED";
-    } else if ([statusString isEqualToString:@"BackgroundPermissionPending"]) {
-        newStatusString = @"BACKGROUND_PERMISSION_PENDING";
-    } else if ([statusString isEqualToString:@"PermissionRestricted"]) {
-        newStatusString = @"PERMISSION_RESTRICTED";
-    } else {
-        newStatusString = @"UNKNOWN";
-    }
-
-    NSMutableDictionary *newStatus = [status mutableCopy];
-    [newStatus removeObjectForKey:@"locationPermissionState"];
-    [newStatus setValue:newStatusString forKey:@"status"];
-    return newStatus;
-}
 
 - (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status {
     if (permissionsRequestResolver) {
@@ -70,7 +41,7 @@ RCT_EXPORT_MODULE();
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"events", @"location", @"clientLocation", @"error", @"log", @"token", @"locationPermissionStatus"];
+    return @[@"events", @"location", @"clientLocation", @"error", @"log", @"token"];
 }
 
 - (void)startObserving {
@@ -129,15 +100,9 @@ RCT_EXPORT_MODULE();
     }
 }
 
-- (void)didUpdateLocationPermissionStatus:(RadarLocationPermissionStatus *)status {
-    if (hasListeners) {
-        [self sendEventWithName:@"locationPermissionStatus" body:[RNRadar mapLocationPermissionStatus:[status dictionaryValue]]];
-    }
-}
-
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.13.0-beta.1" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.14.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -223,6 +188,19 @@ RCT_REMAP_METHOD(getPermissionsStatus, getPermissionsStatusWithResolver:(RCTProm
     resolve(statusStr);
 }
 
+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 if (status == kCLAuthorizationStatusNotDetermined) {
+        [locationManager requestWhenInUseAuthorization];
+    } else {
+        [self getPermissionsStatusWithResolver:resolve rejecter:reject];
+    }
+}
+
 RCT_EXPORT_METHOD(getLocation:(NSString *)desiredAccuracy resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
@@ -341,11 +319,12 @@ RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseR
 
     RadarTrackVerifiedCompletionHandler completionHandler = ^(RadarStatus status, RadarVerifiedLocationToken * _Nullable token) {
         if (status == RadarStatusSuccess && resolver) {
+            NSMutableDictionary *dict = [NSMutableDictionary new];
+            [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
             if (token != nil) {
-                resolver([token dictionaryValue]);
-            } else {
-                resolver(nil);
+                [dict setObject:[token dictionaryValue] forKey:@"token"];
             }
+            resolver(dict);
         } else if (rejecter) {
             rejecter([Radar stringForStatus:status], [Radar stringForStatus:status], nil);
         }
@@ -362,11 +341,12 @@ RCT_EXPORT_METHOD(getVerifiedLocationToken:(RCTPromiseResolveBlock)resolve rejec
 
     RadarTrackVerifiedCompletionHandler completionHandler = ^(RadarStatus status, RadarVerifiedLocationToken * _Nullable token) {
         if (status == RadarStatusSuccess && resolver) {
+            NSMutableDictionary *dict = [NSMutableDictionary new];
+            [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
             if (token != nil) {
-                resolver([token dictionaryValue]);
-            } else {
-                resolver(nil);
+                [dict setObject:[token dictionaryValue] forKey:@"token"];
             }
+            resolver(dict);
         } else if (rejecter) {
             rejecter([Radar stringForStatus:status], [Radar stringForStatus:status], nil);
         }
@@ -397,13 +377,9 @@ RCT_EXPORT_METHOD(startTrackingCustom:(NSDictionary *)optionsDict) {
 RCT_EXPORT_METHOD(startTrackingVerified:(NSDictionary *)optionsDict) {
     BOOL token = NO;
     BOOL beacons = NO;
-    double interval = 1;
+    double interval = 1200;
 
     if (optionsDict != nil) {
-        NSNumber *tokenNumber = optionsDict[@"token"];
-        if (tokenNumber != nil && [tokenNumber isKindOfClass:[NSNumber class]]) {
-            token = [tokenNumber boolValue]; 
-        }
         NSNumber *beaconsNumber = optionsDict[@"beacons"];
         if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
             beacons = [beaconsNumber boolValue]; 
@@ -461,6 +437,10 @@ RCT_EXPORT_METHOD(stopTracking) {
     [Radar stopTracking];
 }
 
+RCT_EXPORT_METHOD(stopTrackingVerified) {
+    [Radar stopTrackingVerified];
+}
+
 RCT_EXPORT_METHOD(isTracking:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     BOOL res = [Radar isTracking];
     resolve(@(res));
@@ -1170,21 +1150,4 @@ RCT_EXPORT_METHOD(logConversion:(NSDictionary *)optionsDict resolve:(RCTPromiseR
     }
 }
 
-RCT_EXPORT_METHOD(requestForegroundLocationPermission) {
-    [Radar requestForegroundLocationPermission];
-}
-
-RCT_EXPORT_METHOD(requestBackgroundLocationPermission) {
-    [Radar requestBackgroundLocationPermission];
-}
-
-RCT_EXPORT_METHOD(getLocationPermissionStatus:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    RadarLocationPermissionStatus* status = [Radar getLocationPermissionStatus];
-    resolve([RNRadar mapLocationPermissionStatus:[status dictionaryValue]]);
-}
-
-RCT_EXPORT_METHOD(openAppSettings) {
-    [Radar openAppSettings];
-}
-
 @end

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native module for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.com",
   "license": "Apache-2.0",
-  "version": "3.13.0-beta.1",
+  "version": "3.14.0",
   "main": "dist/src/index.js",
   "files": [
     "android",

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.13.5"
+  s.dependency "RadarSDK", "~> 3.15.0"
 end

package/src/@types/RadarNativeInterface.ts

@@ -36,7 +36,6 @@ import {
   RadarGetMatrixOptions,
   RadarMetadata,
   RadarIPGeocodeCallback,
-  RadarLocationPermissionStatus,
 } from "./types";
 
 export interface RadarNativeInterface {
@@ -50,10 +49,7 @@ export interface RadarNativeInterface {
   getMetadata: () => Promise<RadarMetadata>;
   setAnonymousTrackingEnabled: (enabled: boolean) => void;
   getPermissionsStatus: () => Promise<RadarPermissionsStatus>;
-  requestForegroundLocationPermission: () => void;
-  requestBackgroundLocationPermission: () => void;
-  getLocationPermissionStatus: () => Promise<RadarLocationPermissionStatus>;
-  openAppSettings: () => void;
+  requestPermissions: (background: boolean) => Promise<RadarPermissionsStatus>;
   getLocation: (
     desiredAccuracy?: RadarTrackingOptionsDesiredAccuracy
   ) => Promise<RadarLocationCallback>;
@@ -69,9 +65,10 @@ export interface RadarNativeInterface {
   startTrackingVerified: (options?: RadarVerifiedTrackingOptions) => void;
   mockTracking: (options: RadarMockTrackingOptions) => void;
   stopTracking: () => void;
+  stopTrackingVerified: () => void;
   getTrackingOptions: () => Promise<RadarTrackingOptions>;
   isUsingRemoteTrackingOptions: () => Promise<boolean>;
-  isTracking: () => boolean;
+  isTracking: () => Promise<boolean>;
   setForegroundServiceOptions: (
     options: RadarTrackingOptionsForegroundService
   ) => void;

package/src/@types/types.ts

@@ -421,9 +421,6 @@ export interface RadarLogUpdateCallback {
   (status: string): void;
 }
 
-export interface RadarLocationPermissionStatusCallback {
-  (status: RadarLocationPermissionStatus): void;
-}
 
 export type RadarListenerCallback =
   | RadarEventUpdateCallback
@@ -431,7 +428,6 @@ export type RadarListenerCallback =
   | RadarClientLocationUpdateCallback
   | RadarErrorCallback
   | RadarLogUpdateCallback
-  | RadarLocationPermissionStatusCallback;
 
 export type RadarPermissionsStatus =
   | "GRANTED_FOREGROUND"
@@ -454,7 +450,7 @@ export type RadarLocationSource =
   | "BEACON_EXIT"
   | "UNKNOWN";
 
-export type RadarEventChannel = "clientLocation" | "location" | "error" | "events" | "log" | "token" | "locationPermissionStatus";
+export type RadarEventChannel = "clientLocation" | "location" | "error" | "events" | "log" | "token" ;
 
 export type RadarLogLevel = "info" | "debug" | "warning" | "error" | "none";
 
@@ -754,6 +750,8 @@ export interface RadarFraud {
   compromised: boolean;
   jumped: boolean;
   inaccurate: boolean;
+  blocked: boolean;
+  sharing: boolean;
 }
 
 export type RadarTrackingOptionsReplay = "all" | "stops" | "none";
@@ -784,47 +782,3 @@ export type RadarTripStatus =
   | "completed"
   | "canceled";
 
-export interface RadarLocationPermissionStatusAndroid {
-  status: LocationPermissionState;
-  foregroundPermissionResult: boolean;
-  backgroundPermissionResult: boolean;
-  shouldShowRequestPermissionRationaleFG: boolean;
-  shouldShowRequestPermissionRationaleBG: boolean;
-  previouslyDeniedForeground: boolean;
-  inLocationPopup: boolean;
-  approximatePermissionResult: boolean;
-  previouslyDeniedBackground: boolean;
-}
-
-export interface RadarLocationPermissionStatusIOS {
-  status: LocationPermissionState;
-  locationManagerStatus: LocationManagerStatus;
-  backgroundPopupAvailable: boolean;
-  inForegroundPopup: boolean;
-  userRejectedBackgroundPermission: boolean;
-}
-
-export type RadarLocationPermissionStatus = 
-  RadarLocationPermissionStatusAndroid | RadarLocationPermissionStatusIOS
-
-export type LocationPermissionState = 
-  | "NO_PERMISSION_GRANTED"
-  | "FOREGROUND_PERMISSION_GRANTED"
-  | "APPROXIMATE_PERMISSION_GRANTED"
-  | "FOREGROUND_PERMISSION_REJECTED_ONCE"
-  | "FOREGROUND_PERMISSION_REJECTED"
-  | "FOREGROUND_PERMISSION_PENDING"
-  | "BACKGROUND_PERMISSION_GRANTED"
-  | "BACKGROUND_PERMISSION_REJECTED"
-  | "BACKGROUND_PERMISSION_REJECTED_ONCE"
-  | "BACKGROUND_PERMISSION_PENDING"
-  | "PERMISSION_RESTRICTED"
-  | "UNKNOWN";
-
-export type LocationManagerStatus = 
-  | "NotDetermined"
-  | "Restricted"
-  | "Denied"
-  | "AuthorizedAlways"
-  | "AuthorizedWhenInUse"
-  | "Unknown";

package/src/index.native.ts

@@ -39,7 +39,6 @@ import {
   RadarIPGeocodeCallback,
   RadarTrackVerifiedOptions,
   RadarTrackVerifiedCallback,
-  RadarLocationPermissionStatus,
 } from "./@types/types";
 
 if (
@@ -85,16 +84,10 @@ const setAnonymousTrackingEnabled = (enabled: boolean): void =>
 const getPermissionsStatus = (): Promise<RadarPermissionsStatus> =>
   NativeModules.RNRadar.getPermissionsStatus();
 
-const requestForegroundLocationPermission = () => 
-  NativeModules.RNRadar.requestForegroundLocationPermission();
-
-const requestBackgroundLocationPermission = () => 
-  NativeModules.RNRadar.requestBackgroundLocationPermission();
-
-const getLocationPermissionStatus = (): Promise<RadarLocationPermissionStatus> => 
-  NativeModules.RNRadar.getLocationPermissionStatus();
-
-const openAppSettings = () => NativeModules.RNRadar.openAppSettings()
+const requestPermissions = (
+  background: boolean
+): Promise<RadarPermissionsStatus> =>
+  NativeModules.RNRadar.requestPermissions(background);
 
 const getLocation = (
   desiredAccuracy?: RadarTrackingOptionsDesiredAccuracy
@@ -115,10 +108,12 @@ const trackOnce = (
   return NativeModules.RNRadar.trackOnce(backCompatibleOptions);
 };
 
-const trackVerified = (options?: RadarTrackVerifiedOptions): Promise<RadarTrackVerifiedCallback> =>
+const trackVerified = (
+  options?: RadarTrackVerifiedOptions
+): Promise<RadarTrackVerifiedCallback> =>
   NativeModules.RNRadar.trackVerified(options);
 
-const getVerifiedLocationToken = (): Promise<RadarTrackVerifiedCallback> => 
+const getVerifiedLocationToken = (): Promise<RadarTrackVerifiedCallback> =>
   NativeModules.RNRadar.getVerifiedLocationToken();
 
 const startTrackingEfficient = (): void =>
@@ -141,13 +136,16 @@ const mockTracking = (options: RadarMockTrackingOptions): void =>
 
 const stopTracking = (): void => NativeModules.RNRadar.stopTracking();
 
+const stopTrackingVerified = (): void =>
+  NativeModules.RNRadar.stopTrackingVerified();
+
 const getTrackingOptions = (): Promise<RadarTrackingOptions> =>
   NativeModules.RNRadar.getTrackingOptions();
 
 const isUsingRemoteTrackingOptions = (): Promise<boolean> =>
   NativeModules.RNRadar.isUsingRemoteTrackingOptions();
 
-const isTracking = (): boolean => NativeModules.RNRadar.isTracking();
+const isTracking = (): Promise<boolean> => NativeModules.RNRadar.isTracking();
 
 const setForegroundServiceOptions = (
   options: RadarTrackingOptionsForegroundService
@@ -199,7 +197,9 @@ const autocomplete = (
 const geocode = (options: RadarGeocodeOptions): Promise<RadarAddressCallback> =>
   NativeModules.RNRadar.geocode(options);
 
-const reverseGeocode = (options?: RadarReverseGeocodeOptions): Promise<RadarAddressCallback> =>
+const reverseGeocode = (
+  options?: RadarReverseGeocodeOptions
+): Promise<RadarAddressCallback> =>
   NativeModules.RNRadar.reverseGeocode(options);
 
 const ipGeocode = (): Promise<RadarIPGeocodeCallback> =>
@@ -220,10 +220,15 @@ const logConversion = (
 const sendEvent = (name: string, metadata: RadarMetadata): void =>
   NativeModules.RNRadar.sendEvent(name, metadata);
 
-const on = (channel: RadarEventChannel, callback: RadarListenerCallback): void =>
-  eventEmitter.addListener(channel, callback);
+const on = (
+  channel: RadarEventChannel,
+  callback: RadarListenerCallback
+): void => eventEmitter.addListener(channel, callback);
 
-const off = (channel: RadarEventChannel, callback?: Function | undefined): void => {
+const off = (
+  channel: RadarEventChannel,
+  callback?: Function | undefined
+): void => {
   if (callback) {
     // @ts-ignore
     eventEmitter.removeListener(channel, callback);
@@ -249,10 +254,7 @@ const Radar: RadarNativeInterface = {
   setAnonymousTrackingEnabled,
   isUsingRemoteTrackingOptions,
   getPermissionsStatus,
-  requestForegroundLocationPermission,
-  requestBackgroundLocationPermission,
-  getLocationPermissionStatus,
-  openAppSettings,
+  requestPermissions,
   getLocation,
   trackOnce,
   trackVerified,
@@ -264,6 +266,7 @@ const Radar: RadarNativeInterface = {
   startTrackingVerified,
   mockTracking,
   stopTracking,
+  stopTrackingVerified,
   isTracking,
   getTrackingOptions,
   setForegroundServiceOptions,