react-native-radar 3.8.5 → 3.8.7

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.8.6'
+        versionName '3.8.7'
     }
     lintOptions {
         abortOnError false
@@ -45,5 +45,5 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.8.6'
+    api 'io.radar:sdk:3.8.8'
 }

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

@@ -377,6 +377,34 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         });
     }
 
+    @ReactMethod
+    public void trackVerifiedToken(final Promise promise) {
+        Radar.trackVerifiedToken(new Radar.RadarTrackTokenCallback() {
+            @Override
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable String token) {
+                if (promise == null) {
+                    return;
+                }
+
+                try {
+                    if (status == Radar.RadarStatus.SUCCESS) {
+                        WritableMap map = Arguments.createMap();
+                        map.putString("status", status.toString());
+                        if (token != null) {
+                            map.putString("token", token);
+                        }
+                        promise.resolve(map);
+                    } else {
+                        promise.reject(status.toString(), status.toString());
+                    }
+                } catch (Exception e) {
+                    Log.e(TAG, "Exception", e);
+                    promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void startTrackingEfficient() {
         Radar.startTracking(RadarTrackingOptions.EFFICIENT);
@@ -465,6 +493,15 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         }
     }
 
+    @ReactMethod
+    public void isUsingRemoteTrackingOptions(final Promise promise) {
+        if (promise == null) {
+            return;
+        }
+
+        promise.resolve(Radar.isUsingRemoteTrackingOptions());
+    }
+
     @ReactMethod
     public void setForegroundServiceOptions(ReadableMap optionsMap) {
         try {

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.8.4"
+github "radarlabs/radar-sdk-ios" "3.8.5"

package/ios/RNRadar.m

@@ -319,6 +319,27 @@ RCT_EXPORT_METHOD(trackVerified:(RCTPromiseResolveBlock)resolve reject:(RCTPromi
     [Radar trackVerifiedWithCompletionHandler:completionHandler];
 }
 
+RCT_EXPORT_METHOD(trackVerifiedToken:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+        __block RCTPromiseResolveBlock resolver = resolve;
+        __block RCTPromiseRejectBlock rejecter = reject;
+
+       RadarTrackTokenCompletionHandler completionHandler = ^(RadarStatus status, NSString * _Nullable token) {
+        if (status == RadarStatusSuccess && resolver) {
+            NSMutableDictionary *dict = [NSMutableDictionary new];
+            [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
+            if (token) {
+                [dict setObject:token forKey:@"token"];
+            }
+            resolver(dict);
+        } else if (rejecter) {
+            rejecter([Radar stringForStatus:status], [Radar stringForStatus:status], nil);
+        }
+        resolver = nil;
+        rejecter = nil;
+    }; 
+
+    [Radar trackVerifiedTokenWithCompletionHandler:completionHandler];
+}
 
 RCT_EXPORT_METHOD(startTrackingEfficient) {
     [Radar startTrackingWithOptions:RadarTrackingOptions.presetEfficient];
@@ -386,6 +407,11 @@ RCT_EXPORT_METHOD(isTracking:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseR
     resolve(@(res));
 }
 
+RCT_EXPORT_METHOD(isUsingRemoteTrackingOptions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    BOOL res = [Radar isUsingRemoteTrackingOptions];
+    resolve(@(res));
+}
+
 RCT_EXPORT_METHOD(getTrackingOptions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     if (resolve == nil) {
         return;

package/js/index.native.js

@@ -6,7 +6,7 @@ if (!NativeModules.RNRadar && (Platform.OS === 'ios' || Platform.OS === 'android
 
 const eventEmitter = new NativeEventEmitter(NativeModules.RNRadar);
 
-const initialize = (publishableKey, fraud) => {
+const initialize = (publishableKey, fraud = false) => {
   NativeModules.RNRadar.initialize(publishableKey, fraud);
 };
 
@@ -70,6 +70,10 @@ const trackVerified = () => (
   NativeModules.RNRadar.trackVerified()
 );
 
+const trackVerifiedToken = () => (
+  NativeModules.RNRadar.trackVerifiedToken()
+);
+
 const startTrackingEfficient = () => (
   NativeModules.RNRadar.startTrackingEfficient()
 );
@@ -98,6 +102,10 @@ const getTrackingOptions = () => (
   NativeModules.RNRadar.getTrackingOptions()
 )
 
+const isUsingRemoteTrackingOptions = () => (
+  NativeModules.RNRadar.isUsingRemoteTrackingOptions()
+)
+
 const isTracking = () => (
   NativeModules.RNRadar.isTracking()
 )
@@ -200,11 +208,13 @@ const Radar = {
   setMetadata,
   getMetadata,
   setAnonymousTrackingEnabled,
+  isUsingRemoteTrackingOptions,
   getPermissionsStatus,
   requestPermissions,
   getLocation,
   trackOnce,
   trackVerified,
+  trackVerifiedToken,
   startTrackingEfficient,
   startTrackingResponsive,
   startTrackingContinuous,

package/js/index.web.js

@@ -91,6 +91,10 @@ const trackVerified = () => {
   // not implemented
 };
 
+const trackVerifiedToken = () => {
+  // not implemented
+};
+
 const startTrackingEfficient = () => {  
   // not implemented
 };
@@ -376,6 +380,7 @@ const Radar = {
   getLocation,
   trackOnce,
   trackVerified,
+  trackVerifiedToken,
   startTrackingEfficient,
   startTrackingResponsive,
   startTrackingContinuous,

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.8.5",
+  "version": "3.8.7",
   "main": "js/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.8.4"
+  s.dependency "RadarSDK", "~> 3.8.5"
 end