@finos_sdk/sdk-ekyc 1.5.0 → 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.
@@ -199,9 +263,8 @@ class EKYCModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
     @ReactMethod
     fun showRNExitSheet(bundleName: String, initialProps: ReadableMap, promise: Promise) {
-        // Fix: Move activity detection to UI thread to avoid race conditions and ensure correct window attachment
         Handler(Looper.getMainLooper()).post {
-            val activity = getTrueCurrentActivity() ?: run {
+            val activity = getSDKActivity() ?: run {
                 Log.e(TAG, "❌ showRNExitSheet failed: No visible activity found")
                 promise.reject("NO_ACTIVITY", "No visible activity found")
                 return@post
@@ -2733,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.5.0",
+  "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos_sdk/sdk-ekyc",
-  "version": "1.5.0",
+  "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 (