refactor

app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt

@@ -40,20 +40,24 @@ class OmapiApduInterface(
 
     override fun logicalChannelOpen(aid: ByteArray): Int {
         val channel = session.openLogicalChannel(aid)!!
-        val id = index.getAndAdd(1)
+        val id = index.addAndGet(1)
         channels[id] = channel
         return id
     }
 
     override fun logicalChannelClose(handle: Int) {
         val channel = channels[handle]
-        check(channel != null) { "Channel $handle does not exist" }
+        check(channel != null) {
+            "Invalid logical channel handle $handle"
+        }
         channel.close()
     }
 
     override fun transmit(handle: Int, tx: ByteArray): ByteArray {
         val channel = channels[handle]
-        check(channel != null) { "Channel $handle does not exist" }
+        check(channel != null) {
+            "Invalid logical channel handle $handle"
+        }
 
         if (runBlocking { verboseLoggingFlow.first() }) {
             Log.d(TAG, "OMAPI APDU: ${tx.encodeHex()}")

app-common/src/main/java/im/angry/openeuicc/core/usb/UsbApduInterface.kt

@@ -23,6 +23,11 @@ class UsbApduInterface(
 
     override var atr: ByteArray? = null
 
+    override val valid: Boolean
+        get() = channels.isNotEmpty()
+
+    private var channels = mutableSetOf<Int>()
+
     override fun connect() {
         ccidDescription = UsbCcidDescription.fromRawDescriptors(conn.rawDescriptors)!!
 
@@ -76,10 +81,15 @@ class UsbApduInterface(
             return -1
         }
 
+        channels.add(channelId)
+
         return channelId
     }
 
     override fun logicalChannelClose(handle: Int) {
+        check(channels.contains(handle)) {
+            "Invalid logical channel handle $handle"
+        }
         // CLOSE LOGICAL CHANNEL
         val req = manageChannelCmd(false, handle.toByte())
         val resp = transmitApduByChannel(req, handle.toByte())
@@ -87,15 +97,16 @@ class UsbApduInterface(
         if (!isSuccessResponse(resp)) {
             Log.d(TAG, "CLOSE LOGICAL CHANNEL failed: ${resp.encodeHex()}")
         }
+        channels.remove(handle)
     }
 
     override fun transmit(handle: Int, tx: ByteArray): ByteArray {
+        check(channels.contains(handle)) {
+            "Invalid logical channel handle $handle"
+        }
         return transmitApduByChannel(tx, handle.toByte())
     }
 
-    override val valid: Boolean
-        get() = atr != null
-
     private fun isSuccessResponse(resp: ByteArray): Boolean =
         resp.size >= 2 && resp[resp.size - 2] == 0x90.toByte() && resp[resp.size - 1] == 0x00.toByte()
 

app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt

@@ -23,9 +23,13 @@ class TelephonyManagerApduInterface(
 
     private var channels = mutableSetOf<Int>()
 
+    override fun connect() {
         // Do nothing
-    override fun connect() {}
+    }
-    override fun disconnect() {}
+
+    override fun disconnect() {
+        // Do nothing
+    }
 
     override fun logicalChannelOpen(aid: ByteArray): Int {
         val hex = aid.encodeHex()
@@ -38,11 +42,17 @@ class TelephonyManagerApduInterface(
     }
 
     override fun logicalChannelClose(handle: Int) {
+        check(channels.contains(handle)) {
+            "Invalid logical channel handle $handle"
+        }
         tm.iccCloseLogicalChannelByPortCompat(port.card.physicalSlotIndex, port.portIndex, handle)
         channels.remove(handle)
     }
 
     override fun transmit(handle: Int, tx: ByteArray): ByteArray {
+        check(channels.contains(handle)) {
+            "Invalid logical channel handle $handle"
+        }
         if (runBlocking { verboseLoggingFlow.first() }) {
             Log.d(TAG, "TelephonyManager APDU: ${tx.encodeHex()}")
         }