fix: usb isd-r aid fallback

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

@@ -60,7 +60,7 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
                 Log.i(DefaultEuiccChannelManager.TAG, "Is OMAPI channel, setting MSS to 60")
                 it.lpa.setEs10xMss(60)
             }
-        } catch (e: IllegalArgumentException) {
+        } catch (_: IllegalArgumentException) {
             // Failed
             Log.w(
                 DefaultEuiccChannelManager.TAG,
@@ -80,6 +80,7 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
         if (bulkIn == null || bulkOut == null) return null
         val conn = usbManager.openDevice(usbDevice) ?: return null
         if (!conn.claimInterface(usbInterface, true)) return null
+        try {
             return EuiccChannelImpl(
                 context.getString(R.string.usb),
                 FakeUiccPortInfoCompat(FakeUiccCardInfoCompat(EuiccChannelManager.USB_CHANNEL_ID)),
@@ -94,6 +95,14 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
                 context.preferenceRepository.verboseLoggingFlow,
                 context.preferenceRepository.ignoreTLSCertificateFlow,
             )
+        } catch (_: IllegalArgumentException) {
+            // Failed
+            Log.w(
+                DefaultEuiccChannelManager.TAG,
+                "USB APDU interface unavailable for ${usbDevice.vendorId}:${usbDevice.productId}."
+            )
+        }
+        return null
     }
 
     override fun cleanup() {

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

@@ -277,11 +277,7 @@ open class DefaultEuiccChannelManager(
                 )
                 try {
                     val channel = tryOpenChannelFirstValidAid {
-                        euiccChannelFactory.tryOpenUsbEuiccChannel(
+                        euiccChannelFactory.tryOpenUsbEuiccChannel(device, iface, it)
-                            device,
-                            iface,
-                            it
-                        )
                     }
                     if (channel != null && channel.lpa.valid) {
                         usbChannel = channel

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

@@ -53,7 +53,7 @@ class UsbApduInterface(
             "A9088100820101830107".decodeHex(),
             le = null,
         )
-        transmitApduByChannel(terminalCapabilities, 0,)
+        transmitApduByChannel(terminalCapabilities, 0)
     }
 
     override fun disconnect() {

app-common/src/main/java/im/angry/openeuicc/util/StringUtils.kt

@@ -34,15 +34,12 @@ fun formatFreeSpace(size: Int): String =
  * If none is found, at least EUICC_DEFAULT_ISDR_AID is returned
  */
 fun parseIsdrAidList(s: String): List<ByteArray> =
-    s.split('\n').map(String::trim).filter { !it.startsWith('#') }
+    s.split('\n')
         .map(String::trim)
-        .mapNotNull {
+        .filter { !it.startsWith('#') }
-            try {
+        .map(String::trim)
-                it.decodeHex()
+        .filter(String::isNotEmpty)
-            } catch (_: IllegalArgumentException) {
+        .mapNotNull { runCatching(it::decodeHex).getOrNull() }
-                null
-            }
-        }
         .ifEmpty { listOf(EUICC_DEFAULT_ISDR_AID.decodeHex()) }
 
 fun String.prettyPrintJson(): String {