react-native-move-sdk 2.14.0-1 → 2.14.1

package/android/src/legacy/MoveSdkModule.kt

@@ -17,6 +17,7 @@ import com.movesdk.shared.ARGUMENT_STATE
 import com.movesdk.shared.BATTERY_OPTIMIZATION_REQUEST_CODE
 import com.movesdk.shared.EVENT_AUTH_BATTERY_PERMISSION
 import com.movesdk.shared.EVENT_AUTH_OVERLAY_PERMISSION
+import com.movesdk.shared.LOG_TAG
 import com.movesdk.shared.OVERLAY_REQUEST_CODE
 import io.dolphin.move.MoveSdk
 import io.dolphin.move.MoveServiceWarning
@@ -48,70 +49,88 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
 
   @ReactMethod
   fun setup(
-    userId: String,
-    accessToken: String,
-    refreshToken: String,
-    projectId: Int,
-    // Config
-    timelineDetectionServices: ReadableArray,
-    drivingServices: ReadableArray,
-    walkingServices: ReadableArray,
+    auth: ReadableMap?,
+    config: ReadableMap?,
     options: ReadableMap?,
-    // Platform config
-    recognitionNotificationTitle: String,
-    recognitionNotificationText: String,
-    tripNotificationTitle: String,
-    tripNotificationText: String,
+    platformParams: ReadableArray?,
     promise: Promise?
   ) {
-    nativeSdkWrapper.setup(
-      userId,
-      accessToken,
-      refreshToken,
-      projectId,
-      // Config
-      timelineDetectionServices,
-      drivingServices,
-      walkingServices,
-      options,
-      // Platform config
-      recognitionNotificationTitle,
-      recognitionNotificationText,
-      tripNotificationTitle,
-      tripNotificationText,
-      promise = promise
-    )
+    try {
+      val authMap = auth?.toHashMap() ?: throw IllegalArgumentException("Auth object is null")
+      val userId = authMap["userId"] as String
+      val accessToken = authMap["accessToken"] as String
+      val refreshToken = authMap["refreshToken"] as String
+      val projectId = authMap["projectId"] as Double
+
+      config ?: throw IllegalArgumentException("Config object is null")
+      val timelineDetectionServices = config.getArray("timelineDetectionServices")!!
+      val drivingServices = config.getArray("drivingServices")!!
+      val walkingServices = config.getArray("walkingServices")!!
+
+      val platformParamsIterator = platformParams?.toArrayList()?.iterator()
+        ?: throw IllegalArgumentException("Platform Params object is null")
+      val recognitionNotificationTitle = platformParamsIterator.next() as String
+      val recognitionNotificationText = platformParamsIterator.next() as String
+      val tripNotificationTitle = platformParamsIterator.next() as String
+      val tripNotificationText = platformParamsIterator.next() as String
+
+      nativeSdkWrapper.setup(
+        userId = userId,
+        accessToken = accessToken,
+        refreshToken = refreshToken,
+        projectId = projectId.toInt(),
+        timelineDetectionServices = timelineDetectionServices,
+        drivingServices = drivingServices,
+        walkingServices = walkingServices,
+        options = options,
+        recognitionNotificationTitle = recognitionNotificationTitle,
+        recognitionNotificationText = recognitionNotificationText,
+        tripNotificationTitle = tripNotificationTitle,
+        tripNotificationText = tripNotificationText,
+        promise = promise
+      )
+    } catch (e: Exception) {
+      Log.e(LOG_TAG, "Error during setup", e)
+    }
   }
 
   @ReactMethod
   fun setupWithCode(
-    code: String,
-    // Config
-    timelineDetectionServices: ReadableArray,
-    drivingServices: ReadableArray,
-    walkingServices: ReadableArray,
+    code: String?,
+    config: ReadableMap?,
     options: ReadableMap?,
-    // Platform config
-    recognitionNotificationTitle: String,
-    recognitionNotificationText: String,
-    tripNotificationTitle: String,
-    tripNotificationText: String,
+    platformParams: ReadableArray?,
     promise: Promise?
   ) {
-    nativeSdkWrapper.setup(
-      code,
-      // Config
-      timelineDetectionServices,
-      drivingServices,
-      walkingServices,
-      options,
-      // Platform config
-      recognitionNotificationTitle,
-      recognitionNotificationText,
-      tripNotificationTitle,
-      tripNotificationText,
-      promise = promise
-    )
+    try {
+      code ?: throw IllegalArgumentException("Code is null")
+      config ?: throw IllegalArgumentException("Config object is null")
+      val timelineDetectionServices = config.getArray("timelineDetectionServices")!!
+      val drivingServices = config.getArray("drivingServices")!!
+      val walkingServices = config.getArray("walkingServices")!!
+
+      val platformParamsIterator = platformParams?.toArrayList()?.iterator()
+        ?: throw IllegalArgumentException("Platform Params object is null")
+      val recognitionNotificationTitle = platformParamsIterator.next() as String
+      val recognitionNotificationText = platformParamsIterator.next() as String
+      val tripNotificationTitle = platformParamsIterator.next() as String
+      val tripNotificationText = platformParamsIterator.next() as String
+
+      nativeSdkWrapper.setup(
+        code = code,
+        timelineDetectionServices = timelineDetectionServices,
+        drivingServices = drivingServices,
+        walkingServices = walkingServices,
+        options = options,
+        recognitionNotificationTitle = recognitionNotificationTitle,
+        recognitionNotificationText = recognitionNotificationText,
+        tripNotificationTitle = tripNotificationTitle,
+        tripNotificationText = tripNotificationText,
+        promise = promise
+      )
+    } catch (e: Exception) {
+      Log.e(LOG_TAG, "Error during setup", e)
+    }
   }
 
   @ReactMethod
@@ -334,17 +353,19 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
 
   @ReactMethod
   fun updateConfig(
-    timelineDetectionServices: ReadableArray,
-    drivingServices: ReadableArray,
-    walkingServices: ReadableArray,
-    options: ReadableMap?,
+    config: ReadableMap?,
+    options: ReadableMap?
   ) {
-    nativeSdkWrapper.updateConfig(
-      timelineDetectionServices,
-      drivingServices,
-      walkingServices,
-      options
-    )
+    try {
+      nativeSdkWrapper.updateConfig(
+        timelineDetectionServices = config?.getArray("timelineDetectionServices")!!,
+        drivingServices = config.getArray("drivingServices")!!,
+        walkingServices = config.getArray("walkingServices")!!,
+        options
+      )
+    } catch (e: Exception) {
+      Log.e(LOG_TAG, "Error updating config", e)
+    }
   }
 
   @ReactMethod

package/android/src/turbo/MoveSdkModule.kt

@@ -213,7 +213,7 @@ class MoveSdkModule internal constructor(context: ReactApplicationContext) :
       val userId = authMap["userId"] as String
       val accessToken = authMap["accessToken"] as String
       val refreshToken = authMap["refreshToken"] as String
-      val projectId = authMap["projectId"] as Int
+      val projectId = authMap["projectId"] as Double
 
       config ?: throw IllegalArgumentException("Config object is null")
       val timelineDetectionServices = config.getArray("timelineDetectionServices")!!
@@ -231,7 +231,7 @@ class MoveSdkModule internal constructor(context: ReactApplicationContext) :
         userId = userId,
         accessToken = accessToken,
         refreshToken = refreshToken,
-        projectId = projectId,
+        projectId = projectId.toInt(),
         timelineDetectionServices = timelineDetectionServices,
         drivingServices = drivingServices,
         walkingServices = walkingServices,

package/ios/MoveSdk.mm

@@ -532,7 +532,7 @@ RCT_EXPORT_METHOD(updateConfig: (NSDictionary *)config
   id drivingServices = config[@"drivingServices"];
   id walkingServices = config[@"walkingServices"];
 
-  [MoveSDKInstance.shared updateConfig: detectionServices drivingServices: drivingServices walkingServices: walkingServices, options: opt];
+  [MoveSDKInstance.shared updateConfig: detectionServices drivingServices: drivingServices walkingServices: walkingServices options: opt];
 }
 
 RCT_EXPORT_METHOD(getState: (RCTPromiseResolveBlock)resolve

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-move-sdk",
-  "version": "2.14.0-1",
+  "version": "2.14.1",
   "description": "React Native library for MOVE SDK",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",