@finos_sdk/sdk-ekyc 1.4.9 → 1.5.1

package/android/src/main/java/finos/sdk/ekyc/EKYCModule.kt

@@ -66,7 +66,10 @@ import java.io.FileInputStream
 import java.io.InputStream
 import java.util.Date
 import android.app.Activity
+import android.app.Application
+import android.os.Bundle
 import android.view.ViewGroup
+import java.lang.ref.WeakReference
 
 @ReactModule(name = EKYCModule.NAME)
 class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
@@ -74,10 +77,71 @@ class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     companion object {
         const val NAME = "EKYCModule"
         private const val TAG = "EKYCModule"
+
+        // Full class name của SDK activity duy nhất
+        private const val SDK_EKYC_ACTIVITY = "finos.sdk.ekyc.sdkui.SDKeKYCActivity"
     }
 
     override fun getName(): String = NAME
 
+    /**
+     * WeakReference tới SDK activity đang foreground.
+     * Được set/clear bởi ActivityLifecycleCallbacks khi SDK activity resume/pause.
+     * @Volatile: viết từ UI thread (lifecycle callback), đọc từ JS bridge thread (showRNExitSheet).
+     * WeakReference để tránh memory leak nếu activity bị destroy mà chưa clear.
+     */
+    @Volatile
+    private var activeSdkActivity: WeakReference<Activity>? = null
+
+    private val sdkActivityLifecycleCallbacks = object : Application.ActivityLifecycleCallbacks {
+        override fun onActivityResumed(activity: Activity) {
+            if (isSDKActivity(activity)) {
+                activeSdkActivity = WeakReference(activity)
+                Log.d(TAG, "📌 SDK Activity resumed: ${activity.javaClass.simpleName}")
+            }
+        }
+        override fun onActivityPaused(activity: Activity) {
+            if (activeSdkActivity?.get() == activity) {
+                activeSdkActivity = null
+                Log.d(TAG, "📌 SDK Activity paused: ${activity.javaClass.simpleName}")
+            }
+        }
+        override fun onActivityDestroyed(activity: Activity) {
+            if (activeSdkActivity?.get() == activity) {
+                activeSdkActivity = null
+                Log.d(TAG, "📌 SDK Activity destroyed: ${activity.javaClass.simpleName}")
+            }
+        }
+        override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
+        override fun onActivityStarted(activity: Activity) {}
+        override fun onActivityStopped(activity: Activity) {}
+        override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+    }
+
+    private fun isSDKActivity(activity: Activity): Boolean {
+        return activity.javaClass.name == SDK_EKYC_ACTIVITY
+    }
+
+    init {
+        // Đăng ký lifecycle callback để track SDK activity tự động
+        val app = reactContext.applicationContext as? Application
+        app?.registerActivityLifecycleCallbacks(sdkActivityLifecycleCallbacks)
+            ?: Log.w(TAG, "⚠️ Could not register ActivityLifecycleCallbacks")
+    }
+
+    /**
+     * Lấy SDK activity đang active, fallback về getTrueCurrentActivity() nếu không có.
+     */
+    private fun getSDKActivity(): Activity? {
+        val sdk = activeSdkActivity?.get()
+        if (sdk != null && !sdk.isFinishing && !sdk.isDestroyed) {
+            Log.d(TAG, "✅ Using tracked SDK Activity: ${sdk.javaClass.simpleName}")
+            return sdk
+        }
+        Log.d(TAG, "⚠️ No active SDK activity tracked, falling back to getTrueCurrentActivity")
+        return getTrueCurrentActivity()
+    }
+
     /**
      * Reference tới BottomSheetDialog hiện đang hiển thị.
      * @Volatile: resolveExit() chạy trên JS bridge thread, đọc field này được viết bởi UI thread.
@@ -92,97 +156,153 @@ class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     private var exitSheetResolvedViaButton = false
 
     private fun getTrueCurrentActivity(): Activity? {
-        // Try React Native's currentActivity first
+        // Try React Native's currentActivity first as a baseline
         val rnActivity = currentActivity
-        if (rnActivity != null && rnActivity.javaClass.simpleName != "MainActivity") {
+        
+        Log.d(TAG, "🔍 getTrueCurrentActivity check: rnActivity=${rnActivity?.javaClass?.simpleName}")
+
+        // If rnActivity is already an SDK activity, we can likely trust it
+        if (rnActivity != null && rnActivity.javaClass.name.startsWith("finos.sdk.")) {
+            Log.d(TAG, "✅ Current activity is already an SDK activity: ${rnActivity.javaClass.simpleName}")
             return rnActivity
         }
 
-        // If RN gives us MainActivity or null, but we know an SDK is showing, 
-        // we must find the actual top activity via reflection or ActivityThread
+        // Use reflection to find the absolute top resumed activity.
+        // This is crucial when the SDK is running in a native Activity on top of the RN Activity,
+        // and currentActivity might still point to the background Activity.
+        try {
+            val topActivity = findTopActivityViaReflection()
+            if (topActivity != null) {
+                Log.d(TAG, "✅ Found top activity via reflection: ${topActivity.javaClass.simpleName}")
+                return topActivity
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to find top activity via reflection", e)
+        }
+        
+        Log.d(TAG, "⚠️ Fallback to rnActivity: ${rnActivity?.javaClass?.simpleName}")
+        return rnActivity
+    }
+
+    /**
+     * Finds the top-most resumed activity using ActivityThread's internal records.
+     */
+    private fun findTopActivityViaReflection(): Activity? {
         try {
             val activityThreadClass = Class.forName("android.app.ActivityThread")
-            val activityThread = activityThreadClass.getMethod("currentActivityThread").invoke(null)
+            val activityThread = activityThreadClass.getMethod("currentActivityThread").invoke(null) ?: return null
             val activitiesField = activityThreadClass.getDeclaredField("mActivities")
             activitiesField.isAccessible = true
             
-            val activities = activitiesField.get(activityThread) as Map<Any, Any>
-            Log.d(TAG, "🔍 Scanning ${activities.size} activities...")
-            
-            var topActivity: Activity? = null
+            val activities = activitiesField.get(activityThread) as? Map<*, *> ?: return null
+            Log.d(TAG, "🔍 Scanning ${activities.size} activities via reflection...")
             
+            var bestCandidate: Activity? = null
+            var highestPriority = -1
+
             for (activityRecord in activities.values) {
-                val activityRecordClass = activityRecord.javaClass
-                
-                val activityField = activityRecordClass.getDeclaredField("activity")
-                activityField.isAccessible = true
-                val activity = activityField.get(activityRecord) as Activity
-                
-                val pausedField = activityRecordClass.getDeclaredField("paused")
-                pausedField.isAccessible = true
-                val isPaused = pausedField.get(activityRecord) as Boolean
-                
-                val stoppedField = activityRecordClass.getDeclaredField("stopped")
-                stoppedField.isAccessible = true
-                val isStopped = stoppedField.get(activityRecord) as Boolean
-                
-                Log.d(TAG, "   - Found: ${activity.javaClass.simpleName} (Paused: $isPaused, Stopped: $isStopped, Finishing: ${activity.isFinishing})")
-                
-                if (!activity.isFinishing && !isStopped) {
-                    topActivity = activity
-                    if (!isPaused) break // Found the resumed one
+                if (activityRecord == null) continue
+                try {
+                    val activityRecordClass = activityRecord.javaClass
+                    val activityField = activityRecordClass.getDeclaredField("activity")
+                    activityField.isAccessible = true
+                    val activity = activityField.get(activityRecord) as? Activity ?: continue
+
+                    if (activity.isFinishing) continue
+
+                    val pausedField = activityRecordClass.getDeclaredField("paused")
+                    pausedField.isAccessible = true
+                    val isPaused = pausedField.get(activityRecord) as Boolean
+
+                    val stoppedField = activityRecordClass.getDeclaredField("stopped")
+                    stoppedField.isAccessible = true
+                    val isStopped = stoppedField.get(activityRecord) as Boolean
+
+                    if (isStopped) continue
+
+                    // Identity check: prioritize known SDK activity patterns
+                    val className = activity.javaClass.name
+                    val isSDK = className.startsWith("finos.sdk.") || 
+                               className.contains("EKYC", ignoreCase = true) ||
+                               className.contains("Liveness", ignoreCase = true) ||
+                               className.contains("OCR", ignoreCase = true) ||
+                               className.contains("NFC", ignoreCase = true)
+
+                    // Priority scoring:
+                    // 3: Resumed SDK Activity
+                    // 2: Resumed App Activity
+                    // 1: Paused SDK Activity
+                    // 0: Paused App Activity
+                    val currentPriority = (if (isSDK) 1 else 0) + (if (!isPaused) 2 else 0)
+
+                    Log.v(TAG, "   [Audit] ${activity.javaClass.simpleName} -> Prio: $currentPriority (SDK=$isSDK, Paused=$isPaused)")
+
+                    if (currentPriority > highestPriority) {
+                        highestPriority = currentPriority
+                        bestCandidate = activity
+                    }
+
+                    // Optimization: Found the absolute best target
+                    if (highestPriority == 3) break
+
+                } catch (e: Exception) {
+                    // Silently continue for individual activity record failures
                 }
             }
-            return topActivity ?: rnActivity
+            
+            if (bestCandidate != null) {
+                Log.d(TAG, "✅ Best candidate found: ${bestCandidate.javaClass.simpleName} (Prio: $highestPriority)")
+            }
+            
+            return bestCandidate
         } catch (e: Exception) {
-            Log.e(TAG, "Error finding true current activity", e)
+            Log.e(TAG, "❌ Critical error in findTopActivityViaReflection", e)
+            return null
         }
-        
-        return rnActivity
     }
 
     @ReactMethod
     fun showRNExitSheet(bundleName: String, initialProps: ReadableMap, promise: Promise) {
-        val activity = getTrueCurrentActivity() ?: run {
-            Log.e(TAG, "❌ showRNExitSheet failed: No visible activity found")
-            promise.reject("NO_ACTIVITY", "No visible activity found")
-            return
-        }
-
-        if (activity.isFinishing || activity.isDestroyed) {
-            Log.e(TAG, "❌ showRNExitSheet failed: Activity is finishing/destroyed")
-            promise.reject("ACTIVITY_INVALID", "Activity is finishing or destroyed")
-            return
-        }
+        Handler(Looper.getMainLooper()).post {
+            val activity = getSDKActivity() ?: run {
+                Log.e(TAG, "❌ showRNExitSheet failed: No visible activity found")
+                promise.reject("NO_ACTIVITY", "No visible activity found")
+                return@post
+            }
 
-        // Guard chống double-resolve/reject promise (vì có nhiều entry point: sync error, async listener, exception)
-        val promiseSettled = java.util.concurrent.atomic.AtomicBoolean(false)
-        fun safeResolve(value: Any?) {
-            if (promiseSettled.compareAndSet(false, true)) promise.resolve(value)
-        }
-        fun safeReject(code: String, msg: String, e: Throwable? = null) {
-            if (promiseSettled.compareAndSet(false, true)) {
-                if (e != null) promise.reject(code, msg, e) else promise.reject(code, msg)
+            if (activity.isFinishing || (android.os.Build.VERSION.SDK_INT >= 17 && activity.isDestroyed)) {
+                Log.e(TAG, "❌ showRNExitSheet failed: Activity is finishing or destroyed")
+                promise.reject("ACTIVITY_INVALID", "Activity is finishing or destroyed")
+                return@post
             }
-        }
 
-        activity.runOnUiThread {
+            // Guard chống double-resolve/reject promise
+            val promiseSettled = java.util.concurrent.atomic.AtomicBoolean(false)
+            fun safeResolve(value: Any?) {
+                if (promiseSettled.compareAndSet(false, true)) promise.resolve(value)
+            }
+            fun safeReject(code: String, msg: String, e: Throwable? = null) {
+                if (promiseSettled.compareAndSet(false, true)) {
+                    if (e != null) promise.reject(code, msg, e) else promise.reject(code, msg)
+                }
+            }
             try {
                 val activityName = activity.javaClass.simpleName
                 Log.d(TAG, "▶️ showRNExitSheet: Top Activity=$activityName, bundle=$bundleName")
 
                 val reactApplication = activity.application as? ReactApplication
                 if (reactApplication == null) {
-                    Log.e(TAG, "❌ Application does not implement ReactApplication")
+                    Log.e(TAG, "❌ showRNExitSheet failed: Application class (${activity.application.javaClass.name}) does not implement ReactApplication. Please ensure your Application class implements ReactApplication or provide a way for the SDK to access the ReactInstanceManager.")
                     safeReject("NO_REACT_APP", "Application does not implement ReactApplication")
-                    return@runOnUiThread
+                    return@post
                 }
                 val reactInstanceManager = reactApplication.reactNativeHost.reactInstanceManager
 
                 if (reactInstanceManager.currentReactContext != null) {
+                    Log.d(TAG, "✅ ReactContext is ready, presenting sheet...")
                     presentRNBottomSheet(activity, reactInstanceManager, bundleName, initialProps,
                         ::safeResolve, ::safeReject)
-                    return@runOnUiThread
+                    return@post
                 }
 
                 // Context chưa sẵn sàng: chờ listener
@@ -212,7 +332,7 @@ class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
                     Log.d(TAG, "✅ ReactContext init xong giữa lúc add listener — present luôn")
                     presentRNBottomSheet(activity, reactInstanceManager, bundleName, initialProps,
                         ::safeResolve, ::safeReject)
-                    return@runOnUiThread
+                    return@post
                 }
 
                 // Chỉ trigger background create nếu chưa start (tránh IllegalStateException)
@@ -250,12 +370,17 @@ class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
         safeReject: (String, String, Throwable?) -> Unit
     ) {
         try {
+            val minHeightPx = (400 * activity.resources.displayMetrics.density).toInt()
             val container = LinearLayout(activity).apply {
                 orientation = LinearLayout.VERTICAL
                 setBackgroundColor(Color.TRANSPARENT)
+                minimumHeight = minHeightPx
             }
 
             val rootView = ReactRootView(activity)
+            // Hardening: Set a minimum height to ensure the sheet is visible even before RN finishes layout
+            rootView.minimumHeight = minHeightPx
+            
             rootView.layoutParams = LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT
@@ -328,7 +453,7 @@ class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
             bottomSheetDialog.show()
 
-            Log.d(TAG, "✅ showRNExitSheet: BottomSheetDialog shown (wrap content), bundle=$bundleName")
+            Log.d(TAG, "✅ showRNExitSheet: BottomSheetDialog shown on ${activity.javaClass.simpleName}, bundle=$bundleName")
             safeResolve(true)
         } catch (e: Exception) {
             Log.e(TAG, "❌ Exception in presentRNBottomSheet", e)
@@ -903,12 +1028,7 @@ class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
                     isActiveLiveness = isActiveLiveness ?: false,
                     isActiveLivenessColor = isActiveLivenessColor ?: false,
                     isShowCameraFont = isShowCameraFont ?: true,
-                    // Custom actions từ checkboxes (nếu có chọn)
-                    // Nếu có actions được chọn → sử dụng customActions
-                    // Nếu không có actions nào được chọn → sử dụng random actions với activeActionCount
                     customActions = customActions,
-                    // Number of random actions (1-10), only used when customActions = null
-                    // activeActionCount = 2 → 2 random actions + STRAIGHT
                     activeActionCount = activeActionCount ?: 2,
                     forceCaptureTimeout = (forceCaptureTimeout ?: 0.0).toLong(),
                     selfieImage = imageFile,
@@ -2645,15 +2765,16 @@ class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
     @ReactMethod
     fun setExitSheetHeight(heightDp: Float) {
-        val activity = getTrueCurrentActivity() ?: return
-        val heightPx = (heightDp * activity.resources.displayMetrics.density).toInt()
-        Log.d(TAG, "▶️ setExitSheetHeight: ${heightDp}dp → ${heightPx}px")
-        activity.runOnUiThread {
-            val sheet = currentExitSheet ?: return@runOnUiThread
-            if (!sheet.isShowing) return@runOnUiThread
+        Handler(Looper.getMainLooper()).post {
+            val activity = getTrueCurrentActivity() ?: return@post
+            val heightPx = (heightDp * activity.resources.displayMetrics.density).toInt()
+            Log.d(TAG, "▶️ setExitSheetHeight: ${heightDp}dp → ${heightPx}px")
+            
+            val sheet = currentExitSheet ?: return@post
+            if (!sheet.isShowing) return@post
             val bs = sheet.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
-                ?: return@runOnUiThread
-            val lp = bs.layoutParams ?: return@runOnUiThread
+                ?: return@post
+            val lp = bs.layoutParams ?: return@post
             lp.height = heightPx
             bs.layoutParams = lp
             val behavior = com.google.android.material.bottomsheet.BottomSheetBehavior.from(bs)
@@ -2675,6 +2796,10 @@ class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     override fun onCatalystInstanceDestroy() {
         super.onCatalystInstanceDestroy()
         SDKeKYCExitHandlerManager.uiListener = null
+        // Unregister lifecycle callback để tránh memory leak
+        val app = reactApplicationContext.applicationContext as? Application
+        app?.unregisterActivityLifecycleCallbacks(sdkActivityLifecycleCallbacks)
+        activeSdkActivity = null
         // Dismiss sheet nếu vẫn đang hiển thị khi RN catalyst instance destroy
         val sheet = currentExitSheet
         currentExitSheet = null

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos_sdk/sdk-ekyc",
-  "version": "1.4.9",
+  "version": "1.5.1",
   "description": "React Native SDK for eKYC - Vietnamese CCCD NFC reading, OCR, Liveness detection, Face matching, and C06, eSign, SmsOTP residence verification",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/src/components/ExitConfirmSheet.js

@@ -5,7 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const react_native_1 = require("react-native");
-const FinosEKYCModule_1 = require("../modules/FinosEKYCModule");
+// Dùng NativeModules trực tiếp để tránh circular dependency với FinosEKYCModule
+// (ExitConfirmSheet được load qua ExitSheetWrapper được import bởi FinosEKYCModule)
 const BellIcon = () => (<react_native_1.View style={styles.bellWrapper}>
     <react_native_1.View style={styles.bellMount}/>
     <react_native_1.View style={styles.bellBody}/>
@@ -17,10 +18,12 @@ const ExitConfirmSheet = (props) => {
     const confirmText = props.confirmText || 'Đồng ý';
     const cancelText = props.cancelText || 'Ở lại';
     const handleConfirm = async () => {
-        await FinosEKYCModule_1.FinosEKYC.resolveExit('CONFIRM');
+        var _a, _b;
+        await ((_b = (_a = react_native_1.NativeModules.EKYCModule) === null || _a === void 0 ? void 0 : _a.resolveExit) === null || _b === void 0 ? void 0 : _b.call(_a, 'CONFIRM'));
     };
     const handleCancel = async () => {
-        await FinosEKYCModule_1.FinosEKYC.resolveExit('CANCEL');
+        var _a, _b;
+        await ((_b = (_a = react_native_1.NativeModules.EKYCModule) === null || _a === void 0 ? void 0 : _a.resolveExit) === null || _b === void 0 ? void 0 : _b.call(_a, 'CANCEL'));
     };
     return (<react_native_1.View style={styles.container} onLayout={(e) => {
             var _a, _b;

package/dist/src/modules/FinosEKYCModule.js

@@ -826,7 +826,11 @@ const isMethod = (prop) => {
         prop === 'checkC06' ||
         prop === 'startOcr' ||
         prop === 'startLiveness' ||
-        prop === 'startFaceCompare';
+        prop === 'startFaceCompare' ||
+        prop === 'registerExitHandler' ||
+        prop === 'resolveExit' ||
+        prop === 'showRNExitSheet' ||
+        prop === 'setExitSheetComponent';
 };
 // Create a comprehensive stub object with all methods to prevent undefined errors
 const createFinosEKYCStub = () => {
@@ -856,6 +860,7 @@ const createFinosEKYCStub = () => {
         'startEkycUI', 'sendOtp', 'verifyOtp', 'resendOtp', 'initializeESign', 'openSessionId',
         'registerDevice', 'listCerts', 'verifyCert', 'listSignRequest', 'confirmSign',
         'registerRemoteSigning', 'signPdf', 'sendConfirmationDocument',
+        'registerExitHandler', 'resolveExit', 'showRNExitSheet', 'setExitSheetComponent',
         'onResume', 'onPause', 'isSDKReady', 'getSDKInfo'
     ];
     otherMethods.forEach(method => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos_sdk/sdk-ekyc",
-  "version": "1.4.9",
+  "version": "1.5.1",
   "description": "React Native SDK for eKYC - Vietnamese CCCD NFC reading, OCR, Liveness detection, Face matching, and C06, eSign, SmsOTP residence verification",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/components/ExitConfirmSheet.tsx

@@ -6,7 +6,9 @@ import {
   TouchableOpacity,
   NativeModules,
 } from 'react-native';
-import { FinosEKYC } from '../modules/FinosEKYCModule';
+
+// Dùng NativeModules trực tiếp để tránh circular dependency với FinosEKYCModule
+// (ExitConfirmSheet được load qua ExitSheetWrapper được import bởi FinosEKYCModule)
 
 const BellIcon = () => (
   <View style={styles.bellWrapper}>
@@ -23,11 +25,11 @@ const ExitConfirmSheet = (props: any) => {
   const cancelText = props.cancelText || 'Ở lại';
 
   const handleConfirm = async () => {
-    await FinosEKYC.resolveExit('CONFIRM');
+    await NativeModules.EKYCModule?.resolveExit?.('CONFIRM');
   };
 
   const handleCancel = async () => {
-    await FinosEKYC.resolveExit('CANCEL');
+    await NativeModules.EKYCModule?.resolveExit?.('CANCEL');
   };
 
   return (

package/src/modules/FinosEKYCModule.ts

@@ -1001,7 +1001,11 @@ const isMethod = (prop: string | symbol): boolean => {
         prop === 'checkC06' ||
         prop === 'startOcr' ||
         prop === 'startLiveness' ||
-        prop === 'startFaceCompare';
+        prop === 'startFaceCompare' ||
+        prop === 'registerExitHandler' ||
+        prop === 'resolveExit' ||
+        prop === 'showRNExitSheet' ||
+        prop === 'setExitSheetComponent';
 };
 
 // Create a comprehensive stub object with all methods to prevent undefined errors
@@ -1035,6 +1039,7 @@ const createFinosEKYCStub = (): FinosEKYCModule => {
         'startEkycUI', 'sendOtp', 'verifyOtp', 'resendOtp', 'initializeESign', 'openSessionId',
         'registerDevice', 'listCerts', 'verifyCert', 'listSignRequest', 'confirmSign',
         'registerRemoteSigning', 'signPdf', 'sendConfirmationDocument',
+        'registerExitHandler', 'resolveExit', 'showRNExitSheet', 'setExitSheetComponent',
         'onResume', 'onPause', 'isSDKReady', 'getSDKInfo'
     ];