improve compatibility

nfcim · Feb 11, 2025 · b7f4324 · b7f4324
1 parent c94ce3f
commit b7f4324
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.8
+
+* Improve compatibility
+
 ## 0.1.7
 
 * Downgrade to Flutter 3.24

diff --git a/android/src/main/kotlin/im/nfc/ccid/Ccid.kt b/android/src/main/kotlin/im/nfc/ccid/Ccid.kt
@@ -129,24 +129,42 @@ class Ccid(
 
     private fun receiveRawMessage(expectedSeq: Byte): CcidRdrToPcMessage {
         var retries = 3
-        var bytesRead: Int
+        var bytesRead = 0
+        var message: CcidRdrToPcMessage? = null
         val buffer = ByteArray(bulkIn.maxPacketSize)
-        do {
-            bytesRead = usbDeviceConnection.bulkTransfer(bulkIn, buffer, buffer.size, USB_TIMEOUT)
-        } while (bytesRead <= 0 && retries-- > 0)
-
-        if (bytesRead < HEADER_SIZE) {
-            throw CcidException("Incorrect header")
-        }
-        if (buffer[0] != MESSAGE_TYPE_RDR_TO_PC_DATABLOCK) {
-            throw CcidException("Unexpected message type")
+        var lastException: CcidException? = null
+        while (retries > 0) {
+            try {
+                bytesRead = usbDeviceConnection.bulkTransfer(bulkIn, buffer, buffer.size, USB_TIMEOUT)
+                if (bytesRead <= 0) {
+                    throw CcidException("Failed to read data")
+                }
+                if (bytesRead < HEADER_SIZE) {
+                    throw CcidException("Incorrect header")
+                }
+                if (buffer[0] != MESSAGE_TYPE_RDR_TO_PC_DATABLOCK) {
+                    throw CcidException("Unexpected message type")
+                }
+                message = CcidRdrToPcMessage.parseHeader(buffer)
+                if (message.seq != expectedSeq) {
+                    throw CcidException("Unexpected sequence number ${message.seq}, expected $expectedSeq")
+                }
+                lastException = null
+                break
+            } catch (e: CcidException) {
+                lastException = e
+                retries--
+                if (retries > 0) {
+                    Thread.sleep(100)
+                }
+            }
         }
-        val message = CcidRdrToPcMessage.parseHeader(buffer)
-        if (message.seq != expectedSeq) {
-            throw CcidException("Unexpected sequence number ${message.seq}, expected $expectedSeq")
+
+        if (lastException != null) {
+            throw lastException
         }
 
-        val dataBuffer = ByteArray(message.length)
+        val dataBuffer = ByteArray(message!!.length)
         var bytesBuffered = bytesRead - HEADER_SIZE
         System.arraycopy(buffer, HEADER_SIZE, dataBuffer, 0, bytesBuffered)
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ccid
 description: "A Flutter plugin for smart card reader using CCID protocol with PC/SC-like APIs."
-version: 0.1.7
+version: 0.1.8
 homepage: https://github.com/nfcim/ccid
 
 environment: