@onekeyfe/react-native-lite-card 1.0.6 → 1.0.8

package/android/src/main/java/so/onekey/app/wallet/lite/OKLiteManager.kt

@@ -212,13 +212,24 @@ class OKLiteManager(private val context: ReactApplicationContext) :
             it.putString("message", "show_connect_ui")
         })
         mShowDialogNumber.incrementAndGet()
-        var receiveIsoDep = lastIsoDep
         val tryReceiveResult = mNFCConnectedChannel.tryReceive()
+
+        fun IsoDep?.isSafeConnected(): Boolean {
+            return runCatching { this?.isConnected ?: false }.getOrDefault(false)
+        }
+        var receiveIsoDep: IsoDep? = null
+
         if (tryReceiveResult.isSuccess) {
-            receiveIsoDep = tryReceiveResult.getOrNull();
-        } else if (lastIsoDep == null || lastIsoDep?.isConnected == false) {
-            receiveIsoDep = mNFCConnectedChannel.receive()
+            receiveIsoDep = tryReceiveResult.getOrNull()
+            if (!receiveIsoDep.isSafeConnected()) {
+                receiveIsoDep = null
+            }
+        }
+        receiveIsoDep = when {
+            receiveIsoDep == null && lastIsoDep.isSafeConnected() -> lastIsoDep
+            else -> mNFCConnectedChannel.receive()
         }
+
         lastIsoDep = receiveIsoDep
         if (receiveIsoDep == null) {
             // 取消连接

package/android/src/main/java/so/onekey/app/wallet/lite/onekeyLite/nfc/Connection.kt

@@ -23,9 +23,14 @@ class Connection(val isoDep: IsoDep, private val mCommandGenerator: CommandGener
 
         @JvmStatic
         private fun connect(isoDep: IsoDep?) {
-            if (isoDep?.isConnected == false) {
-                isoDep.connect()
-                isoDep.timeout = 15000
+            val isConnected: Boolean = try {
+                isoDep?.isConnected ?: false
+            } catch (e: Exception) {
+                false
+            }
+            if (isConnected == false) {
+                isoDep?.connect()
+                isoDep?.timeout = 15000
             }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-lite-card",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "lite card",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",