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,20 +80,29 @@ 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
-        return EuiccChannelImpl(
+        try {
-            context.getString(R.string.usb),
+            return EuiccChannelImpl(
-            FakeUiccPortInfoCompat(FakeUiccCardInfoCompat(EuiccChannelManager.USB_CHANNEL_ID)),
+                context.getString(R.string.usb),
-            intrinsicChannelName = usbDevice.productName,
+                FakeUiccPortInfoCompat(FakeUiccCardInfoCompat(EuiccChannelManager.USB_CHANNEL_ID)),
-            UsbApduInterface(
+                intrinsicChannelName = usbDevice.productName,
-                conn,
+                UsbApduInterface(
-                bulkIn,
+                    conn,
-                bulkOut,
+                    bulkIn,
-                context.preferenceRepository.verboseLoggingFlow
+                    bulkOut,
-            ),
+                    context.preferenceRepository.verboseLoggingFlow
-            isdrAid,
+                ),
-            context.preferenceRepository.verboseLoggingFlow,
+                isdrAid,
-            context.preferenceRepository.ignoreTLSCertificateFlow,
+                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

@@ -55,7 +55,7 @@ open class DefaultEuiccChannelManager(
             parseIsdrAidList(appContainer.preferenceRepository.isdrAidListFlow.first())
 
         return isdrAidList.firstNotNullOfOrNull {
-            Log.i(TAG, "Opening channel, trying ISD-R AID: ${it.encodeHex()}")
+            Log.i(TAG, "Opening channel, trying ISDR AID ${it.encodeHex()}")
 
             openFn(it)?.let { channel ->
                 if (channel.valid) {

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

@@ -70,12 +70,12 @@ class UsbApduInterface(
             transmitApduByChannel(req, 0)
         } catch (e: Exception) {
             e.printStackTrace()
-            return 0
+            return -1
         }
 
         if (!isSuccessResponse(resp)) {
             Log.d(TAG, "OPEN LOGICAL CHANNEL failed: ${resp.encodeHex()}")
-            return 0
+            return -1
         }
 
         val channelId = resp[0].toInt()
@@ -87,7 +87,7 @@ class UsbApduInterface(
 
         if (!isSuccessResponse(selectAidResp)) {
             Log.d(TAG, "Select DF failed : ${selectAidResp.encodeHex()}")
-            return 0
+            return -1
         }
 
         channels.add(channelId)

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

@@ -34,16 +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)
+        .filter { !it.startsWith('#') }
         .map(String::trim)
         .filter(String::isNotEmpty)
-        .mapNotNull {
+        .mapNotNull { runCatching(it::decodeHex).getOrNull() }
-            try {
-                it.decodeHex()
-            } catch (_: IllegalArgumentException) {
-                null
-            }
-        }
         .ifEmpty { listOf(EUICC_DEFAULT_ISDR_AID.decodeHex()) }
 
 fun String.prettyPrintJson(): String {