@onekeyfe/react-native-lite-card 1.0.5 → 1.0.7

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

@@ -214,9 +214,14 @@ class OKLiteManager(private val context: ReactApplicationContext) :
         mShowDialogNumber.incrementAndGet()
         var receiveIsoDep = lastIsoDep
         val tryReceiveResult = mNFCConnectedChannel.tryReceive()
+        val lastIsoDepIsConnected: Boolean = try {
+            lastIsoDep?.isConnected ?: false
+        } catch (e: Exception) {
+            false
+        }
         if (tryReceiveResult.isSuccess) {
             receiveIsoDep = tryReceiveResult.getOrNull();
-        } else if (lastIsoDep == null || lastIsoDep?.isConnected == false) {
+        } else if (lastIsoDepIsConnected == false) {
             receiveIsoDep = mNFCConnectedChannel.receive()
         }
         lastIsoDep = receiveIsoDep

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/ios/Classes/OKNFTLite/OKLiteV1.m

@@ -260,7 +260,7 @@
   if (status == OKNFCLiteGetMncStatusWiped) {
     self.status = OKNFCLiteStatusNewCard;
   }
-  [self.delegate endNFCSessionWithError:status == OKNFCLiteGetMncStatusError || status == OKNFCLiteGetMncStatusPinNotMatch];
+  [self.delegate endNFCSessionWithError:status == OKNFCLiteGetMncStatusError || status == OKNFCLiteGetMncStatusPinNotMatch || status == OKNFCLiteGetMncStatusWiped];
   callback(self,mnc,status);
 }
 
@@ -577,13 +577,20 @@
 }
 
 - (OKNFCLiteChangePinResult)setNewPin:(NSString *)newPin withOldPin:(NSString *)oldPin {
+  static const u_int8_t AuthenticationLockCode = 0x69;
+  static const u_int8_t AuthenticationLockSw2Code = 0x83;
+  static const u_int8_t FailedVerificationCode = 0x63;
+  static const u_int8_t PinRTLBitMask = 0x0f;
   __block OKNFCLiteChangePinResult result = OKNFCLiteChangePinResultError;
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
   OKLiteCommandModal *modal = [[OKLiteCommandModal alloc] initWithCommand:OKLiteCommandChangePIN version:self.version];
   modal.parseResp = true;
   [self.commandTool sendCommandWithAPDU:[modal changePIN:oldPin newPin:newPin] modal:modal completionHandler:^(NSData * _Nonnull responseData, uint8_t sw1, uint8_t sw2, NSError * _Nullable error, NSString * _Nonnull parseRespon) {
     if (sw1 != OKNFC_SW1_OK) {
-      if (sw1 == 0x63) {
+      if (sw1 == FailedVerificationCode) {
+        self.pinRTL = sw2 & PinRTLBitMask;
+      } else if (sw1 == AuthenticationLockCode && sw2 == AuthenticationLockSw2Code) {
+        self.pinRTL = 0;
         result = OKNFCLiteChangePinResultWiped;
       }
       dispatch_semaphore_signal(sema);

package/package.json

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