react-native-radar 3.5.7 → 3.5.8

package/android/build.gradle

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

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

@@ -57,6 +57,11 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         return "RNRadar";
     }
 
+    @ReactMethod
+    public void initialize(String publishableKey) {
+        Radar.initialize(getReactApplicationContext(), publishableKey);
+    }
+
     @ReactMethod
     public void setLogLevel(String level) {
         Radar.RadarLogLevel logLevel = Radar.RadarLogLevel.NONE;
@@ -426,9 +431,21 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     @ReactMethod
     public void startTrip(ReadableMap optionsMap, final Promise promise) {
         try {
-            JSONObject optionsObj = RNRadarUtils.jsonForMap(optionsMap);
-            RadarTripOptions options = RadarTripOptions.fromJson(optionsObj);
-            Radar.startTrip(options, new Radar.RadarTripCallback() {
+            JSONObject optionsJson = RNRadarUtils.jsonForMap(optionsMap);
+            // new format is { tripOptions, trackingOptions }
+            JSONObject tripOptionsJson = optionsJson.optJSONObject("tripOptions");
+            if (tripOptionsJson == null) {
+              // legacy format
+              tripOptionsJson = optionsJson;
+            }
+            RadarTripOptions options = RadarTripOptions.fromJson(tripOptionsJson);
+
+            RadarTrackingOptions trackingOptions = null;
+            JSONObject trackingOptionsJson = optionsJson.optJSONObject("trackingOptions");
+            if (trackingOptionsJson != null) {
+                trackingOptions = RadarTrackingOptions.fromJson(trackingOptionsJson);
+            }
+            Radar.startTrip(options, trackingOptions, new Radar.RadarTripCallback() {
                 @Override
                 public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarTrip trip, @Nullable RadarEvent[] events) {
                     if (promise == null) {

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.5.4"
+github "radarlabs/radar-sdk-ios" "3.5.9"

package/ios/RNRadar.m

@@ -91,6 +91,10 @@ RCT_EXPORT_MODULE();
     }
 }
 
+RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey) {
+    [Radar initializeWithPublishableKey:publishableKey];
+}
+
 RCT_EXPORT_METHOD(setLogLevel:(NSString *)level) {
     RadarLogLevel logLevel = RadarLogLevelNone;
     if (level) {
@@ -381,15 +385,26 @@ RCT_EXPORT_METHOD(getTripOptions:(RCTPromiseResolveBlock)resolve reject:(RCTProm
 }
 
 RCT_EXPORT_METHOD(startTrip:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    RadarTripOptions *options = [RadarTripOptions tripOptionsFromDictionary:optionsDict];
+    // { tripOptions, trackingOptions } is the new req format.
+    // fallback to reading trip options from the top level options.
+    NSDictionary *tripOptionsDict = optionsDict[@"tripOptions"];
+    if (tripOptionsDict == nil) {
+        tripOptionsDict = optionsDict;
+    }
+    RadarTripOptions *options = [RadarTripOptions tripOptionsFromDictionary:tripOptionsDict];
     if (options.scheduledArrivalAt) {
         options.scheduledArrivalAt = [RCTConvert NSDate:options.scheduledArrivalAt];
     }
+    RadarTrackingOptions *trackingOptions;
+    NSDictionary *trackingOptionsDict = optionsDict[@"trackingOptions"];
+    if (trackingOptionsDict != nil) {
+      trackingOptions = [RadarTrackingOptions trackingOptionsFromDictionary:trackingOptionsDict];
+    }
 
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
 
-    [Radar startTripWithOptions:options completionHandler:^(RadarStatus status, RadarTrip * _Nullable trip, NSArray<RadarEvent *> * _Nullable events) {
+    [Radar startTripWithOptions:options trackingOptions:trackingOptions completionHandler:^(RadarStatus status, RadarTrip * _Nullable trip, NSArray<RadarEvent *> * _Nullable events) {
         if (status == RadarStatusSuccess && resolver) {
             NSMutableDictionary *dict = [NSMutableDictionary new];
             [dict setObject:[Radar stringForStatus:status] forKey:@"status"];

package/js/index.native.js

@@ -6,6 +6,10 @@ if (!NativeModules.RNRadar && (Platform.OS === 'ios' || Platform.OS === 'android
 
 const eventEmitter = new NativeEventEmitter(NativeModules.RNRadar);
 
+const initialize = (publishableKey) => {
+  NativeModules.RNRadar.initialize(publishableKey);
+};
+
 const setLogLevel = (level) => {
   NativeModules.RNRadar.setLogLevel(level);
 };
@@ -183,6 +187,7 @@ const off = (event, callback) => {
 };
 
 const Radar = {
+  initialize,
   setLogLevel,
   setUserId,
   getUserId,

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.5.7",
+  "version": "3.5.8",
   "main": "js/index.js",
   "files": [
     "android",
@@ -48,8 +48,7 @@
     "metro-react-native-babel-preset": "^0.51.1",
     "npm-run-all": "^4.1.5",
     "react": "16.8.6",
-    "react-native": "0.60.0",
-    "radar-sdk-js": "^3.3.0"
+    "react-native": "0.60.0"
   },
   "bugs": {
     "url": "https://github.com/radarlabs/react-native-radar/issues"
@@ -59,6 +58,7 @@
     "url": "https://github.com/radarlabs/react-native-radar.git"
   },
   "dependencies": {
+    "radar-sdk-js": "^3.5.0",
     "@react-native-community/netinfo": "^7.1.3"
   }
 }

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