@infilectorg/infiviz-shots-react-sdk 1.0.29 → 1.0.31

package/android/build.gradle

@@ -103,7 +103,7 @@ dependencies {
   implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
 
 
-  implementation 'com.infilect:infivizshots-sdk:RN-1.0.1'
+  implementation 'com.infilect:infivizshots-sdk:RN-1.0.7'
 
   testImplementation 'junit:junit:4.13.2'
   implementation 'com.github.bumptech.glide:glide:4.14.2'

package/android/src/main/java/com/infilect/infivizshotsreactsdk/InfivizShotsReactSdkModule.kt

@@ -32,6 +32,7 @@ import infilect.infiviz.infilect_client.model.ivyresponse.SDKCallback
 import infilect.infiviz.infilect_client.model.ivyresponse.UploadCallback
 import infilect.infiviz.sdkEnvironment.InfivizshotsEnvironment
 import kotlin.jvm.java
+import android.util.Log
 
 @ReactModule(name = InfivizShotsReactSdkModule.NAME)
 class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationContext) :
@@ -54,13 +55,37 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
         }
     }
 
+    fun convertReadableMapToStringHashMap(readableMap: ReadableMap?): HashMap<String, String> {
+        val result = HashMap<String, String>()
+        if(readableMap!=null){
+        val iterator = readableMap.keySetIterator()
+
+        while (iterator.hasNextKey()) {
+            val key = iterator.nextKey()
+            try {
+                result[key] = when (readableMap.getType(key)) {
+                    com.facebook.react.bridge.ReadableType.Null -> ""
+                    com.facebook.react.bridge.ReadableType.Boolean -> readableMap.getBoolean(key).toString()
+                    com.facebook.react.bridge.ReadableType.Number -> readableMap.getDouble(key).toString()
+                    com.facebook.react.bridge.ReadableType.String -> readableMap.getString(key) ?: ""
+                    else -> ""
+                }
+            } catch (e: Exception) {
+                result[key] = ""
+            }
+        }
+        }
+        return result
+    }
+
     private fun sendEventToReact(
-        eventName: SDKEvent, sessionId: String, status: String, message: String
+        eventName: SDKEvent, sessionId: String, status: String, message: String, universalSessionId: String? = null
     ) {
         val params = Arguments.createMap().apply {
             putString("sessionId", sessionId)
             putString("status", status)
             putString("message", message)
+            putString("universalSessionId", universalSessionId)
         }
 
         if (reactContext.hasActiveReactInstance()) {
@@ -69,6 +94,22 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
         }
     }
 
+    // Add this async function
+    private fun fetchUniversalSessionIdAsync(temporarySessionID: String, callback: (String?) -> Unit) {
+        InfiVizShotsSDK.fetchUniversalSessionId(
+            currentActivity,
+            temporarySessionID, object : SDKCallback<String> {
+                override fun onSuccess(sessionId: String) {
+                    callback(sessionId)
+                }
+
+                override fun onError(sdkExceptions: SDKExceptions) {
+                    Log.e("SDK", "Error fetching universal session ID", sdkExceptions)
+                    callback(null)
+                }
+            })
+    }
+
     private fun sendEventToReact(eventName: SDKEvent, sessionId: String) {
         if (reactContext.hasActiveReactInstance()) {
             reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
@@ -150,30 +191,14 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
         category: String,
         maxPhoto: Double,
         maxPhotoOneGo: Double,
-        metaData: ReadableMap,
+        metaData: ReadableMap?,
         promise: Promise
     ) {
         startCameraCallback = {
             promise.resolve(it)
         }
-        
-        // Convert ReadableMap to Map<String, Any> for metadata (non-null)
-        val metadataMap: Map<String, Any> = metaData.let { map ->
-            val result = mutableMapOf<String, Any>()
-            val iterator = map.entryIterator
-            while (iterator.hasNextKey()) {
-                val key = iterator.nextKey()
-                val value = map.getDynamic(key)
-                when {
-                    value.isNull -> result[key] = null
-                    value.isBoolean -> result[key] = value.asBoolean()
-                    value.isNumber -> result[key] = value.asDouble()
-                    value.isString -> result[key] = value.asString()
-                    else -> result[key] = value.toString()
-                }
-            }
-            result
-        }
+
+        val metadataMap = convertReadableMapToStringHashMap(metaData)
         
         InfiVizShotsSDK.startCamera(
             currentActivity!!,
@@ -204,29 +229,13 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
         metaData: ReadableMap,
         promise: Promise
     ) {
-        // Convert ReadableMap to Map<String, Any> for metadata
-        val metadataMap: Map<String, Any> = metaData.let { map ->
-            val result = mutableMapOf<String, Any>()
-            val iterator = map.entryIterator
-            while (iterator.hasNextKey()) {
-                val key = iterator.nextKey()
-                val value = map.getDynamic(key)
-                when {
-                    value.isNull -> result[key] = null
-                    value.isBoolean -> result[key] = value.asBoolean()
-                    value.isNumber -> result[key] = value.asDouble()
-                    value.isString -> result[key] = value.asString()
-                    else -> result[key] = value.toString()
-                }
-            }
-            result
-        }
+//        val metadataMap = metaData.toStringHashMap()
         
         InfiVizShotsSDK.retakeImage(
             currentActivity!!,
             temporarySessionId,
             imageURI,
-            metadataMap,
+//            metadataMap,
             object : SDKCallback<String> {
                 override fun onSuccess(response: String) {
                     promise.resolve(response)
@@ -265,27 +274,11 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
     @ReactMethod
     fun resumeCamera(
         tempSessionId: String,
-        metaData: ReadableMap,
+        metaData: ReadableMap?,
         promise: Promise
     ) {
-        // Convert ReadableMap to Map<String, Any> for metadata (non-null)
-        val metadataMap: Map<String, Any> = metaData.let { map ->
-            val result = mutableMapOf<String, Any>()
-            val iterator = map.entryIterator
-            while (iterator.hasNextKey()) {
-                val key = iterator.nextKey()
-                val value = map.getDynamic(key)
-                when {
-                    value.isNull -> result[key] = null
-                    value.isBoolean -> result[key] = value.asBoolean()
-                    value.isNumber -> result[key] = value.asDouble()
-                    value.isString -> result[key] = value.asString()
-                    else -> result[key] = value.toString()
-                }
-            }
-            result
-        }
-        
+        val metadataMap = convertReadableMapToStringHashMap(metaData)
+
         InfiVizShotsSDK.resumeCamera(
             currentActivity!!,
             tempSessionId, 22, metadataMap, object : SDKCallback<String?> {

package/ios/InfivizShotSDK.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>InfivizShotSDK.framework/InfivizShotSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>InfivizShotSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>InfivizShotSDK.framework/InfivizShotSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>InfivizShotSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/InfivizShotSDK.xcframework/ios-arm64/InfivizShotSDK.framework/Modules/InfivizShotSDK.swiftmodule/arm64-apple-ios.abi.json

@@ -82768,14 +82768,14 @@
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/MainInteractor\/InfilectSDKCameraActivityForResult.swift",
       "kind": "BooleanLiteral",
-      "offset": 13087,
+      "offset": 13151,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/MainInteractor\/InfilectSDKCameraActivityForResult.swift",
       "kind": "BooleanLiteral",
-      "offset": 13164,
+      "offset": 13228,
       "length": 5,
       "value": "false"
     },
@@ -84284,31 +84284,24 @@
       "length": 2,
       "value": "\"\""
     },
-    {
-      "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
-      "kind": "BooleanLiteral",
-      "offset": 6341,
-      "length": 4,
-      "value": "true"
-    },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 6422,
+      "offset": 6385,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 6556,
+      "offset": 6519,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 6598,
+      "offset": 6561,
       "length": 5,
       "value": "false"
     },
@@ -84322,105 +84315,105 @@
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 6910,
+      "offset": 6873,
       "length": 2,
       "value": "\"\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 6940,
+      "offset": 6903,
       "length": 2,
       "value": "\"\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 7311,
+      "offset": 7274,
       "length": 2,
       "value": "\"\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 7351,
+      "offset": 7314,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 7375,
+      "offset": 7338,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 7401,
+      "offset": 7364,
       "length": 2,
       "value": "\"\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 7440,
+      "offset": 7403,
       "length": 12,
       "value": "\"dd\/MM\/yyyy\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 7495,
+      "offset": 7458,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 7816,
+      "offset": 7779,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 7861,
+      "offset": 7824,
       "length": 1,
       "value": "2"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 7685,
+      "offset": 7648,
       "length": 4,
       "value": "true"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 8480,
+      "offset": 8443,
       "length": 9,
       "value": "\"session\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "Array",
-      "offset": 9444,
+      "offset": 9407,
       "length": 2,
       "value": "[]"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 84874,
+      "offset": 84689,
       "length": 4,
       "value": "true"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 104178,
+      "offset": 103956,
       "length": 4,
       "value": "true"
     },

package/ios/InfivizShotSDK.xcframework/ios-arm64_x86_64-simulator/InfivizShotSDK.framework/Modules/InfivizShotSDK.swiftmodule/arm64-apple-ios-simulator.abi.json

@@ -82768,14 +82768,14 @@
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/MainInteractor\/InfilectSDKCameraActivityForResult.swift",
       "kind": "BooleanLiteral",
-      "offset": 13087,
+      "offset": 13151,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/MainInteractor\/InfilectSDKCameraActivityForResult.swift",
       "kind": "BooleanLiteral",
-      "offset": 13164,
+      "offset": 13228,
       "length": 5,
       "value": "false"
     },
@@ -84284,31 +84284,24 @@
       "length": 2,
       "value": "\"\""
     },
-    {
-      "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
-      "kind": "BooleanLiteral",
-      "offset": 6341,
-      "length": 4,
-      "value": "true"
-    },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 6422,
+      "offset": 6385,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 6556,
+      "offset": 6519,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 6598,
+      "offset": 6561,
       "length": 5,
       "value": "false"
     },
@@ -84322,105 +84315,105 @@
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 6910,
+      "offset": 6873,
       "length": 2,
       "value": "\"\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 6940,
+      "offset": 6903,
       "length": 2,
       "value": "\"\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 7311,
+      "offset": 7274,
       "length": 2,
       "value": "\"\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 7351,
+      "offset": 7314,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 7375,
+      "offset": 7338,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 7401,
+      "offset": 7364,
       "length": 2,
       "value": "\"\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 7440,
+      "offset": 7403,
       "length": 12,
       "value": "\"dd\/MM\/yyyy\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 7495,
+      "offset": 7458,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 7816,
+      "offset": 7779,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "IntegerLiteral",
-      "offset": 7861,
+      "offset": 7824,
       "length": 1,
       "value": "2"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 7685,
+      "offset": 7648,
       "length": 4,
       "value": "true"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "StringLiteral",
-      "offset": 8480,
+      "offset": 8443,
       "length": 9,
       "value": "\"session\""
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "Array",
-      "offset": 9444,
+      "offset": 9407,
       "length": 2,
       "value": "[]"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 84874,
+      "offset": 84689,
       "length": 4,
       "value": "true"
     },
     {
       "filePath": "\/Users\/manish\/Documents\/Workspace\/infiviz-shots-common-ios\/Module\/Camera\/Controller\/MainView\/CameraViewController.swift",
       "kind": "BooleanLiteral",
-      "offset": 104178,
+      "offset": 103956,
       "length": 4,
       "value": "true"
     },