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

@@ -33,7 +33,7 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
 
         Log.i(DefaultEuiccChannelManager.TAG, "Trying OMAPI for physical slot ${port.card.physicalSlotIndex}")
         try {
-            return EuiccChannelImpl(
+            return EuiccChannel(
                 port,
                 OmapiApduInterface(
                     seService!!,
@@ -61,7 +61,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
-        return EuiccChannelImpl(
+        return EuiccChannel(
             FakeUiccPortInfoCompat(FakeUiccCardInfoCompat(EuiccChannelManager.USB_CHANNEL_ID)),
             UsbApduInterface(
                 conn,

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

@@ -159,16 +159,6 @@ open class DefaultEuiccChannelManager(
             findEuiccChannelByPort(physicalSlotId, portId)
         }
 
-    override suspend fun <R> withEuiccChannel(
-        physicalSlotId: Int,
-        portId: Int,
-        fn: (EuiccChannel) -> R
-    ): R {
-        val channel = findEuiccChannelByPortBlocking(physicalSlotId, portId)
-            ?: throw EuiccChannelManager.EuiccChannelNotFoundException()
-        return fn(channel)
-    }
-
     override suspend fun waitForReconnect(physicalSlotId: Int, portId: Int, timeoutMillis: Long) {
         if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) return
 

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

@@ -1,18 +1,26 @@
 package im.angry.openeuicc.core
 
 import im.angry.openeuicc.util.*
+import kotlinx.coroutines.flow.Flow
+import net.typeblog.lpac_jni.ApduInterface
 import net.typeblog.lpac_jni.LocalProfileAssistant
+import net.typeblog.lpac_jni.impl.HttpInterfaceImpl
+import net.typeblog.lpac_jni.impl.LocalProfileAssistantImpl
 
-interface EuiccChannel {
+class EuiccChannel(
-    val port: UiccPortInfoCompat
+    val port: UiccPortInfoCompat,
+    apduInterface: ApduInterface,
+    verboseLoggingFlow: Flow<Boolean>
+) {
+    val slotId = port.card.physicalSlotIndex // PHYSICAL slot
+    val logicalSlotId = port.logicalSlotIndex
+    val portId = port.portIndex
 
-    val slotId: Int // PHYSICAL slot
+    val lpa: LocalProfileAssistant =
-    val logicalSlotId: Int
+        LocalProfileAssistantImpl(apduInterface, HttpInterfaceImpl(verboseLoggingFlow))
-    val portId: Int
-
-    val lpa: LocalProfileAssistant
 
     val valid: Boolean
+        get() = lpa.valid
 
-    fun close()
+    fun close() = lpa.close()
-}
+}

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

@@ -1,26 +0,0 @@
-package im.angry.openeuicc.core
-
-import im.angry.openeuicc.util.*
-import kotlinx.coroutines.flow.Flow
-import net.typeblog.lpac_jni.ApduInterface
-import net.typeblog.lpac_jni.LocalProfileAssistant
-import net.typeblog.lpac_jni.impl.HttpInterfaceImpl
-import net.typeblog.lpac_jni.impl.LocalProfileAssistantImpl
-
-class EuiccChannelImpl(
-    override val port: UiccPortInfoCompat,
-    apduInterface: ApduInterface,
-    verboseLoggingFlow: Flow<Boolean>
-) : EuiccChannel {
-    override val slotId = port.card.physicalSlotIndex
-    override val logicalSlotId = port.logicalSlotIndex
-    override val portId = port.portIndex
-
-    override val lpa: LocalProfileAssistant =
-        LocalProfileAssistantImpl(apduInterface, HttpInterfaceImpl(verboseLoggingFlow))
-
-    override val valid: Boolean
-        get() = lpa.valid
-
-    override fun close() = lpa.close()
-}

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

@@ -64,16 +64,6 @@ interface EuiccChannelManager {
     suspend fun findEuiccChannelByPort(physicalSlotId: Int, portId: Int): EuiccChannel?
     fun findEuiccChannelByPortBlocking(physicalSlotId: Int, portId: Int): EuiccChannel?
 
-    class EuiccChannelNotFoundException: Exception("EuiccChannel not found")
-
-    /**
-     * Find a EuiccChannel by its slot and port, then run a callback with a reference to it.
-     * The reference is not supposed to be held outside of the callback.
-     *
-     * If a channel for that slot / port is not found, EuiccChannelNotFoundException is thrown
-     */
-    suspend fun <R> withEuiccChannel(physicalSlotId: Int, portId: Int, fn: (EuiccChannel) -> R): R
-
     /**
      * Invalidate all EuiccChannels previously cached by this Manager
      */

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

@@ -26,7 +26,7 @@ class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFacto
                 "Trying TelephonyManager for slot ${port.card.physicalSlotIndex} port ${port.portIndex}"
             )
             try {
-                return EuiccChannelImpl(
+                return EuiccChannel(
                     port,
                     TelephonyManagerApduInterface(
                         port,