@infilectorg/infiviz-shots-react-sdk 1.0.43 → 1.0.46

package/android/build.gradle

@@ -64,11 +64,12 @@ android {
 
   buildTypes {
     release {
-      minifyEnabled true
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+      debuggable false
+      minifyEnabled false
     }
     debug {
       minifyEnabled false
+      debuggable true
     }
   }
 
@@ -77,8 +78,12 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  kotlinOptions {
+    jvmTarget = "1.8"
   }
 
   sourceSets {
@@ -103,7 +108,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.2.2'
 
   testImplementation 'junit:junit:4.13.2'
   implementation 'com.github.bumptech.glide:glide:4.14.2'
@@ -122,4 +127,4 @@ react {
   jsRootDir = file("../src/")
   libraryName = "InfivizShotsReactSdk"
   codegenJavaPackageName = "com.infilect.infivizshotsreactsdk"
-}
+}

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) :
@@ -49,18 +50,43 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
             val status = intent!!.getStringExtra(IntentConstants.STATUS)
             val message = intent.getStringExtra(IntentConstants.MESSAGE)
             val sessionId = intent.getStringExtra(IntentConstants.SESSION_ID)
+            val universalSessionId = intent.getStringExtra(IntentConstants.EXTERNAL_SESSION_ID)
 
-            sendEventToReact(SDKEvent.SYNC_EVENT, sessionId!!, status!!, message!!)
+            sendEventToReact(SDKEvent.SYNC_EVENT, sessionId!!, status!!, message!!,universalSessionId)
         }
     }
 
+    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("temporarySessionID", sessionId)
             putString("status", status)
             putString("message", message)
+            putString("universalSessionID", universalSessionId)
         }
 
         if (reactContext.hasActiveReactInstance()) {
@@ -69,6 +95,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 +192,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 +230,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 +275,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?> {