@infilectorg/infiviz-shots-react-sdk 1.0.39 → 1.0.41

package/android/build.gradle

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

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

@@ -32,7 +32,6 @@ 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) :
@@ -50,43 +49,18 @@ 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!!,universalSessionId)
+            sendEventToReact(SDKEvent.SYNC_EVENT, sessionId!!, status!!, message!!)
         }
     }
 
-    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, universalSessionId: String? = null
+        eventName: SDKEvent, sessionId: String, status: String, message: String
     ) {
         val params = Arguments.createMap().apply {
-            putString("temporarySessionID", sessionId)
+            putString("sessionId", sessionId)
             putString("status", status)
             putString("message", message)
-            putString("universalSessionID", universalSessionId)
         }
 
         if (reactContext.hasActiveReactInstance()) {
@@ -95,22 +69,6 @@ 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)
@@ -192,14 +150,30 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
         category: String,
         maxPhoto: Double,
         maxPhotoOneGo: Double,
-        metaData: ReadableMap?,
+        metaData: ReadableMap,
         promise: Promise
     ) {
         startCameraCallback = {
             promise.resolve(it)
         }
-
-        val metadataMap = convertReadableMapToStringHashMap(metaData)
+        
+        // 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
+        }
         
         InfiVizShotsSDK.startCamera(
             currentActivity!!,
@@ -230,13 +204,29 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
         metaData: ReadableMap,
         promise: Promise
     ) {
-//        val metadataMap = metaData.toStringHashMap()
+        // 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
+        }
         
         InfiVizShotsSDK.retakeImage(
             currentActivity!!,
             temporarySessionId,
             imageURI,
-//            metadataMap,
+            metadataMap,
             object : SDKCallback<String> {
                 override fun onSuccess(response: String) {
                     promise.resolve(response)
@@ -275,11 +265,27 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
     @ReactMethod
     fun resumeCamera(
         tempSessionId: String,
-        metaData: ReadableMap?,
+        metaData: ReadableMap,
         promise: Promise
     ) {
-        val metadataMap = convertReadableMapToStringHashMap(metaData)
-
+        // 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
+        }
+        
         InfiVizShotsSDK.resumeCamera(
             currentActivity!!,
             tempSessionId, 22, metadataMap, object : SDKCallback<String?> {

package/ios/InfivizShotSDK.xcframework/ios-arm64/InfivizShotSDK.framework/Headers/InfivizShotSDK-Swift.h

@@ -368,19 +368,18 @@ SWIFT_CLASS_NAMED("DBActionBucket")
 @end
 
 
-@class DBActionType;
 
 @interface DBActionBucket (SWIFT_EXTENSION(InfivizShotSDK))
-- (void)insertObject:(DBActionType * _Nonnull)value inActionTypesAtIndex:(NSInteger)idx;
-- (void)removeObjectFromActionTypesAtIndex:(NSInteger)idx;
-- (void)insertActionTypes:(NSArray<DBActionType *> * _Nonnull)values atIndexes:(NSIndexSet * _Nonnull)indexes;
-- (void)removeActionTypesAtIndexes:(NSIndexSet * _Nonnull)indexes;
-- (void)replaceObjectInActionTypesAtIndex:(NSInteger)idx withObject:(DBActionType * _Nonnull)value;
-- (void)replaceActionTypesAtIndexes:(NSIndexSet * _Nonnull)indexes withActionTypes:(NSArray<DBActionType *> * _Nonnull)values;
-- (void)addActionTypesObject:(DBActionType * _Nonnull)value;
-- (void)removeActionTypesObject:(DBActionType * _Nonnull)value;
-- (void)addActionTypes:(NSSet<DBActionType *> * _Nonnull)values;
-- (void)removeActionTypes:(NSSet<DBActionType *> * _Nonnull)values;
+- (void)insertObject:(DBAction * _Nonnull)value inActionsAtIndex:(NSInteger)idx;
+- (void)removeObjectFromActionsAtIndex:(NSInteger)idx;
+- (void)insertActions:(NSArray<DBAction *> * _Nonnull)values atIndexes:(NSIndexSet * _Nonnull)indexes;
+- (void)removeActionsAtIndexes:(NSIndexSet * _Nonnull)indexes;
+- (void)replaceObjectInActionsAtIndex:(NSInteger)idx withObject:(DBAction * _Nonnull)value;
+- (void)replaceActionsAtIndexes:(NSIndexSet * _Nonnull)indexes withActions:(NSArray<DBAction *> * _Nonnull)values;
+- (void)addActionsObject:(DBAction * _Nonnull)value;
+- (void)removeActionsObject:(DBAction * _Nonnull)value;
+- (void)addActions:(NSSet<DBAction *> * _Nonnull)values;
+- (void)removeActions:(NSSet<DBAction *> * _Nonnull)values;
 @end
 
 @class DBComplianceMetric;
@@ -398,18 +397,19 @@ SWIFT_CLASS_NAMED("DBActionBucket")
 - (void)removeComplianceMetrics:(NSSet<DBComplianceMetric *> * _Nonnull)values;
 @end
 
+@class DBActionType;
 
 @interface DBActionBucket (SWIFT_EXTENSION(InfivizShotSDK))
-- (void)insertObject:(DBAction * _Nonnull)value inActionsAtIndex:(NSInteger)idx;
-- (void)removeObjectFromActionsAtIndex:(NSInteger)idx;
-- (void)insertActions:(NSArray<DBAction *> * _Nonnull)values atIndexes:(NSIndexSet * _Nonnull)indexes;
-- (void)removeActionsAtIndexes:(NSIndexSet * _Nonnull)indexes;
-- (void)replaceObjectInActionsAtIndex:(NSInteger)idx withObject:(DBAction * _Nonnull)value;
-- (void)replaceActionsAtIndexes:(NSIndexSet * _Nonnull)indexes withActions:(NSArray<DBAction *> * _Nonnull)values;
-- (void)addActionsObject:(DBAction * _Nonnull)value;
-- (void)removeActionsObject:(DBAction * _Nonnull)value;
-- (void)addActions:(NSSet<DBAction *> * _Nonnull)values;
-- (void)removeActions:(NSSet<DBAction *> * _Nonnull)values;
+- (void)insertObject:(DBActionType * _Nonnull)value inActionTypesAtIndex:(NSInteger)idx;
+- (void)removeObjectFromActionTypesAtIndex:(NSInteger)idx;
+- (void)insertActionTypes:(NSArray<DBActionType *> * _Nonnull)values atIndexes:(NSIndexSet * _Nonnull)indexes;
+- (void)removeActionTypesAtIndexes:(NSIndexSet * _Nonnull)indexes;
+- (void)replaceObjectInActionTypesAtIndex:(NSInteger)idx withObject:(DBActionType * _Nonnull)value;
+- (void)replaceActionTypesAtIndexes:(NSIndexSet * _Nonnull)indexes withActionTypes:(NSArray<DBActionType *> * _Nonnull)values;
+- (void)addActionTypesObject:(DBActionType * _Nonnull)value;
+- (void)removeActionTypesObject:(DBActionType * _Nonnull)value;
+- (void)addActionTypes:(NSSet<DBActionType *> * _Nonnull)values;
+- (void)removeActionTypes:(NSSet<DBActionType *> * _Nonnull)values;
 @end
 
 @class DBKpiConfigs;
@@ -1111,11 +1111,12 @@ SWIFT_CLASS("_TtC14InfivizShotSDK13DBUserDetails")
 
 
 @interface DBUserDetails (SWIFT_EXTENSION(InfivizShotSDK))
-@property (nonatomic, copy) NSString * _Nullable clientID;
+@property (nonatomic, copy) NSString * _Nullable accountKey;
 @property (nonatomic, copy) NSString * _Nullable appID;
 @property (nonatomic, copy) NSString * _Nullable authSecret;
-@property (nonatomic, copy) NSString * _Nullable accountKey;
+@property (nonatomic, copy) NSString * _Nullable clientID;
 @property (nonatomic, copy) NSString * _Nullable userID;
+@property (nonatomic, copy) NSString * _Nullable apiToken;
 @property (nonatomic) BOOL isLoggedIn;
 @end