Hotfix/android camera msdk

common/index.ts

@@ -55,10 +55,14 @@ export {
   SelfAppBuilder,
   bigIntToString,
   brutforceSignatureAlgorithmDsc,
+  buildSMT,
+  calculateUserIdentifierHash,
   findStartPubKeyIndex,
   formatEndpoint,
   formatMrz,
   genAndInitMockPassportData,
+  genMockIdDoc,
+  genMockIdDocAndInitDataParsing,
   generateCircuitInputsDSC,
   generateCircuitInputsRegister,
   generateCircuitInputsVCandDisclose,
@@ -69,28 +73,17 @@ export {
   getLeafCscaTree,
   getLeafDscTree,
   getSKIPEM,
+  getSolidityPackedUserContextData,
   getUniversalLink,
   hashEndpointWithScope,
   initElliptic,
   initPassportDataParsing,
   parseCertificateSimple,
   parseDscCertificateData,
-  genMockIdDoc,
-  genMockIdDocAndInitDataParsing,
-  buildSMT,
-  calculateUserIdentifierHash,
-  getSolidityPackedUserContextData,
   stringToBigInt,
 } from './src/utils/index.js';
 
-export {
-  prepareAadhaarRegisterTestData,
-  prepareAadhaarDiscloseTestData,
-  prepareAadhaarRegisterData,
-} from './src/utils/aadhaar/mockData.js';
-export { generateTestData, testCustomData } from './src/utils/aadhaar/utils.js';
 export { createSelector } from './src/utils/aadhaar/constants.js';
-
 // Hash utilities
 export {
   customHasher,
@@ -99,3 +92,11 @@ export {
   hash,
   packBytesAndPoseidon,
 } from './src/utils/hash.js';
+
+export { generateTestData, testCustomData } from './src/utils/aadhaar/utils.js';
+
+export {
+  prepareAadhaarDiscloseTestData,
+  prepareAadhaarRegisterData,
+  prepareAadhaarRegisterTestData,
+} from './src/utils/aadhaar/mockData.js';

packages/mobile-sdk-alpha/android/build.gradle

@@ -96,6 +96,7 @@ android {
         exclude 'META-INF/androidx.exifinterface_exifinterface.version'
         pickFirst '**/libc++_shared.so'
         pickFirst '**/libjsc.so'
+        pickFirst 'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
     }
 }
 
@@ -155,4 +156,8 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.12.0'
 
     implementation 'com.github.mhshams:jnbis:2.0.2'
+
+    // QR Code scanning dependencies
+    implementation 'com.google.zxing:core:3.5.2'
+    implementation 'com.google.zxing:android-core:3.3.0'
 }

packages/mobile-sdk-alpha/android/src/main/java/com/selfxyz/selfSDK/RNSelfPassportReaderPackage.kt

@@ -25,11 +25,15 @@ class RNSelfPassportReaderPackage : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
         return listOf(
           RNSelfPassportReaderModule(reactContext),
-          SelfMRZScannerModule(reactContext)
+          SelfMRZScannerModule(reactContext),
+          SelfQRScannerModule(reactContext)
         )
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return listOf(SelfOCRViewManager(reactContext))
+        return listOf(
+            SelfOCRViewManager(reactContext),
+            SelfQRScannerViewManager(reactContext)
+        )
     }
 }

packages/mobile-sdk-alpha/android/src/main/java/com/selfxyz/selfSDK/SelfMRZScannerModule.kt

@@ -22,36 +22,104 @@ ReactContextBaseJavaModule(reactContext), CameraMLKitFragment.CameraMLKitCallbac
     override fun getName() = "SelfMRZScannerModule"
 
     private var scanPromise: Promise? = null
+    private var currentContainer: FrameLayout? = null
+    private var currentFragment: CameraMLKitFragment? = null
 
     @ReactMethod
     fun startScanning(promise: Promise) {
-      scanPromise = promise
-        val activity = reactApplicationContext.currentActivity as? FragmentActivity ?: return
-
-      activity.runOnUiThread {
-        val container = FrameLayout(activity)
-        val containerId = View.generateViewId()
-        container.id = containerId
-
-        activity.addContentView(container, ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
-        ))
-
-        activity.supportFragmentManager
-            .beginTransaction()
-            .replace(containerId, CameraMLKitFragment(this))
-            .commit()
+        val activity = reactApplicationContext.currentActivity as? FragmentActivity
+        if (currentFragment != null || currentContainer != null || scanPromise != null) {
+            promise.reject("E_SCAN_IN_PROGRESS", "Scanning already in progress")
+            return
+        }
+        if (activity == null) {
+            promise.reject("E_NO_ACTIVITY", "No FragmentActivity found")
+            return
+        }
+        scanPromise = promise
+
+
+        activity.runOnUiThread {
+            try {
+                val container = FrameLayout(activity)
+                // just using view.generateViewId() doesn't work.
+                val containerId = generateUnusedId(activity.window.decorView as ViewGroup)
+                container.id = containerId
+
+                container.layoutParams = ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT
+                )
+
+                container.isFocusable = true
+                container.isFocusableInTouchMode = true
+                container.setBackgroundColor(android.graphics.Color.BLACK)
+
+                activity.addContentView(container, ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT
+                ))
+
+                val fragment = CameraMLKitFragment(this@SelfMRZScannerModule)
+
+                // Store references for cleanup
+                currentContainer = container
+                currentFragment = fragment
+
+                activity.supportFragmentManager
+                    .beginTransaction()
+                    .replace(containerId, fragment)
+                    .commitNow()
+
+            } catch (e: Exception) {
+                android.util.Log.e("SelfMRZScannerModule", "Error in startScanning", e)
+                promise.reject("E_SCANNING_ERROR", e.message, e)
+                cleanup()
+            }
         }
     }
 
     override fun onPassportRead(mrzInfo: MRZInfo) {
         scanPromise?.resolve(mrzInfo.toString())
         scanPromise = null
+        cleanup()
     }
 
     override fun onError(e: Exception) {
         scanPromise?.reject(e)
         scanPromise = null
+        cleanup()
+    }
+
+    private fun generateUnusedId(root: ViewGroup): Int {
+        var id: Int
+        do { id = View.generateViewId() } while (root.findViewById<View>(id) != null)
+        return id
+    }
+
+    private fun cleanup() {
+        val activity = reactApplicationContext.currentActivity as? FragmentActivity
+        val fragment = currentFragment
+        val container = currentContainer
+        currentFragment = null
+        currentContainer = null
+        scanPromise = null
+
+        if (activity != null && fragment != null && container != null) {
+            activity.runOnUiThread {
+                try {
+                    activity.supportFragmentManager
+                        .beginTransaction()
+                        .remove(fragment)
+                        .commitAllowingStateLoss()
+
+                    (container.parent as? ViewGroup)?.removeView(container)
+
+                    android.util.Log.d("SelfMRZScannerModule", "Cleaned up fragment and container")
+                } catch (e: Exception) {
+                    android.util.Log.e("SelfMRZScannerModule", "Error during cleanup", e)
+                }
+            }
+        }
     }
 }

packages/mobile-sdk-alpha/android/src/main/java/com/selfxyz/selfSDK/SelfOCRViewManager.kt

@@ -29,8 +29,9 @@ class SelfOCRViewManager(
 
     override fun getName() = REACT_CLASS
 
-    override fun createViewInstance(reactContext: ThemedReactContext) =
-      FrameLayout(reactContext)
+    override fun createViewInstance(reactContext: ThemedReactContext): FrameLayout {
+        return FrameLayout(reactContext)
+    }
 
     override fun getCommandsMap() = mapOf(
         "create" to COMMAND_CREATE,
@@ -43,11 +44,50 @@ class SelfOCRViewManager(
         args: ReadableArray?
     ) {
         super.receiveCommand(root, commandId, args)
-        val reactNativeViewId = requireNotNull(args).getInt(0)
 
-        when (commandId.toInt()) {
-            COMMAND_CREATE -> createFragment(root, reactNativeViewId)
-            COMMAND_DESTROY -> destroyFragment(root, reactNativeViewId)
+        val reactNativeViewId = args?.getInt(0)
+        if (reactNativeViewId == null) {
+            android.util.Log.w("SelfOCRViewManager", "receiveCommand called with null or empty args for command: $commandId")
+            return
+        }
+
+        when (commandId) {
+            "create" -> {
+                createFragment(root, reactNativeViewId)
+            }
+            "destroy" -> {
+                destroyFragment(root, reactNativeViewId)
+            }
+            else -> {
+                android.util.Log.w("SelfOCRViewManager", "Unknown command: $commandId")
+            }
+        }
+    }
+
+    // Alternative method signature for newer React Native versions
+    override fun receiveCommand(
+        root: FrameLayout,
+        commandId: Int,
+        args: ReadableArray?
+    ) {
+        super.receiveCommand(root, commandId, args)
+
+        val reactNativeViewId = args?.getInt(0)
+        if (reactNativeViewId == null) {
+            android.util.Log.w("SelfOCRViewManager", "receiveCommand called with null or empty args for command: $commandId")
+            return
+        }
+
+        when (commandId) {
+            COMMAND_CREATE -> {
+                createFragment(root, reactNativeViewId)
+            }
+            COMMAND_DESTROY -> {
+                destroyFragment(root, reactNativeViewId)
+            }
+            else -> {
+                android.util.Log.w("SelfOCRViewManager", "Unknown command: $commandId")
+            }
         }
     }
 
@@ -57,18 +97,55 @@ class SelfOCRViewManager(
         if (index == 1) propHeight = value
     }
 
+    // @ReactProp(name = "width")
+    // fun setWidth(view: FrameLayout, width: Int) {
+    //     propWidth = width
+    // }
+
+    // @ReactProp(name = "height")
+    // fun setHeight(view: FrameLayout, height: Int) {
+    //     propHeight = height
+    // }
+
     private fun createFragment(root: FrameLayout, reactNativeViewId: Int) {
         this.reactNativeViewId = reactNativeViewId
         val parentView = root.findViewById<ViewGroup>(reactNativeViewId)
+        if (parentView == null) {
+            android.util.Log.e("SelfOCRViewManager", "Parent view not found for ID: $reactNativeViewId")
+            return
+        }
         setupLayout(parentView)
 
+        val activity = reactContext.currentActivity as? FragmentActivity
+        if (activity == null) {
+            android.util.Log.e("SelfOCRViewManager", "No FragmentActivity found")
+            return
+        }
+
+        // Check if activity is in a valid state
+        if (activity.isFinishing || activity.isDestroyed) {
+            android.util.Log.e("SelfOCRViewManager", "Activity is finishing or destroyed")
+            return
+        }
+
         val cameraFragment = CameraMLKitFragment(this)
-        // val cameraFragment = MyFragment()
-        val activity = reactContext.currentActivity as FragmentActivity
-        activity.supportFragmentManager
-            .beginTransaction()
-            .replace(reactNativeViewId, cameraFragment, reactNativeViewId.toString())
-            .commit()
+        android.util.Log.d("SelfOCRViewManager", "Starting fragment transaction")
+
+        // Post to ensure activity is fully ready
+        activity.window.decorView.post {
+            try {
+                if (!activity.isFinishing && !activity.isDestroyed) {
+                    activity.supportFragmentManager
+                        .beginTransaction()
+                        .replace(reactNativeViewId, cameraFragment, reactNativeViewId.toString())
+                        .commitNow()
+                } else {
+                    android.util.Log.e("SelfOCRViewManager", "Activity no longer valid for fragment transaction")
+                }
+            } catch (e: Exception) {
+                android.util.Log.e("SelfOCRViewManager", "Fragment transaction failed", e)
+            }
+        }
     }
 
     private fun destroyFragment(root: FrameLayout, reactNativeViewId: Int) {
@@ -97,8 +174,8 @@ class SelfOCRViewManager(
 
     private fun manuallyLayoutChildren(view: View) {
         // propWidth and propHeight coming from react-native props
-        val width = requireNotNull(propWidth)
-        val height = requireNotNull(propHeight)
+        val width = propWidth ?: 800 // Default fallback
+        val height = propHeight ?: 800 // Default fallback
 
         view.measure(
             View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),