react-native-radar 3.20.4-beta.3 → 3.20.4

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.20.4-beta.3'
+        versionName '3.20.4'
         consumerProguardFiles 'proguard-rules.pro'
     }
     lintOptions {
@@ -46,6 +46,6 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.21.4-beta.1'
+    api 'io.radar:sdk:3.21.3'
 }
 

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

@@ -96,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.20.4-beta.3");
+        editor.putString("x_platform_sdk_version", "3.20.4");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -181,6 +181,21 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         promise.resolve(RNRadarUtils.mapForJson(metaJson));
     }
 
+    @ReactMethod
+    public void setProduct(String product) throws JSONException {
+        Radar.setProduct(product);
+    }
+
+    @ReactMethod
+    public void getProduct(final Promise promise) throws JSONException {        
+        if (promise == null) {
+            return;
+        }
+
+        String product =  Radar.getProduct();        
+        promise.resolve(product);
+    }
+
     @ReactMethod
     public void setAnonymousTrackingEnabled(boolean enabled) {
         Radar.setAnonymousTrackingEnabled(enabled);
@@ -265,7 +280,6 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
 
     @ReactMethod
     public void getLocation(String desiredAccuracy, final Promise promise) {
-        
         RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy accuracyLevel = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.MEDIUM;        
         String accuracy = desiredAccuracy != null ? desiredAccuracy.toLowerCase()  : "medium";
         
@@ -384,6 +398,8 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
 
         boolean beaconsTrackingOption = false;
         RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy accuracyLevel = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.MEDIUM;
+        String reason = null;
+        String transactionId = null;
 
         if (optionsMap != null) {
             if (optionsMap.hasKey("beacons")) {
@@ -401,6 +417,12 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
                     accuracyLevel = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.HIGH;
                 }
             }
+            if (optionsMap.hasKey("reason")) {
+                reason = optionsMap.getString("reason");
+            }
+            if (optionsMap.hasKey("transactionId")) {
+                transactionId = optionsMap.getString("transactionId");
+            }
         }
 
         Radar.RadarTrackVerifiedCallback trackCallback = new Radar.RadarTrackVerifiedCallback() {
@@ -428,7 +450,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
             }
         };
 
-        Radar.trackVerified(beaconsTrackingOption, accuracyLevel, trackCallback);
+        Radar.trackVerified(beaconsTrackingOption, accuracyLevel, reason, transactionId, trackCallback);
     }
 
     @ReactMethod
@@ -436,11 +458,6 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         promise.resolve(Radar.isTrackingVerified());
     }
 
-    @ReactMethod
-    public void setProduct(String product) {
-        Radar.setProduct(product);
-    }
-
     @ReactMethod
     public void getVerifiedLocationToken(final Promise promise) {
         Radar.RadarTrackVerifiedCallback trackCallback = new Radar.RadarTrackVerifiedCallback() {

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

@@ -8,6 +8,8 @@ export interface RadarNativeInterface {
     getDescription: () => Promise<string>;
     setMetadata: (metadata: RadarMetadata) => void;
     getMetadata: () => Promise<RadarMetadata>;
+    setProduct(product: string): void;
+    getProduct: () => Promise<string>;
     setAnonymousTrackingEnabled: (enabled: boolean) => void;
     getPermissionsStatus: () => Promise<RadarPermissionsStatus>;
     requestPermissions: (background: boolean) => Promise<RadarPermissionsStatus>;
@@ -22,7 +24,6 @@ export interface RadarNativeInterface {
     startTrackingCustom: (options: RadarTrackingOptions) => void;
     startTrackingVerified: (options?: RadarVerifiedTrackingOptions) => void;
     isTrackingVerified: () => Promise<boolean>;
-    setProduct(product: string): void;
     mockTracking: (options: RadarMockTrackingOptions) => void;
     stopTracking: () => void;
     stopTrackingVerified: () => void;

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

@@ -7,6 +7,8 @@ export interface RadarTrackOnceOptions {
 export interface RadarTrackVerifiedOptions {
     beacons?: boolean;
     desiredAccuracy?: RadarTrackingOptionsDesiredAccuracy;
+    reason?: string;
+    transactionId?: string;
 }
 /**
  * Options for tracking the user's location.
@@ -504,6 +506,5 @@ export interface RadarTrackingOptionsForegroundService {
     channelName?: string;
     iconString?: string;
     iconColor?: string;
-    deepLink?: string;
 }
 export type RadarTripStatus = "unknown" | "started" | "approaching" | "arrived" | "expired" | "completed" | "canceled";

package/dist/index.native.js

@@ -25,6 +25,10 @@ const setMetadata = (metadata) => {
     react_native_1.NativeModules.RNRadar.setMetadata(metadata);
 };
 const getMetadata = () => react_native_1.NativeModules.RNRadar.getMetadata();
+const setProduct = (product) => {
+    react_native_1.NativeModules.RNRadar.setProduct(product);
+};
+const getProduct = () => react_native_1.NativeModules.RNRadar.getProduct();
 const setAnonymousTrackingEnabled = (enabled) => react_native_1.NativeModules.RNRadar.setAnonymousTrackingEnabled(enabled);
 const getPermissionsStatus = () => react_native_1.NativeModules.RNRadar.getPermissionsStatus();
 const requestPermissions = (background) => react_native_1.NativeModules.RNRadar.requestPermissions(background);
@@ -51,7 +55,6 @@ const stopTracking = () => react_native_1.NativeModules.RNRadar.stopTracking();
 const stopTrackingVerified = () => react_native_1.NativeModules.RNRadar.stopTrackingVerified();
 const isTracking = () => react_native_1.NativeModules.RNRadar.isTracking();
 const isTrackingVerified = () => react_native_1.NativeModules.RNRadar.isTrackingVerified();
-const setProduct = (product) => react_native_1.NativeModules.RNRadar.setProduct(product);
 const getTrackingOptions = () => react_native_1.NativeModules.RNRadar.getTrackingOptions();
 const isUsingRemoteTrackingOptions = () => react_native_1.NativeModules.RNRadar.isUsingRemoteTrackingOptions();
 const setForegroundServiceOptions = (options) => react_native_1.NativeModules.RNRadar.setForegroundServiceOptions(options);
@@ -96,6 +99,8 @@ const Radar = {
     getDescription,
     setMetadata,
     getMetadata,
+    setProduct,
+    getProduct,
     setAnonymousTrackingEnabled,
     getPermissionsStatus,
     requestPermissions,
@@ -103,7 +108,6 @@ const Radar = {
     trackOnce,
     trackVerified,
     isTrackingVerified,
-    setProduct,
     getVerifiedLocationToken,
     clearVerifiedLocationToken,
     startTrackingEfficient,

package/ios/RNRadar.m

@@ -102,7 +102,7 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.20.4-beta.3" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.20.4" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -150,6 +150,14 @@ RCT_EXPORT_METHOD(getMetadata:(RCTPromiseResolveBlock)resolve reject:(RCTPromise
     resolve([Radar getMetadata]);
 }
 
+RCT_EXPORT_METHOD(setProduct:(NSString *)product) {
+    [Radar setProduct:product];
+}
+
+RCT_EXPORT_METHOD(getProduct:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    resolve([Radar getProduct]);
+}
+
 RCT_EXPORT_METHOD(setAnonymousTrackingEnabled:(BOOL)enabled) {
     [Radar setAnonymousTrackingEnabled:enabled];
 }
@@ -323,6 +331,8 @@ RCT_EXPORT_METHOD(trackOnce:(NSDictionary *)optionsDict resolve:(RCTPromiseResol
 RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     BOOL beacons = NO;
     RadarTrackingOptionsDesiredAccuracy desiredAccuracy = RadarTrackingOptionsDesiredAccuracyMedium;
+    NSString *reason = nil;
+    NSString *transactionId = nil;
 
     if (optionsDict != nil) {
         NSNumber *beaconsNumber = optionsDict[@"beacons"];
@@ -341,6 +351,8 @@ RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseR
                 desiredAccuracy = RadarTrackingOptionsDesiredAccuracyLow;
             }
         }
+        reason = optionsDict[@"reason"];
+        transactionId = optionsDict[@"transactionId"];
     }
 
     __block RCTPromiseResolveBlock resolver = resolve;
@@ -361,7 +373,7 @@ RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseR
         rejecter = nil;
     };
 
-    [Radar trackVerifiedWithBeacons:beacons desiredAccuracy:desiredAccuracy completionHandler:completionHandler];
+    [Radar trackVerifiedWithBeacons:beacons desiredAccuracy:desiredAccuracy reason:reason transactionId:transactionId completionHandler:completionHandler];
 }
 
 RCT_EXPORT_METHOD(isTrackingVerified:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
@@ -369,10 +381,6 @@ RCT_EXPORT_METHOD(isTrackingVerified:(RCTPromiseResolveBlock)resolve reject:(RCT
     resolve(@(res));
 }
 
-RCT_EXPORT_METHOD(setProduct:(NSString *)product) {
-    [Radar setProduct:product];
-}
-
 RCT_EXPORT_METHOD(getVerifiedLocationToken:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;

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.20.4-beta.3",
+  "version": "3.20.4",
   "main": "dist/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.21.3"
+  s.dependency "RadarSDK", "~> 3.21.8"
 end