react-native-radar 3.9.1 → 3.9.2

package/android/build.gradle

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

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

@@ -25,6 +25,7 @@ import io.radar.sdk.Radar;
 import io.radar.sdk.RadarTrackingOptions;
 import io.radar.sdk.RadarTrackingOptions.RadarTrackingOptionsForegroundService;
 import io.radar.sdk.RadarTripOptions;
+import io.radar.sdk.RadarVerifiedReceiver;
 import io.radar.sdk.model.RadarAddress;
 import io.radar.sdk.model.RadarContext;
 import io.radar.sdk.model.RadarEvent;
@@ -49,16 +50,22 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     private Promise mPermissionsRequestPromise;
 
     private RNRadarReceiver receiver;
+    private RNRadarVerifiedReceiver verifiedReceiver;    
     private int listenerCount = 0;
+    private boolean fraud = false;
 
     public RNRadarModule(ReactApplicationContext reactContext) {
         super(reactContext);
         receiver = new RNRadarReceiver();
+        verifiedReceiver = new RNRadarVerifiedReceiver();
     }
 
     @ReactMethod
     public void addListener(String eventName) {
         if (listenerCount == 0) {
+            if (fraud) {
+                verifiedReceiver.hasListeners = true;
+            }
             receiver.hasListeners = true;
         }
 
@@ -69,6 +76,9 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     public void removeListeners(Integer count) {
         listenerCount -= count;
         if (listenerCount == 0) {
+            if (fraud) {
+                verifiedReceiver.hasListeners = false;
+            }
             receiver.hasListeners = false;
         }
     }
@@ -80,8 +90,15 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
 
     @ReactMethod
     public void initialize(String publishableKey, boolean fraud) {
+        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.9.2");
+        editor.apply();
+
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
+            Radar.setVerifiedReceiver(verifiedReceiver);
         } else {
             Radar.initialize(getReactApplicationContext(), publishableKey);
             Radar.setReceiver(receiver);
@@ -359,8 +376,17 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     }
 
     @ReactMethod
-    public void trackVerified(final Promise promise) {
-        Radar.trackVerified(new Radar.RadarTrackCallback() {
+    public void trackVerified(ReadableMap optionsMap, final Promise promise) {
+
+        boolean beaconsTrackingOption = false;
+
+        if (optionsMap != null) {
+            if (optionsMap.hasKey("beacons")) {
+                beaconsTrackingOption = optionsMap.getBoolean("beacons");
+            }
+        }
+
+        Radar.RadarTrackCallback trackCallback = new Radar.RadarTrackCallback() {
             @Override
             public void onComplete(@NonNull Radar.RadarStatus status, @Nullable Location location, @Nullable RadarEvent[] events, @Nullable RadarUser user) {
                 if (promise == null) {
@@ -389,12 +415,23 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
                     promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
                 }
             }
-        });
+        };
+
+        Radar.trackVerified(beaconsTrackingOption, trackCallback);
     }
 
     @ReactMethod
-    public void trackVerifiedToken(final Promise promise) {
-        Radar.trackVerifiedToken(new Radar.RadarTrackTokenCallback() {
+    public void trackVerifiedToken(ReadableMap optionsMap, final Promise promise) {
+
+        boolean beaconsTrackingOption = false;
+
+        if (optionsMap != null) {
+            if (optionsMap.hasKey("beacons")) {
+                beaconsTrackingOption = optionsMap.getBoolean("beacons");
+            }
+        }
+
+        Radar.RadarTrackTokenCallback trackTokenCallback = new Radar.RadarTrackTokenCallback() {
             @Override
             public void onComplete(@NonNull Radar.RadarStatus status, @Nullable String token) {
                 if (promise == null) {
@@ -417,7 +454,9 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
                     promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
                 }
             }
-        });
+        };
+
+        Radar.trackVerifiedToken(beaconsTrackingOption, trackTokenCallback);
     }
 
     @ReactMethod
@@ -446,6 +485,21 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         }
     }
 
+    @ReactMethod
+    public void startTrackingVerified(ReadableMap optionsMap) {
+        boolean token = false;
+        boolean beacons = false;
+        int interval = 1;
+
+        if (optionsMap != null) {
+            token = optionsMap.hasKey("token") ? optionsMap.getBoolean("token") : token;
+            beacons = optionsMap.hasKey("beacons") ? optionsMap.getBoolean("beacons") : beacons;
+            interval = optionsMap.hasKey("interval") ? optionsMap.getInt("interval") : interval;
+        }
+
+        Radar.startTrackingVerified(token, interval, beacons);
+    }
+
     @ReactMethod
     public void mockTracking(ReadableMap optionsMap) {
         ReadableMap originMap = optionsMap.getMap("origin");

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

@@ -0,0 +1,46 @@
+package io.radar.react;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+import io.radar.sdk.Radar;
+import io.radar.sdk.RadarVerifiedReceiver;
+
+public class RNRadarVerifiedReceiver extends RadarVerifiedReceiver {
+
+    private ReactNativeHost reactNativeHost;
+    private static final String TAG = "RNRadarVerifiedReceiver";
+    protected boolean hasListeners = false;
+
+    private void sendEvent(final String eventName, final Object data) {
+        final ReactInstanceManager reactInstanceManager = reactNativeHost.getReactInstanceManager();
+        ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+        if (reactContext != null && hasListeners) {
+            reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
+        }
+    }
+
+    @Override
+    public void onTokenUpdated(@NonNull Context context, @NonNull String token) {
+        try {
+            ReactApplication reactApplication = ((ReactApplication)context.getApplicationContext());
+            reactNativeHost = reactApplication.getReactNativeHost();
+
+            sendEvent("token", token);
+        } catch (Exception e) {
+            Log.e(TAG, "Exception", e);
+        }
+    }
+
+}

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.9.3"
+github "radarlabs/radar-sdk-ios" "3.9.12"

package/ios/RNRadar.h

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

package/ios/RNRadar.m

@@ -16,6 +16,7 @@ RCT_EXPORT_MODULE();
     self = [super init];
     if (self) {
         [Radar setDelegate:self];
+        [Radar setVerifiedDelegate:self];
         locationManager = [CLLocationManager new];
         locationManager.delegate = self;
     }
@@ -38,7 +39,7 @@ RCT_EXPORT_MODULE();
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"events", @"location", @"clientLocation", @"error", @"log"];
+    return @[@"events", @"location", @"clientLocation", @"error", @"log", @"token"];
 }
 
 - (void)startObserving {
@@ -91,7 +92,15 @@ RCT_EXPORT_MODULE();
     }
 }
 
+- (void)didUpdateToken:(NSString *)token {
+    if (hasListeners) {
+        [self sendEventWithName:@"token" body:token];
+    }
+}
+
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
+    [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.9.2" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -231,7 +240,7 @@ RCT_EXPORT_METHOD(getLocation:(NSString *)desiredAccuracy resolve:(RCTPromiseRes
 
 RCT_EXPORT_METHOD(trackOnce:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     RadarTrackingOptionsDesiredAccuracy desiredAccuracy;
-    BOOL beaconsTrackingOption = NO;
+    BOOL beacons = NO;
     desiredAccuracy = RadarTrackingOptionsDesiredAccuracyMedium;
 
     __block RCTPromiseResolveBlock resolver = resolve;
@@ -285,21 +294,28 @@ RCT_EXPORT_METHOD(trackOnce:(NSDictionary *)optionsDict resolve:(RCTPromiseResol
             }
         }
         
-        BOOL beacons = optionsDict[@"beacons"];
-
-        if (beacons) {
-            beaconsTrackingOption = beacons;
+        NSNumber *beaconsNumber = optionsDict[@"beacons"];
+        if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
+            beacons = [beaconsNumber boolValue]; 
         }
         
-        [Radar trackOnceWithDesiredAccuracy:desiredAccuracy beacons:beaconsTrackingOption completionHandler:completionHandler];
+        [Radar trackOnceWithDesiredAccuracy:desiredAccuracy beacons:beacons completionHandler:completionHandler];
     }
 }
 
-RCT_EXPORT_METHOD(trackVerified:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-        __block RCTPromiseResolveBlock resolver = resolve;
-        __block RCTPromiseRejectBlock rejecter = reject;
+RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    BOOL beacons = NO;
+    if (optionsDict != nil) {
+        NSNumber *beaconsNumber = optionsDict[@"beacons"];
+        if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
+            beacons = [beaconsNumber boolValue]; 
+        }
+    }
 
-       RadarTrackCompletionHandler completionHandler = ^(RadarStatus status, CLLocation * _Nullable location, NSArray<RadarEvent *> * _Nullable events, RadarUser * _Nullable user) {
+    __block RCTPromiseResolveBlock resolver = resolve;
+    __block RCTPromiseRejectBlock rejecter = reject;
+
+    RadarTrackCompletionHandler completionHandler = ^(RadarStatus status, CLLocation * _Nullable location, NSArray<RadarEvent *> * _Nullable events, RadarUser * _Nullable user) {
         if (status == RadarStatusSuccess && resolver) {
             NSMutableDictionary *dict = [NSMutableDictionary new];
             [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
@@ -318,16 +334,24 @@ RCT_EXPORT_METHOD(trackVerified:(RCTPromiseResolveBlock)resolve reject:(RCTPromi
         }
         resolver = nil;
         rejecter = nil;
-    }; 
+    };
 
-    [Radar trackVerifiedWithCompletionHandler:completionHandler];
+    [Radar trackVerifiedWithBeacons:beacons completionHandler:completionHandler];
 }
 
-RCT_EXPORT_METHOD(trackVerifiedToken:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-        __block RCTPromiseResolveBlock resolver = resolve;
-        __block RCTPromiseRejectBlock rejecter = reject;
+RCT_EXPORT_METHOD(trackVerifiedToken:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    BOOL beacons = NO;
+    if (optionsDict != nil) {
+        NSNumber *beaconsNumber = optionsDict[@"beacons"];
+        if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
+            beacons = [beaconsNumber boolValue]; 
+        }
+    }
+
+    __block RCTPromiseResolveBlock resolver = resolve;
+    __block RCTPromiseRejectBlock rejecter = reject;
 
-       RadarTrackTokenCompletionHandler completionHandler = ^(RadarStatus status, NSString * _Nullable token) {
+    RadarTrackTokenCompletionHandler completionHandler = ^(RadarStatus status, NSString * _Nullable token) {
         if (status == RadarStatusSuccess && resolver) {
             NSMutableDictionary *dict = [NSMutableDictionary new];
             [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
@@ -340,9 +364,9 @@ RCT_EXPORT_METHOD(trackVerifiedToken:(RCTPromiseResolveBlock)resolve reject:(RCT
         }
         resolver = nil;
         rejecter = nil;
-    }; 
+    };
 
-    [Radar trackVerifiedTokenWithCompletionHandler:completionHandler];
+    [Radar trackVerifiedTokenWithBeacons:beacons completionHandler:completionHandler];
 }
 
 RCT_EXPORT_METHOD(startTrackingEfficient) {
@@ -362,6 +386,29 @@ RCT_EXPORT_METHOD(startTrackingCustom:(NSDictionary *)optionsDict) {
     [Radar startTrackingWithOptions:options];
 }
 
+RCT_EXPORT_METHOD(startTrackingVerified:(NSDictionary *)optionsDict) {
+    BOOL token = NO;
+    BOOL beacons = NO;
+    double interval = 1;
+
+    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]; 
+        }
+        NSNumber *intervalNumber = optionsDict[@"interval"];
+        if (intervalNumber != nil && [intervalNumber isKindOfClass:[NSNumber class]]) {
+            interval = [intervalNumber doubleValue];
+        }
+    }
+
+    [Radar startTrackingVerified:token interval:interval beacons:beacons];
+}
+
 RCT_EXPORT_METHOD(mockTracking:(NSDictionary *)optionsDict) {
     if (optionsDict == nil) {
         return;

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.9.1",
+  "version": "3.9.2",
   "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.9.3"
+  s.dependency "RadarSDK", "~> 3.9.12"
 end