react-native-radar 3.13.0-beta.1 → 3.13.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.13.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.13.3'
 }
 

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

@@ -101,7 +101,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.13.0");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -223,7 +223,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);
         
@@ -387,7 +388,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 +418,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 +466,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 +515,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) {

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.13.0",
     "main": "dist/src/index.js",
     "files": [
         "android",

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

@@ -25,9 +25,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

@@ -474,6 +474,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";

package/dist/src/index.native.js

@@ -50,6 +50,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();
@@ -112,6 +113,7 @@ const Radar = {
     startTrackingVerified,
     mockTracking,
     stopTracking,
+    stopTrackingVerified,
     isTracking,
     getTrackingOptions,
     setForegroundServiceOptions,

package/ios/RNRadar.m

@@ -24,6 +24,9 @@ RCT_EXPORT_MODULE();
     return self;
 }
 
+/**
+ map iOS status string which is PascalCase into standard UPPER_SNAKE_CASE, which is consistent with android and javascript styling.
+ */
 + (NSDictionary *)mapLocationPermissionStatus:(NSDictionary *)status {
     NSString *statusString = status[@"locationPermissionState"];
     NSString *newStatusString;
@@ -137,7 +140,7 @@ RCT_EXPORT_MODULE();
 
 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.13.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -341,11 +344,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 +366,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 +402,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 +462,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));

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.13.0",
   "main": "dist/src/index.js",
   "files": [
     "android",

package/src/@types/RadarNativeInterface.ts

@@ -69,9 +69,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

@@ -754,6 +754,8 @@ export interface RadarFraud {
   compromised: boolean;
   jumped: boolean;
   inaccurate: boolean;
+  blocked: boolean;
+  sharing: boolean;
 }
 
 export type RadarTrackingOptionsReplay = "all" | "stops" | "none";

package/src/index.native.ts

@@ -141,13 +141,15 @@ 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
@@ -264,6 +266,7 @@ const Radar: RadarNativeInterface = {
   startTrackingVerified,
   mockTracking,
   stopTracking,
+  stopTrackingVerified,
   isTracking,
   getTrackingOptions,
   setForegroundServiceOptions,