app-common/src/main/AndroidManifest.xml

@@ -24,10 +24,6 @@
             android:label="@string/profile_download"
             android:theme="@style/Theme.AppCompat.Translucent" />
 
-        <activity
-            android:name="im.angry.openeuicc.ui.EuiccInfoActivity"
-            android:label="@string/euicc_info" />
-
         <activity
             android:name="im.angry.openeuicc.ui.LogsActivity"
             android:label="@string/pref_advanced_logs" />

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

@@ -6,7 +6,6 @@ import android.hardware.usb.UsbInterface
 import android.hardware.usb.UsbManager
 import android.se.omapi.SEService
 import android.util.Log
-import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.usb.UsbApduInterface
 import im.angry.openeuicc.core.usb.getIoEndpoints
 import im.angry.openeuicc.util.*
@@ -34,8 +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(
-                context.getString(R.string.omapi),
                 port,
                 OmapiApduInterface(
                     seService!!,
@@ -63,8 +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(
-            context.getString(R.string.usb),
             FakeUiccPortInfoCompat(FakeUiccCardInfoCompat(EuiccChannelManager.USB_CHANNEL_ID)),
             UsbApduInterface(
                 conn,

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

@@ -10,9 +10,6 @@ import im.angry.openeuicc.di.AppContainer
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -91,24 +88,44 @@ open class DefaultEuiccChannelManager(
         }
     }
 
-    protected suspend fun findEuiccChannelByLogicalSlot(logicalSlotId: Int): EuiccChannel? =
+    override fun findEuiccChannelBySlotBlocking(logicalSlotId: Int): EuiccChannel? =
-        withContext(Dispatchers.IO) {
+        runBlocking {
-            if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
+            withContext(Dispatchers.IO) {
-                return@withContext usbChannel
+                if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
-            }
+                    return@withContext usbChannel
+                }
 
-            for (card in uiccCards) {
+                for (card in uiccCards) {
-                for (port in card.ports) {
+                    for (port in card.ports) {
-                    if (port.logicalSlotIndex == logicalSlotId) {
+                        if (port.logicalSlotIndex == logicalSlotId) {
-                        return@withContext tryOpenEuiccChannel(port)
+                            return@withContext tryOpenEuiccChannel(port)
+                        }
                     }
                 }
-            }
 
-            null
+                null
+            }
         }
 
-    private suspend fun findAllEuiccChannelsByPhysicalSlot(physicalSlotId: Int): List<EuiccChannel>? {
+    override fun findEuiccChannelByPhysicalSlotBlocking(physicalSlotId: Int): EuiccChannel? =
+        runBlocking {
+            withContext(Dispatchers.IO) {
+                if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
+                    return@withContext usbChannel
+                }
+
+                for (card in uiccCards) {
+                    if (card.physicalSlotIndex != physicalSlotId) continue
+                    for (port in card.ports) {
+                        tryOpenEuiccChannel(port)?.let { return@withContext it }
+                    }
+                }
+
+                null
+            }
+        }
+
+    override suspend fun findAllEuiccChannelsByPhysicalSlot(physicalSlotId: Int): List<EuiccChannel>? {
         if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
             return usbChannel?.let { listOf(it) }
         }
@@ -121,7 +138,12 @@ open class DefaultEuiccChannelManager(
         return null
     }
 
-    private suspend fun findEuiccChannelByPort(physicalSlotId: Int, portId: Int): EuiccChannel? =
+    override fun findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId: Int): List<EuiccChannel>? =
+        runBlocking {
+            findAllEuiccChannelsByPhysicalSlot(physicalSlotId)
+        }
+
+    override suspend fun findEuiccChannelByPort(physicalSlotId: Int, portId: Int): EuiccChannel? =
         withContext(Dispatchers.IO) {
             if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
                 return@withContext usbChannel
@@ -132,57 +154,11 @@ open class DefaultEuiccChannelManager(
             }
         }
 
-    override suspend fun findFirstAvailablePort(physicalSlotId: Int): Int =
+    override fun findEuiccChannelByPortBlocking(physicalSlotId: Int, portId: Int): EuiccChannel? =
-        withContext(Dispatchers.IO) {
+        runBlocking {
-            if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
+            findEuiccChannelByPort(physicalSlotId, portId)
-                return@withContext 0
-            }
-
-            findAllEuiccChannelsByPhysicalSlot(physicalSlotId)?.getOrNull(0)?.portId ?: -1
         }
 
-    override suspend fun findAvailablePorts(physicalSlotId: Int): List<Int> =
-        withContext(Dispatchers.IO) {
-            if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
-                return@withContext listOf(0)
-            }
-
-            findAllEuiccChannelsByPhysicalSlot(physicalSlotId)?.map { it.portId } ?: listOf()
-        }
-
-    override suspend fun <R> withEuiccChannel(
-        physicalSlotId: Int,
-        portId: Int,
-        fn: suspend (EuiccChannel) -> R
-    ): R {
-        val channel = findEuiccChannelByPort(physicalSlotId, portId)
-            ?: throw EuiccChannelManager.EuiccChannelNotFoundException()
-        val wrapper = EuiccChannelWrapper(channel)
-        try {
-            return withContext(Dispatchers.IO) {
-                fn(wrapper)
-            }
-        } finally {
-            wrapper.invalidateWrapper()
-        }
-    }
-
-    override suspend fun <R> withEuiccChannel(
-        logicalSlotId: Int,
-        fn: suspend (EuiccChannel) -> R
-    ): R {
-        val channel = findEuiccChannelByLogicalSlot(logicalSlotId)
-            ?: throw EuiccChannelManager.EuiccChannelNotFoundException()
-        val wrapper = EuiccChannelWrapper(channel)
-        try {
-            return withContext(Dispatchers.IO) {
-                fn(wrapper)
-            }
-        } finally {
-            wrapper.invalidateWrapper()
-        }
-    }
-
     override suspend fun waitForReconnect(physicalSlotId: Int, portId: Int, timeoutMillis: Long) {
         if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) return
 
@@ -208,35 +184,34 @@ open class DefaultEuiccChannelManager(
         }
     }
 
-    override fun flowEuiccPorts(): Flow<Pair<Int, Int>> = flow {
+    override suspend fun enumerateEuiccChannels(): List<EuiccChannel> =
-        uiccCards.forEach { info ->
+        withContext(Dispatchers.IO) {
-            info.ports.forEach { port ->
+            uiccCards.flatMap { info ->
-                tryOpenEuiccChannel(port)?.also {
+                info.ports.mapNotNull { port ->
-                    Log.d(
+                    tryOpenEuiccChannel(port)?.also {
-                        TAG,
+                        Log.d(
-                        "Found eUICC on slot ${info.physicalSlotIndex} port ${port.portIndex}"
+                            TAG,
-                    )
+                            "Found eUICC on slot ${info.physicalSlotIndex} port ${port.portIndex}"
-
+                        )
-                    emit(Pair(info.physicalSlotIndex, port.portIndex))
+                    }
                 }
             }
         }
-    }.flowOn(Dispatchers.IO)
 
-    override suspend fun tryOpenUsbEuiccChannel(): Pair<UsbDevice?, Boolean> =
+    override suspend fun enumerateUsbEuiccChannel(): Pair<UsbDevice?, EuiccChannel?> =
         withContext(Dispatchers.IO) {
             usbManager.deviceList.values.forEach { device ->
                 Log.i(TAG, "Scanning USB device ${device.deviceId}:${device.vendorId}")
                 val iface = device.getSmartCardInterface() ?: return@forEach
                 // If we don't have permission, tell UI code that we found a candidate device, but we
                 // need permission to be able to do anything with it
-                if (!usbManager.hasPermission(device)) return@withContext Pair(device, false)
+                if (!usbManager.hasPermission(device)) return@withContext Pair(device, null)
                 Log.i(TAG, "Found CCID interface on ${device.deviceId}:${device.vendorId}, and has permission; trying to open channel")
                 try {
                     val channel = euiccChannelFactory.tryOpenUsbEuiccChannel(device, iface)
                     if (channel != null && channel.lpa.valid) {
                         usbChannel = channel
-                        return@withContext Pair(device, true)
+                        return@withContext Pair(device, channel)
                     }
                 } catch (e: Exception) {
                     // Ignored -- skip forward
@@ -244,7 +219,7 @@ open class DefaultEuiccChannelManager(
                 }
                 Log.i(TAG, "No valid eUICC channel found on USB device ${device.deviceId}:${device.vendorId}")
             }
-            return@withContext Pair(null, false)
+            return@withContext Pair(null, null)
         }
 
     override fun invalidate() {

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

@@ -1,20 +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 type: String
+    val port: UiccPortInfoCompat,
+    apduInterface: ApduInterface,
+    verboseLoggingFlow: Flow<Boolean>
+) {
+    val slotId = port.card.physicalSlotIndex // PHYSICAL slot
+    val logicalSlotId = port.logicalSlotIndex
+    val portId = port.portIndex
 
-    val port: UiccPortInfoCompat
+    val lpa: LocalProfileAssistant =
-
+        LocalProfileAssistantImpl(apduInterface, HttpInterfaceImpl(verboseLoggingFlow))
-    val slotId: Int // PHYSICAL slot
-    val logicalSlotId: Int
-    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,27 +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 type: String,
-    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

@@ -1,7 +1,6 @@
 package im.angry.openeuicc.core
 
 import android.hardware.usb.UsbDevice
-import kotlinx.coroutines.flow.Flow
 
 /**
  * EuiccChannelManager holds references to, and manages the lifecycles of, individual
@@ -19,26 +18,19 @@ interface EuiccChannelManager {
     }
 
     /**
-     * Scan all possible _device internal_ sources for EuiccChannels, as a flow, return their physical
+     * Scan all possible _device internal_ sources for EuiccChannels, return them and have all
-     * (slotId, portId) and have all scanned channels cached; these channels will remain open
+     * scanned channels cached; these channels will remain open for the entire lifetime of
-     * for the entire lifetime of this EuiccChannelManager object, unless disconnected externally
+     * this EuiccChannelManager object, unless disconnected externally or invalidate()'d
-     * or invalidate()'d.
-     *
-     * To obtain a temporary reference to a EuiccChannel, use `withEuiccChannel()`.
      */
-    fun flowEuiccPorts(): Flow<Pair<Int, Int>>
+    suspend fun enumerateEuiccChannels(): List<EuiccChannel>
 
     /**
      * Scan all possible USB devices for CCID readers that may contain eUICC cards.
      * If found, try to open it for access, and add it to the internal EuiccChannel cache
      * as a "port" with id 99. When user interaction is required to obtain permission
-     * to interact with the device, the second return value will be false.
+     * to interact with the device, the second return value (EuiccChannel) will be null.
-     *
-     * Returns (usbDevice, canOpen). canOpen is false if either (1) no usb reader is found;
-     * or (2) usb reader is found, but user interaction is required for access;
-     * or (3) usb reader is found, but we are unable to open ISD-R.
      */
-    suspend fun tryOpenUsbEuiccChannel(): Pair<UsbDevice?, Boolean>
+    suspend fun enumerateUsbEuiccChannel(): Pair<UsbDevice?, EuiccChannel?>
 
     /**
      * Wait for a slot + port to reconnect (i.e. become valid again)
@@ -48,40 +40,29 @@ interface EuiccChannelManager {
     suspend fun waitForReconnect(physicalSlotId: Int, portId: Int, timeoutMillis: Long = 1000)
 
     /**
-     * Returns the first mapped & available port ID for a physical slot, or -1 if
+     * Returns the EuiccChannel corresponding to a **logical** slot
-     * not found.
      */
-    suspend fun findFirstAvailablePort(physicalSlotId: Int): Int
+    fun findEuiccChannelBySlotBlocking(logicalSlotId: Int): EuiccChannel?
 
     /**
-     * Returns all mapped & available port IDs for a physical slot.
+     * Returns the first EuiccChannel corresponding to a **physical** slot
+     * If the physical slot supports MEP and has multiple ports, it is undefined
+     * which of the two channels will be returned.
      */
-    suspend fun findAvailablePorts(physicalSlotId: Int): List<Int>
+    fun findEuiccChannelByPhysicalSlotBlocking(physicalSlotId: 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.
+     * Returns all EuiccChannels corresponding to a **physical** slot
-     * The reference is not supposed to be held outside of the callback. This is enforced via
+     * Multiple channels are possible in the case of MEP
-     * a wrapper object.
-     *
-     * The callback is run on Dispatchers.IO by default.
-     *
-     * If a channel for that slot / port is not found, EuiccChannelNotFoundException is thrown
      */
-    suspend fun <R> withEuiccChannel(
+    suspend fun findAllEuiccChannelsByPhysicalSlot(physicalSlotId: Int): List<EuiccChannel>?
-        physicalSlotId: Int,
+    fun findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId: Int): List<EuiccChannel>?
-        portId: Int,
-        fn: suspend (EuiccChannel) -> R
-    ): R
 
     /**
-     * Same as withEuiccChannel(Int, Int, (EuiccChannel) -> R) but instead uses logical slot ID
+     * Returns the EuiccChannel corresponding to a **physical** slot and a port ID
      */
-    suspend fun <R> withEuiccChannel(
+    suspend fun findEuiccChannelByPort(physicalSlotId: Int, portId: Int): EuiccChannel?
-        logicalSlotId: Int,
+    fun findEuiccChannelByPortBlocking(physicalSlotId: Int, portId: Int): EuiccChannel?
-        fn: suspend (EuiccChannel) -> R
-    ): R
 
     /**
      * Invalidate all EuiccChannels previously cached by this Manager
@@ -93,7 +74,7 @@ interface EuiccChannelManager {
      * This is only expected to be implemented when the application is privileged
      * TODO: Remove this from the common interface
      */
-    suspend fun notifyEuiccProfilesChanged(logicalSlotId: Int) {
+    fun notifyEuiccProfilesChanged(logicalSlotId: Int) {
         // no-op by default
     }
 }

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

@@ -1,44 +0,0 @@
-package im.angry.openeuicc.core
-
-import im.angry.openeuicc.util.*
-import net.typeblog.lpac_jni.LocalProfileAssistant
-
-class EuiccChannelWrapper(orig: EuiccChannel) : EuiccChannel {
-    private var _inner: EuiccChannel? = orig
-
-    private val channel: EuiccChannel
-        get() {
-            if (_inner == null) {
-                throw IllegalStateException("This wrapper has been invalidated")
-            }
-
-            return _inner!!
-        }
-
-    override val type: String
-        get() = channel.type
-    override val port: UiccPortInfoCompat
-        get() = channel.port
-    override val slotId: Int
-        get() = channel.slotId
-    override val logicalSlotId: Int
-        get() = channel.logicalSlotId
-    override val portId: Int
-        get() = channel.portId
-    private val lpaDelegate = lazy {
-        LocalProfileAssistantWrapper(channel.lpa)
-    }
-    override val lpa: LocalProfileAssistant by lpaDelegate
-    override val valid: Boolean
-        get() = channel.valid
-
-    override fun close() = channel.close()
-
-    fun invalidateWrapper() {
-        _inner = null
-
-        if (lpaDelegate.isInitialized()) {
-            (lpa as LocalProfileAssistantWrapper).invalidateWrapper()
-        }
-    }
-}

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

@@ -1,63 +0,0 @@
-package im.angry.openeuicc.core
-
-import net.typeblog.lpac_jni.EuiccInfo2
-import net.typeblog.lpac_jni.LocalProfileAssistant
-import net.typeblog.lpac_jni.LocalProfileInfo
-import net.typeblog.lpac_jni.LocalProfileNotification
-import net.typeblog.lpac_jni.ProfileDownloadCallback
-
-class LocalProfileAssistantWrapper(orig: LocalProfileAssistant) :
-    LocalProfileAssistant {
-    private var _inner: LocalProfileAssistant? = orig
-
-    private val lpa: LocalProfileAssistant
-        get() {
-            if (_inner == null) {
-                throw IllegalStateException("This wrapper has been invalidated")
-            }
-
-            return _inner!!
-        }
-
-    override val valid: Boolean
-        get() = lpa.valid
-    override val profiles: List<LocalProfileInfo>
-        get() = lpa.profiles
-    override val notifications: List<LocalProfileNotification>
-        get() = lpa.notifications
-    override val eID: String
-        get() = lpa.eID
-    override val euiccInfo2: EuiccInfo2?
-        get() = lpa.euiccInfo2
-
-    override fun setEs10xMss(mss: Byte) = lpa.setEs10xMss(mss)
-
-    override fun enableProfile(iccid: String, refresh: Boolean): Boolean =
-        lpa.enableProfile(iccid, refresh)
-
-    override fun disableProfile(iccid: String, refresh: Boolean): Boolean =
-        lpa.disableProfile(iccid, refresh)
-
-    override fun deleteProfile(iccid: String): Boolean = lpa.deleteProfile(iccid)
-
-    override fun downloadProfile(
-        smdp: String,
-        matchingId: String?,
-        imei: String?,
-        confirmationCode: String?,
-        callback: ProfileDownloadCallback
-    ): Boolean = lpa.downloadProfile(smdp, matchingId, imei, confirmationCode, callback)
-
-    override fun deleteNotification(seqNumber: Long): Boolean = lpa.deleteNotification(seqNumber)
-
-    override fun handleNotification(seqNumber: Long): Boolean = lpa.handleNotification(seqNumber)
-
-    override fun setNickname(iccid: String, nickname: String): Boolean =
-        lpa.setNickname(iccid, nickname)
-
-    override fun close() = lpa.close()
-
-    fun invalidateWrapper() {
-        _inner = null
-    }
-}

app-common/src/main/java/im/angry/openeuicc/di/DefaultUiComponentFactory.kt

@@ -1,12 +1,13 @@
 package im.angry.openeuicc.di
 
 import androidx.fragment.app.Fragment
+import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.ui.EuiccManagementFragment
 import im.angry.openeuicc.ui.NoEuiccPlaceholderFragment
 
 open class DefaultUiComponentFactory : UiComponentFactory {
-    override fun createEuiccManagementFragment(slotId: Int, portId: Int): EuiccManagementFragment =
+    override fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
-        EuiccManagementFragment.newInstance(slotId, portId)
+        EuiccManagementFragment.newInstance(channel.slotId, channel.portId)
 
     override fun createNoEuiccPlaceholderFragment(): Fragment = NoEuiccPlaceholderFragment()
 }

app-common/src/main/java/im/angry/openeuicc/di/UiComponentFactory.kt

@@ -1,9 +1,10 @@
 package im.angry.openeuicc.di
 
 import androidx.fragment.app.Fragment
+import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.ui.EuiccManagementFragment
 
 interface UiComponentFactory {
-    fun createEuiccManagementFragment(slotId: Int, portId: Int): EuiccManagementFragment
+    fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment
     fun createNoEuiccPlaceholderFragment(): Fragment
 }

app-common/src/main/java/im/angry/openeuicc/service/EuiccChannelManagerService.kt

@@ -21,8 +21,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.takeWhile
@@ -57,14 +55,7 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
         private const val TAG = "EuiccChannelManagerService"
         private const val CHANNEL_ID = "tasks"
         private const val FOREGROUND_ID = 1000
-        private const val TASK_FAILURE_ID = 1000
+        private const val TASK_FAILURE_ID = 1001
-
-        /**
-         * Utility function to wait for a foreground task to be done, return its
-         * error if any, or null on success.
-         */
-        suspend fun Flow<ForegroundTaskState>.waitDone(): Throwable? =
-            (this.last() as ForegroundTaskState.Done).error
     }
 
     inner class LocalBinder : Binder() {
@@ -194,7 +185,7 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
         failureTitle: String,
         iconRes: Int,
         task: suspend EuiccChannelManagerService.() -> Unit
-    ): Flow<ForegroundTaskState> {
+    ): Flow<ForegroundTaskState>? {
         // Atomically set the state to InProgress. If this returns true, we are
         // the only task currently in progress.
         if (!foregroundTaskState.compareAndSet(
@@ -202,7 +193,7 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
                 ForegroundTaskState.InProgress(0)
             )
         ) {
-            return flow { emit(ForegroundTaskState.Done(IllegalStateException("There are tasks currently running"))) }
+            return null
         }
 
         lifecycleScope.launch(Dispatchers.Main) {
@@ -289,27 +280,26 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
         matchingId: String?,
         confirmationCode: String?,
         imei: String?
-    ): Flow<ForegroundTaskState> =
+    ): Flow<ForegroundTaskState>? =
         launchForegroundTask(
             getString(R.string.task_profile_download),
             getString(R.string.task_profile_download_failure),
             R.drawable.ic_task_sim_card_download
         ) {
             euiccChannelManager.beginTrackedOperation(slotId, portId) {
-                val res = euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
+                val channel = euiccChannelManager.findEuiccChannelByPort(slotId, portId)
-                    channel.lpa.downloadProfile(
+                val res = channel!!.lpa.downloadProfile(
-                        smdp,
+                    smdp,
-                        matchingId,
+                    matchingId,
-                        imei,
+                    imei,
-                        confirmationCode,
+                    confirmationCode,
-                        object : ProfileDownloadCallback {
+                    object : ProfileDownloadCallback {
-                            override fun onStateUpdate(state: ProfileDownloadCallback.DownloadState) {
+                        override fun onStateUpdate(state: ProfileDownloadCallback.DownloadState) {
-                                if (state.progress == 0) return
+                            if (state.progress == 0) return
-                                foregroundTaskState.value =
+                            foregroundTaskState.value =
-                                    ForegroundTaskState.InProgress(state.progress)
+                                ForegroundTaskState.InProgress(state.progress)
-                            }
+                        }
-                        })
+                    })
-                }
 
                 if (!res) {
                     // TODO: Provide more details on the error
@@ -325,18 +315,16 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
         portId: Int,
         iccid: String,
         name: String
-    ): Flow<ForegroundTaskState> =
+    ): Flow<ForegroundTaskState>? =
         launchForegroundTask(
             getString(R.string.task_profile_rename),
             getString(R.string.task_profile_rename_failure),
             R.drawable.ic_task_rename
         ) {
-            val res = euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
+            val res = euiccChannelManager.findEuiccChannelByPort(slotId, portId)!!.lpa.setNickname(
-                channel.lpa.setNickname(
+                iccid,
-                    iccid,
+                name
-                    name
+            )
-                )
-            }
 
             if (!res) {
                 throw RuntimeException("Profile not renamed")
@@ -347,16 +335,17 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
         slotId: Int,
         portId: Int,
         iccid: String
-    ): Flow<ForegroundTaskState> =
+    ): Flow<ForegroundTaskState>? =
         launchForegroundTask(
             getString(R.string.task_profile_delete),
             getString(R.string.task_profile_delete_failure),
             R.drawable.ic_task_delete
         ) {
             euiccChannelManager.beginTrackedOperation(slotId, portId) {
-                euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
+                euiccChannelManager.findEuiccChannelByPort(
-                    channel.lpa.deleteProfile(iccid)
+                    slotId,
-                }
+                    portId
+                )!!.lpa.deleteProfile(iccid)
 
                 preferenceRepository.notificationDeleteFlow.first()
             }
@@ -370,17 +359,15 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
         iccid: String,
         enable: Boolean, // Enable or disable the profile indicated in iccid
         reconnectTimeoutMillis: Long = 0 // 0 = do not wait for reconnect, useful for USB readers
-    ): Flow<ForegroundTaskState> =
+    ): Flow<ForegroundTaskState>? =
         launchForegroundTask(
             getString(R.string.task_profile_switch),
             getString(R.string.task_profile_switch_failure),
             R.drawable.ic_task_switch
         ) {
             euiccChannelManager.beginTrackedOperation(slotId, portId) {
-                val (res, refreshed) = euiccChannelManager.withEuiccChannel(
+                val channel = euiccChannelManager.findEuiccChannelByPort(slotId, portId)!!
-                    slotId,
+                val (res, refreshed) =
-                    portId
-                ) { channel ->
                     if (!channel.lpa.switchProfile(iccid, enable, refresh = true)) {
                         // Sometimes, we *can* enable or disable the profile, but we cannot
                         // send the refresh command to the modem because the profile somehow
@@ -391,7 +378,6 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
                     } else {
                         Pair(true, true)
                     }
-                }
 
                 if (!res) {
                     throw RuntimeException("Could not switch profile")

app-common/src/main/java/im/angry/openeuicc/ui/DirectProfileDownloadActivity.kt

@@ -3,8 +3,6 @@ package im.angry.openeuicc.ui
 import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -12,32 +10,22 @@ class DirectProfileDownloadActivity : BaseEuiccAccessActivity(), SlotSelectFragm
     override fun onInit() {
         lifecycleScope.launch {
             val knownChannels = withContext(Dispatchers.IO) {
-                euiccChannelManager.flowEuiccPorts().map { (slotId, portId) ->
+                euiccChannelManager.enumerateEuiccChannels()
-                    euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
-                        Triple(slotId, channel.logicalSlotId, portId)
-                    }
-                }.toList().sortedBy { it.second }
             }
 
             when {
                 knownChannels.isEmpty() -> {
                     finish()
                 }
-                // Detect multiple eUICC chips
+                knownChannels.hasMultipleChips -> {
-                knownChannels.distinctBy { it.first }.size > 1 -> {
+                    SlotSelectFragment.newInstance(knownChannels.sortedBy { it.logicalSlotId })
-                    SlotSelectFragment.newInstance(
-                        knownChannels.map { it.first },
-                        knownChannels.map { it.second },
-                        knownChannels.map { it.third })
                         .show(supportFragmentManager, SlotSelectFragment.TAG)
                 }
                 else -> {
                     // If the device has only one eSIM "chip" (but may be mapped to multiple slots),
                     // we can skip the slot selection dialog since there is only one chip to save to.
-                    onSlotSelected(
+                    onSlotSelected(knownChannels[0].slotId,
-                        knownChannels[0].first,
+                        knownChannels[0].portId)
-                        knownChannels[0].third
-                    )
                 }
             }
         }

app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt

@@ -1,202 +0,0 @@
-package im.angry.openeuicc.ui
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.activity.enableEdgeToEdge
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.*
-import kotlinx.coroutines.launch
-import net.typeblog.lpac_jni.impl.DEFAULT_PKID_GSMA_RSP2_ROOT_CI1
-import net.typeblog.lpac_jni.impl.PKID_GSMA_TEST_CI
-
-class EuiccInfoActivity : BaseEuiccAccessActivity() {
-    private lateinit var swipeRefresh: SwipeRefreshLayout
-    private lateinit var infoList: RecyclerView
-
-    private var logicalSlotId: Int = -1
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_euicc_info)
-        setSupportActionBar(requireViewById(R.id.toolbar))
-        setupToolbarInsets()
-        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
-
-        swipeRefresh = requireViewById(R.id.swipe_refresh)
-        infoList = requireViewById(R.id.recycler_view)
-
-        infoList.layoutManager =
-            LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
-        infoList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
-        infoList.adapter = EuiccInfoAdapter()
-
-        logicalSlotId = intent.getIntExtra("logicalSlotId", 0)
-
-        title = getString(
-            R.string.euicc_info_activity_title,
-            getString(R.string.channel_name_format, logicalSlotId)
-        )
-
-        swipeRefresh.setOnRefreshListener { refresh() }
-
-        setupRootViewInsets(infoList)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
-        android.R.id.home -> {
-            finish()
-            true
-        }
-
-        else -> super.onOptionsItemSelected(item)
-    }
-
-    override fun onInit() {
-        refresh()
-    }
-
-    private fun refresh() {
-        swipeRefresh.isRefreshing = true
-
-        lifecycleScope.launch {
-            val unknownStr = getString(R.string.unknown)
-
-            val newItems = mutableListOf<Pair<String, String>>()
-
-            newItems.add(
-                Pair(
-                    getString(R.string.euicc_info_access_mode),
-                    euiccChannelManager.withEuiccChannel(logicalSlotId) { channel -> channel.type }
-                )
-            )
-
-            newItems.add(
-                Pair(
-                    getString(R.string.euicc_info_removable),
-                    if (euiccChannelManager.withEuiccChannel(logicalSlotId) { channel -> channel.port.card.isRemovable }) {
-                        getString(R.string.yes)
-                    } else {
-                        getString(R.string.no)
-                    }
-                )
-            )
-
-            newItems.add(
-                Pair(
-                    getString(R.string.euicc_info_eid),
-                    euiccChannelManager.withEuiccChannel(logicalSlotId) { channel -> channel.lpa.eID }
-                )
-            )
-
-            val euiccInfo2 = euiccChannelManager.withEuiccChannel(logicalSlotId) { channel ->
-                channel.lpa.euiccInfo2
-            }
-
-            newItems.add(
-                Pair(
-                    getString(R.string.euicc_info_firmware_version),
-                    euiccInfo2?.euiccFirmwareVersion ?: unknownStr
-                )
-            )
-
-            newItems.add(
-                Pair(
-                    getString(R.string.euicc_info_globalplatform_version),
-                    euiccInfo2?.globalPlatformVersion ?: unknownStr
-                )
-            )
-
-            newItems.add(
-                Pair(
-                    getString(R.string.euicc_info_pp_version),
-                    euiccInfo2?.ppVersion ?: unknownStr
-                )
-            )
-
-            newItems.add(
-                Pair(
-                    getString(R.string.euicc_info_sas_accreditation_number),
-                    euiccInfo2?.sasAccreditationNumber ?: unknownStr
-                )
-            )
-
-            newItems.add(
-                Pair(
-                getString(R.string.euicc_info_free_nvram),
-                euiccInfo2?.freeNvram?.let { formatFreeSpace(it) } ?: unknownStr
-            ))
-
-            newItems.add(
-                Pair(
-                    getString(R.string.euicc_info_gsma_prod),
-                    if (euiccInfo2?.euiccCiPKIdListForSigning?.contains(
-                            DEFAULT_PKID_GSMA_RSP2_ROOT_CI1
-                        ) == true
-                    ) {
-                        getString(R.string.supported)
-                    } else {
-                        getString(R.string.unsupported)
-                    }
-                )
-            )
-
-            newItems.add(
-                Pair(
-                    getString(R.string.euicc_info_gsma_test),
-                    if (PKID_GSMA_TEST_CI.any { euiccInfo2?.euiccCiPKIdListForSigning?.contains(it) == true }) {
-                        getString(R.string.supported)
-                    } else {
-                        getString(R.string.unsupported)
-                    }
-                )
-            )
-
-            (infoList.adapter!! as EuiccInfoAdapter).euiccInfoItems = newItems
-
-            swipeRefresh.isRefreshing = false
-        }
-    }
-
-    inner class EuiccInfoViewHolder(root: View) : ViewHolder(root) {
-        private val title: TextView = root.requireViewById(R.id.euicc_info_title)
-        private val content: TextView = root.requireViewById(R.id.euicc_info_content)
-
-        fun bind(item: Pair<String, String>) {
-            title.text = item.first
-            content.text = item.second
-        }
-    }
-
-    inner class EuiccInfoAdapter : RecyclerView.Adapter<EuiccInfoViewHolder>() {
-        var euiccInfoItems: List<Pair<String, String>> = listOf()
-            @SuppressLint("NotifyDataSetChanged")
-            set(newVal) {
-                field = newVal
-                notifyDataSetChanged()
-            }
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EuiccInfoViewHolder {
-            val root = LayoutInflater.from(parent.context)
-                .inflate(R.layout.euicc_info_item, parent, false)
-            return EuiccInfoViewHolder(root)
-        }
-
-        override fun getItemCount(): Int = euiccInfoItems.size
-
-        override fun onBindViewHolder(holder: EuiccInfoViewHolder, position: Int) {
-            holder.bind(euiccInfoItems[position])
-        }
-    }
-}

app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt

@@ -6,6 +6,7 @@ import android.content.ClipboardManager
 import android.content.Intent
 import android.os.Bundle
 import android.text.method.PasswordTransformationMethod
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
@@ -30,11 +31,11 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import net.typeblog.lpac_jni.LocalProfileInfo
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.service.EuiccChannelManagerService
-import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -51,7 +52,6 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
     private lateinit var swipeRefresh: SwipeRefreshLayout
     private lateinit var fab: FloatingActionButton
     private lateinit var profileList: RecyclerView
-    private var logicalSlotId: Int = -1
 
     private val adapter = EuiccProfileAdapter()
 
@@ -127,21 +127,9 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
     override fun onOptionsItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.show_notifications -> {
-                if (logicalSlotId != -1) {
+                Intent(requireContext(), NotificationsActivity::class.java).apply {
-                    Intent(requireContext(), NotificationsActivity::class.java).apply {
+                    putExtra("logicalSlotId", channel.logicalSlotId)
-                        putExtra("logicalSlotId", logicalSlotId)
+                    startActivity(this)
-                        startActivity(this)
-                    }
-                }
-                true
-            }
-
-            R.id.euicc_info -> {
-                if (logicalSlotId != -1) {
-                    Intent(requireContext(), EuiccInfoActivity::class.java).apply {
-                        putExtra("logicalSlotId", logicalSlotId)
-                        startActivity(this)
-                    }
                 }
                 true
             }
@@ -160,36 +148,31 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
             listOf()
         }
 
+    @SuppressLint("NotifyDataSetChanged")
     private fun refresh() {
         if (invalid) return
         swipeRefresh.isRefreshing = true
 
         lifecycleScope.launch {
-            doRefresh()
+            ensureEuiccChannelManager()
-        }
+            euiccChannelManagerService.waitForForegroundTask()
-    }
 
-    @SuppressLint("NotifyDataSetChanged")
+            if (!this@EuiccManagementFragment::disableSafeguardFlow.isInitialized) {
-    protected open suspend fun doRefresh() {
+                disableSafeguardFlow =
-        ensureEuiccChannelManager()
+                    preferenceRepository.disableSafeguardFlow.stateIn(lifecycleScope)
-        euiccChannelManagerService.waitForForegroundTask()
+            }
 
-        if (!this@EuiccManagementFragment::disableSafeguardFlow.isInitialized) {
+            val profiles = withContext(Dispatchers.IO) {
-            disableSafeguardFlow =
+                euiccChannelManager.notifyEuiccProfilesChanged(channel.logicalSlotId)
-                preferenceRepository.disableSafeguardFlow.stateIn(lifecycleScope)
+                channel.lpa.profiles.operational
-        }
+            }
 
-        val profiles = withEuiccChannel { channel ->
+            withContext(Dispatchers.Main) {
-            logicalSlotId = channel.logicalSlotId
+                adapter.profiles = profiles
-            euiccChannelManager.notifyEuiccProfilesChanged(channel.logicalSlotId)
+                adapter.footerViews = onCreateFooterViews(profileList, profiles)
-            channel.lpa.profiles.operational
+                adapter.notifyDataSetChanged()
-        }
+                swipeRefresh.isRefreshing = false
-
+            }
-        withContext(Dispatchers.Main) {
-            adapter.profiles = profiles
-            adapter.footerViews = onCreateFooterViews(profileList, profiles)
-            adapter.notifyDataSetChanged()
-            swipeRefresh.isRefreshing = false
         }
     }
 
@@ -209,7 +192,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
             ensureEuiccChannelManager()
             euiccChannelManagerService.waitForForegroundTask()
 
-            val err = euiccChannelManagerService.launchProfileSwitchTask(
+            val res = euiccChannelManagerService.launchProfileSwitchTask(
                 slotId,
                 portId,
                 iccid,
@@ -219,9 +202,14 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                 } else {
                     30 * 1000
                 }
-            ).waitDone()
+            )?.last() as? EuiccChannelManagerService.ForegroundTaskState.Done
 
-            when (err) {
+            if (res == null) {
+                showSwitchFailureText()
+                return@launch
+            }
+
+            when (res.error) {
                 null -> {}
                 is EuiccChannelManagerService.SwitchingProfilesRefreshException -> {
                     // This is only really fatal for internal eSIMs

app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt

@@ -23,12 +23,9 @@ import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -47,7 +44,6 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     private var refreshing = false
 
     private data class Page(
-        val logicalSlotId: Int,
         val title: String,
         val createFragment: () -> Fragment
     )
@@ -142,83 +138,65 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         // Prevent concurrent access with any running foreground task
         euiccChannelManagerService.waitForForegroundTask()
 
-        val (usbDevice, _) = withContext(Dispatchers.IO) {
+        val knownChannels = withContext(Dispatchers.IO) {
-            euiccChannelManager.tryOpenUsbEuiccChannel()
+            euiccChannelManager.enumerateEuiccChannels().onEach {
-        }
+                Log.d(TAG, "slot ${it.slotId} port ${it.portId}")
-
-        val newPages: MutableList<Page> = mutableListOf()
-
-        euiccChannelManager.flowEuiccPorts().onEach { (slotId, portId) ->
-            Log.d(TAG, "slot $slotId port $portId")
-
-            euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
                 if (preferenceRepository.verboseLoggingFlow.first()) {
-                    Log.d(TAG, channel.lpa.eID)
+                    Log.d(TAG, it.lpa.eID)
                 }
                 // Request the system to refresh the list of profiles every time we start
                 // Note that this is currently supposed to be no-op when unprivileged,
                 // but it could change in the future
-                euiccChannelManager.notifyEuiccProfilesChanged(channel.logicalSlotId)
+                euiccChannelManager.notifyEuiccProfilesChanged(it.logicalSlotId)
-
-                newPages.add(
-                    Page(
-                        channel.logicalSlotId,
-                        getString(R.string.channel_name_format, channel.logicalSlotId)
-                    ) {
-                        appContainer.uiComponentFactory.createEuiccManagementFragment(
-                            slotId,
-                            portId
-                        )
-                    })
             }
-        }.collect()
-
-        // If USB readers exist, add them at the very last
-        // We use a wrapper fragment to handle logic specific to USB readers
-        usbDevice?.let {
-            newPages.add(
-                Page(
-                    EuiccChannelManager.USB_CHANNEL_ID,
-                    it.productName ?: getString(R.string.usb)
-                ) { UsbCcidReaderFragment() })
-        }
-        viewPager.visibility = View.VISIBLE
-
-        if (newPages.size > 1) {
-            tabs.visibility = View.VISIBLE
-        } else if (newPages.isEmpty()) {
-            newPages.add(
-                Page(
-                    -1,
-                    ""
-                ) { appContainer.uiComponentFactory.createNoEuiccPlaceholderFragment() })
         }
 
-        newPages.sortBy { it.logicalSlotId }
+        val (usbDevice, _) = withContext(Dispatchers.IO) {
+            euiccChannelManager.enumerateUsbEuiccChannel()
+        }
 
-        pages.clear()
+        withContext(Dispatchers.Main) {
-        pages.addAll(newPages)
+            loadingProgress.visibility = View.GONE
 
-        loadingProgress.visibility = View.GONE
+            knownChannels.sortedBy { it.logicalSlotId }.forEach { channel ->
-        pagerAdapter.notifyDataSetChanged()
+                pages.add(Page(
-        // Reset the adapter so that the current view actually gets cleared
+                    getString(R.string.channel_name_format, channel.logicalSlotId)
-        // notifyDataSetChanged() doesn't cause the current view to be removed.
+                ) { appContainer.uiComponentFactory.createEuiccManagementFragment(channel) })
-        viewPager.adapter = pagerAdapter
-
-        if (fromUsbEvent && usbDevice != null) {
-            // If this refresh was triggered by a USB insertion while active, scroll to that page
-            viewPager.post {
-                viewPager.setCurrentItem(pages.size - 1, true)
             }
-        } else {
-            viewPager.currentItem = 0
-        }
 
-        if (pages.size > 0) {
+            // If USB readers exist, add them at the very last
-            ensureNotificationPermissions()
+            // We use a wrapper fragment to handle logic specific to USB readers
-        }
+            usbDevice?.let {
+                pages.add(Page(it.productName ?: getString(R.string.usb)) { UsbCcidReaderFragment() })
+            }
+            viewPager.visibility = View.VISIBLE
 
-        refreshing = false
+            if (pages.size > 1) {
+                tabs.visibility = View.VISIBLE
+            } else if (pages.isEmpty()) {
+                pages.add(Page("") { appContainer.uiComponentFactory.createNoEuiccPlaceholderFragment() })
+            }
+
+            pagerAdapter.notifyDataSetChanged()
+            // Reset the adapter so that the current view actually gets cleared
+            // notifyDataSetChanged() doesn't cause the current view to be removed.
+            viewPager.adapter = pagerAdapter
+
+            if (fromUsbEvent && usbDevice != null) {
+                // If this refresh was triggered by a USB insertion while active, scroll to that page
+                viewPager.post {
+                    viewPager.setCurrentItem(pages.size - 1, true)
+                }
+            } else {
+                viewPager.currentItem = 0
+            }
+
+            if (pages.size > 0) {
+                ensureNotificationPermissions()
+            }
+
+            refreshing = false
+        }
     }
 
     private fun refresh(fromUsbEvent: Boolean = false) {

app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt

@@ -20,6 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import im.angry.openeuicc.common.R
+import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
@@ -32,7 +33,7 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     private lateinit var notificationList: RecyclerView
     private val notificationAdapter = NotificationAdapter()
 
-    private var logicalSlotId = -1
+    private lateinit var euiccChannel: EuiccChannel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
@@ -55,7 +56,7 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         notificationList.adapter = notificationAdapter
         registerForContextMenu(notificationList)
 
-        logicalSlotId = intent.getIntExtra("logicalSlotId", 0)
+        val logicalSlotId = intent.getIntExtra("logicalSlotId", 0)
 
         // This is slightly different from the MainActivity logic
         // due to the length (we don't want to display the full USB product name)
@@ -103,8 +104,16 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         swipeRefresh.isRefreshing = true
 
         lifecycleScope.launch {
-            withContext(Dispatchers.IO) {
+            if (!this@NotificationsActivity::euiccChannel.isInitialized) {
-                euiccChannelManagerLoaded.await()
+                withContext(Dispatchers.IO) {
+                    euiccChannelManagerLoaded.await()
+                    euiccChannel = euiccChannelManager.findEuiccChannelBySlotBlocking(
+                        intent.getIntExtra(
+                            "logicalSlotId",
+                            0
+                        )
+                    )!!
+                }
             }
 
             task()
@@ -115,11 +124,13 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
 
     private fun refresh() {
        launchTask {
-           notificationAdapter.notifications =
+           val profiles = withContext(Dispatchers.IO) {
-               euiccChannelManager.withEuiccChannel(logicalSlotId) { channel ->
+               euiccChannel.lpa.profiles
-                   val profiles = channel.lpa.profiles
+           }
 
-                   channel.lpa.notifications.map {
+           notificationAdapter.notifications =
+               withContext(Dispatchers.IO) {
+                   euiccChannel.lpa.notifications.map {
                        val profile = profiles.find { p -> p.iccid == it.iccid }
                        LocalProfileNotificationWrapper(it, profile?.displayName ?: "???")
                    }
@@ -194,9 +205,7 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
                 R.id.notification_process -> {
                     launchTask {
                         withContext(Dispatchers.IO) {
-                            euiccChannelManager.withEuiccChannel(logicalSlotId) { channel ->
+                            euiccChannel.lpa.handleNotification(notification.inner.seqNumber)
-                                channel.lpa.handleNotification(notification.inner.seqNumber)
-                            }
                         }
 
                         refresh()
@@ -206,9 +215,7 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
                 R.id.notification_delete -> {
                     launchTask {
                         withContext(Dispatchers.IO) {
-                            euiccChannelManager.withEuiccChannel(logicalSlotId) { channel ->
+                            euiccChannel.lpa.deleteNotification(notification.inner.seqNumber)
-                                channel.lpa.deleteNotification(notification.inner.seqNumber)
-                            }
                         }
 
                         refresh()

app-common/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt

@@ -8,8 +8,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.util.*
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 
@@ -74,7 +74,7 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
                 slotId,
                 portId,
                 requireArguments().getString("iccid")!!
-            ).onStart {
+            )!!.onStart {
                 if (parentFragment is EuiccProfilesChangedListener) {
                     // Trigger a refresh in the parent fragment -- it should wait until
                     // any foreground task is completed before actually doing a refresh
@@ -86,7 +86,7 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
                 } catch (e: IllegalStateException) {
                     // Ignored
                 }
-            }.waitDone()
+            }.collect()
         }
     }
 }

app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt

@@ -19,9 +19,9 @@ import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.service.EuiccChannelManagerService
-import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -159,26 +159,22 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
                 return@launch
             }
 
-            withEuiccChannel { channel ->
+            val imei = try {
-                val imei = try {
+                telephonyManager.getImei(channel.logicalSlotId) ?: ""
-                    telephonyManager.getImei(channel.logicalSlotId) ?: ""
+            } catch (e: Exception) {
-                } catch (e: Exception) {
+                ""
-                    ""
+            }
-                }
 
-                // Fetch remaining NVRAM
+            // Fetch remaining NVRAM
-                val str = channel.lpa.euiccInfo2?.freeNvram?.also {
+            val str = channel.lpa.euiccInfo2?.freeNvram?.also {
-                    freeNvram = it
+                freeNvram = it
-                }?.let { formatFreeSpace(it) }
+            }?.let { formatFreeSpace(it) }
 
-                withContext(Dispatchers.Main) {
+            withContext(Dispatchers.Main) {
-                    profileDownloadFreeSpace.text = getString(
+                profileDownloadFreeSpace.text = getString(R.string.profile_download_free_space,
-                        R.string.profile_download_free_space,
+                    str ?: getText(R.string.unknown))
-                        str ?: getText(R.string.unknown)
+                profileDownloadIMEI.editText!!.text =
-                    )
+                    Editable.Factory.getInstance().newEditable(imei)
-                    profileDownloadIMEI.editText!!.text =
-                        Editable.Factory.getInstance().newEditable(imei)
-                }
             }
         }
     }
@@ -219,11 +215,14 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
         lifecycleScope.launch {
             ensureEuiccChannelManager()
             euiccChannelManagerService.waitForForegroundTask()
-            val err = doDownloadProfile(server, code, confirmationCode, imei)
+            val res = doDownloadProfile(server, code, confirmationCode, imei)
 
-            if (err != null) {
+            if (res == null || res.error != null) {
                 Log.d(TAG, "Error downloading profile")
-                Log.d(TAG, Log.getStackTraceString(err))
+
+                if (res?.error != null) {
+                    Log.d(TAG, Log.getStackTraceString(res.error))
+                }
 
                 Toast.makeText(requireContext(), R.string.profile_download_failed, Toast.LENGTH_LONG).show()
             }
@@ -247,15 +246,14 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
         imei: String?
     ) = withContext(Dispatchers.Main) {
         // The service is responsible for launching the actual blocking part on the IO context
-        // On our side, we need the Main context because  of the UI updates
+        val res = euiccChannelManagerService.launchProfileDownloadTask(
-        euiccChannelManagerService.launchProfileDownloadTask(
             slotId,
             portId,
             server,
             code,
             confirmationCode,
             imei
-        ).onEach {
+        )!!.onEach {
             if (it is EuiccChannelManagerService.ForegroundTaskState.InProgress) {
                 progress.progress = it.progress
                 progress.isIndeterminate = it.progress == 0
@@ -263,7 +261,9 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
                 progress.progress = 100
                 progress.isIndeterminate = false
             }
-        }.waitDone()
+        }.last()
+
+        res as? EuiccChannelManagerService.ForegroundTaskState.Done
     }
 
     override fun onDismiss(dialog: DialogInterface) {

app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt

@@ -11,8 +11,8 @@ import androidx.appcompat.widget.Toolbar
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.util.*
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
 class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragmentMarker {
@@ -100,7 +100,7 @@ class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragment
                 portId,
                 requireArguments().getString("iccid")!!,
                 name
-            ).waitDone()
+            )?.collect()
 
             if (parentFragment is EuiccProfilesChangedListener) {
                 (parentFragment as EuiccProfilesChangedListener).onEuiccProfilesChanged()

app-common/src/main/java/im/angry/openeuicc/ui/SlotSelectFragment.kt

@@ -16,12 +16,12 @@ class SlotSelectFragment : BaseMaterialDialogFragment(), OpenEuiccContextMarker
     companion object {
         const val TAG = "SlotSelectFragment"
 
-        fun newInstance(slotIds: List<Int>, logicalSlotIds: List<Int>, portIds: List<Int>): SlotSelectFragment {
+        fun newInstance(knownChannels: List<EuiccChannel>): SlotSelectFragment {
             return SlotSelectFragment().apply {
                 arguments = Bundle().apply {
-                    putIntArray("slotIds", slotIds.toIntArray())
+                    putIntArray("slotIds", knownChannels.map { it.slotId }.toIntArray())
-                    putIntArray("logicalSlotIds", logicalSlotIds.toIntArray())
+                    putIntArray("logicalSlotIds", knownChannels.map { it.logicalSlotId }.toIntArray())
-                    putIntArray("portIds", portIds.toIntArray())
+                    putIntArray("portIds", knownChannels.map { it.portId }.toIntArray())
                 }
             }
         }

app-common/src/main/java/im/angry/openeuicc/ui/UsbCcidReaderFragment.kt

@@ -20,6 +20,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
+import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
@@ -72,6 +73,7 @@ class UsbCcidReaderFragment : Fragment(), OpenEuiccContextMarker {
     private lateinit var loadingProgress: ProgressBar
 
     private var usbDevice: UsbDevice? = null
+    private var usbChannel: EuiccChannel? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -138,26 +140,24 @@ class UsbCcidReaderFragment : Fragment(), OpenEuiccContextMarker {
         permissionButton.visibility = View.GONE
         loadingProgress.visibility = View.VISIBLE
 
-        val (device, canOpen) = withContext(Dispatchers.IO) {
+        val (device, channel) = withContext(Dispatchers.IO) {
-            euiccChannelManager.tryOpenUsbEuiccChannel()
+            euiccChannelManager.enumerateUsbEuiccChannel()
         }
 
         loadingProgress.visibility = View.GONE
 
         usbDevice = device
+        usbChannel = channel
 
-        if (device != null && !canOpen && !usbManager.hasPermission(device)) {
+        if (device != null && channel == null && !usbManager.hasPermission(device)) {
             text.text = getString(R.string.usb_permission_needed)
             text.visibility = View.VISIBLE
             permissionButton.visibility = View.VISIBLE
-        } else if (device != null && canOpen) {
+        } else if (device != null && channel != null) {
             childFragmentManager.commit {
                 replace(
                     R.id.child_container,
-                    appContainer.uiComponentFactory.createEuiccManagementFragment(
+                    appContainer.uiComponentFactory.createEuiccManagementFragment(channel)
-                        EuiccChannelManager.USB_CHANNEL_ID,
-                        0
-                    )
                 )
             }
         } else {

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

@@ -36,11 +36,9 @@ val <T> T.euiccChannelManager: EuiccChannelManager where T: Fragment, T: EuiccCh
     get() = (requireActivity() as BaseEuiccAccessActivity).euiccChannelManager
 val <T> T.euiccChannelManagerService: EuiccChannelManagerService where T: Fragment, T: EuiccChannelFragmentMarker
     get() = (requireActivity() as BaseEuiccAccessActivity).euiccChannelManagerService
-
+val <T> T.channel: EuiccChannel where T: Fragment, T: EuiccChannelFragmentMarker
-suspend fun <T, R> T.withEuiccChannel(fn: suspend (EuiccChannel) -> R): R where T : Fragment, T : EuiccChannelFragmentMarker {
+    get() =
-    ensureEuiccChannelManager()
+        euiccChannelManager.findEuiccChannelByPortBlocking(slotId, portId)!!
-    return euiccChannelManager.withEuiccChannel(slotId, portId, fn)
-}
 
 suspend fun <T> T.ensureEuiccChannelManager() where T: Fragment, T: EuiccChannelFragmentMarker =
     (requireActivity() as BaseEuiccAccessActivity).euiccChannelManagerLoaded.await()

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

@@ -3,6 +3,9 @@ package im.angry.openeuicc.util
 import android.util.Log
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import net.typeblog.lpac_jni.LocalProfileAssistant
 import net.typeblog.lpac_jni.LocalProfileInfo
 
@@ -45,21 +48,16 @@ fun LocalProfileAssistant.disableActiveProfile(refresh: Boolean): Boolean =
     } ?: true
 
 /**
- * Disable the current active profile if any. If refresh is true, also cause a refresh command.
+ * Disable the active profile, return a lambda that reverts this action when called.
+ * If refreshOnDisable is true, also cause a eUICC refresh command. Note that refreshing
+ * will disconnect the eUICC and might need some time before being operational again.
  * See EuiccManager.waitForReconnect()
- *
- * Return the iccid of the profile being disabled, or null if no active profile found or failed to
- * disable.
  */
-fun LocalProfileAssistant.disableActiveProfileKeepIccId(refresh: Boolean): String? =
+fun LocalProfileAssistant.disableActiveProfileWithUndo(refreshOnDisable: Boolean): () -> Unit =
     profiles.find { it.isEnabled }?.let {
-        Log.i(TAG, "Disabling active profile ${it.iccid}")
+        disableProfile(it.iccid, refreshOnDisable)
-        if (disableProfile(it.iccid, refresh)) {
+        return { enableProfile(it.iccid) }
-            it.iccid
+    } ?: { }
-        } else {
-            null
-        }
-    }
 
 /**
  * Begin a "tracked" operation where notifications may be generated by the eSIM
@@ -80,21 +78,60 @@ suspend inline fun EuiccChannelManager.beginTrackedOperation(
     portId: Int,
     op: () -> Boolean
 ) {
-    val latestSeq = withEuiccChannel(slotId, portId) { channel ->
+    val latestSeq =
-        channel.lpa.notifications.firstOrNull()?.seqNumber
+        findEuiccChannelByPort(slotId, portId)!!.lpa.notifications.firstOrNull()?.seqNumber
             ?: 0
-    }
     Log.d(TAG, "Latest notification is $latestSeq before operation")
     if (op()) {
         Log.d(TAG, "Operation has requested notification handling")
         try {
             // Note that the exact instance of "channel" might have changed here if reconnected;
-            // this is why we need to use two distinct calls to withEuiccChannel()
+            // so we MUST use the automatic getter for "channel"
-            withEuiccChannel(slotId, portId) { channel ->
+            findEuiccChannelByPort(
-                channel.lpa.notifications.filter { it.seqNumber > latestSeq }.forEach {
+                slotId,
-                    Log.d(TAG, "Handling notification $it")
+                portId
-                    channel.lpa.handleNotification(it.seqNumber)
+            )?.lpa?.notifications?.filter { it.seqNumber > latestSeq }?.forEach {
-                }
+                Log.d(TAG, "Handling notification $it")
+                findEuiccChannelByPort(
+                    slotId,
+                    portId
+                )?.lpa?.handleNotification(it.seqNumber)
+            }
+        } catch (e: Exception) {
+            // Ignore any error during notification handling
+            e.printStackTrace()
+        }
+    }
+    Log.d(TAG, "Operation complete")
+}
+
+/**
+ * Same as beginTrackedOperation but uses blocking primitives.
+ * TODO: This function needs to be phased out of use.
+ */
+inline fun EuiccChannelManager.beginTrackedOperationBlocking(
+    slotId: Int,
+    portId: Int,
+    op: () -> Boolean
+) {
+    val latestSeq =
+        findEuiccChannelByPortBlocking(slotId, portId)!!.lpa.notifications.firstOrNull()?.seqNumber
+            ?: 0
+    Log.d(TAG, "Latest notification is $latestSeq before operation")
+    if (op()) {
+        Log.d(TAG, "Operation has requested notification handling")
+        try {
+            // Note that the exact instance of "channel" might have changed here if reconnected;
+            // so we MUST use the automatic getter for "channel"
+            findEuiccChannelByPortBlocking(
+                slotId,
+                portId
+            )?.lpa?.notifications?.filter { it.seqNumber > latestSeq }?.forEach {
+                Log.d(TAG, "Handling notification $it")
+                findEuiccChannelByPortBlocking(
+                    slotId,
+                    portId
+                )?.lpa?.handleNotification(it.seqNumber)
             }
         } catch (e: Exception) {
             // Ignore any error during notification handling

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

@@ -45,8 +45,6 @@ fun SEService.getUiccReaderCompat(slotNumber: Int): Reader {
 interface UiccCardInfoCompat {
     val physicalSlotIndex: Int
     val ports: Collection<UiccPortInfoCompat>
-    val isRemovable: Boolean
-        get() = true // This defaults to removable unless overridden
 }
 
 interface UiccPortInfoCompat {

app-common/src/main/res/layout/activity_euicc_info.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <include layout="@layout/toolbar_activity" />
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app-common/src/main/res/layout/euicc_info_item.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <TextView
-        android:id="@+id/euicc_info_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginVertical="12dp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/euicc_info_content"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginVertical="12dp"
-        android:maxLines="1"
-        android:ellipsize="marquee"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/euicc_info_title"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app-common/src/main/res/menu/fragment_euicc.xml

@@ -5,9 +5,4 @@
         android:id="@+id/show_notifications"
         android:title="@string/profile_notifications_show"
         app:showAsAction="never" />
-
-    <item
-        android:id="@+id/euicc_info"
-        android:title="@string/euicc_info"
-        app:showAsAction="never" />
 </menu>

app-common/src/main/res/values/strings.xml

@@ -8,7 +8,6 @@
 
     <string name="channel_name_format">Logical Slot %d</string>
     <string name="usb">USB</string>
-    <string name="omapi">OpenMobile API (OMAPI)</string>
 
     <string name="enabled">Enabled</string>
     <string name="disabled">Disabled</string>
@@ -72,25 +71,6 @@
     <string name="profile_notification_process">Process</string>
     <string name="profile_notification_delete">Delete</string>
 
-    <string name="euicc_info">eUICC Info</string>
-    <string name="euicc_info_activity_title">eUICC Info (%s)</string>
-    <string name="euicc_info_access_mode">Access Mode</string>
-    <string name="euicc_info_removable">Removable</string>
-    <string name="euicc_info_eid">EID</string>
-    <string name="euicc_info_firmware_version">eUICC OS Version</string>
-    <string name="euicc_info_globalplatform_version">GlobalPlatform Version</string>
-    <string name="euicc_info_sas_accreditation_number">SAS Accreditation Number</string>
-    <string name="euicc_info_pp_version">Protected Profile Version</string>
-    <string name="euicc_info_free_nvram">Free NVRAM (eSIM profile storage)</string>
-    <string name="euicc_info_gsma_prod">GSMA Production Certificate</string>
-    <string name="euicc_info_gsma_test">GSMA Test Certificate</string>
-
-    <string name="supported">Supported</string>
-    <string name="unsupported">Unsupported</string>
-
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-
     <string name="logs_save">Save</string>
     <string name="logs_filename_template">Logs at %s</string>
 

app-unpriv/src/main/AndroidManifest.xml

@@ -22,14 +22,9 @@
 
         <activity
             android:name="im.angry.openeuicc.ui.CompatibilityCheckActivity"
-            android:exported="false"
+            android:label="@string/compatibility_check"
-            android:label="@string/compatibility_check" />
+            android:exported="false" />
 
     </application>
 
-    <queries>
-        <package android:name="com.android.stk" />
-        <package android:name="com.android.stk1" />
-        <package android:name="com.android.stk2" />
-    </queries>
 </manifest>

app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt

@@ -1,14 +1,9 @@
 package im.angry.openeuicc.di
 
 import androidx.fragment.app.Fragment
-import im.angry.openeuicc.ui.EuiccManagementFragment
-import im.angry.openeuicc.ui.UnprivilegedEuiccManagementFragment
 import im.angry.openeuicc.ui.UnprivilegedNoEuiccPlaceholderFragment
 
 class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() {
-    override fun createEuiccManagementFragment(slotId: Int, portId: Int): EuiccManagementFragment =
-        UnprivilegedEuiccManagementFragment.newInstance(slotId, portId)
-
     override fun createNoEuiccPlaceholderFragment(): Fragment =
         UnprivilegedNoEuiccPlaceholderFragment()
 }

app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt

@@ -1,31 +0,0 @@
-package im.angry.openeuicc.ui
-
-import android.view.Menu
-import android.view.MenuInflater
-import im.angry.easyeuicc.R
-import im.angry.openeuicc.util.SIMToolkit
-import im.angry.openeuicc.util.newInstanceEuicc
-import im.angry.openeuicc.util.slotId
-
-
-class UnprivilegedEuiccManagementFragment : EuiccManagementFragment() {
-    companion object {
-        const val TAG = "UnprivilegedEuiccManagementFragment"
-
-        fun newInstance(slotId: Int, portId: Int): EuiccManagementFragment =
-            newInstanceEuicc(UnprivilegedEuiccManagementFragment::class.java, slotId, portId)
-    }
-
-    private val stk by lazy {
-        SIMToolkit(requireContext())
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        inflater.inflate(R.menu.fragment_sim_toolkit, menu)
-        menu.findItem(R.id.open_sim_toolkit).apply {
-            isVisible = stk.isAvailable(slotId)
-            intent = stk.intent(slotId)
-        }
-    }
-}

app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt

@@ -1,64 +0,0 @@
-package im.angry.openeuicc.util
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import androidx.annotation.ArrayRes
-import im.angry.easyeuicc.R
-import im.angry.openeuicc.core.EuiccChannelManager
-
-class SIMToolkit(private val context: Context) {
-    private val slotSelection = getComponentNames(R.array.sim_toolkit_slot_selection)
-
-    private val slots = buildMap {
-        put(0, getComponentNames(R.array.sim_toolkit_slot_1))
-        put(1, getComponentNames(R.array.sim_toolkit_slot_2))
-    }
-
-    private val packageNames = buildSet {
-        addAll(slotSelection.map { it.packageName })
-        addAll(slots.values.flatten().map { it.packageName })
-    }
-
-    private val activities = packageNames.flatMap(::getActivities).toSet()
-
-    private val launchIntent by lazy {
-        packageNames.firstNotNullOfOrNull(::getLaunchIntent)
-    }
-
-    private fun getLaunchIntent(packageName: String) = try {
-        val pm = context.packageManager
-        pm.getLaunchIntentForPackage(packageName)
-    } catch (_: PackageManager.NameNotFoundException) {
-        null
-    }
-
-    private fun getActivities(packageName: String) = try {
-        val pm = context.packageManager
-        val packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES)
-        packageInfo.activities!!.filter { it.exported }
-            .map { ComponentName(it.packageName, it.name) }
-    } catch (_: PackageManager.NameNotFoundException) {
-        emptyList()
-    }
-
-    private fun getComponentNames(@ArrayRes id: Int) =
-        context.resources.getStringArray(id).mapNotNull(ComponentName::unflattenFromString)
-
-    fun isAvailable(slotId: Int) = when (slotId) {
-        -1 -> false
-        EuiccChannelManager.USB_CHANNEL_ID -> false
-        else -> intent(slotId) != null
-    }
-
-    fun intent(slotId: Int): Intent? {
-        val components = slots.getOrDefault(slotId, emptySet()) + slotSelection
-        val intent = Intent(Intent.ACTION_MAIN, null).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            component = components.find(activities::contains)
-            addCategory(Intent.CATEGORY_LAUNCHER)
-        }
-        return if (intent.component != null) intent else launchIntent
-    }
-}

app-unpriv/src/main/res/menu/fragment_sim_toolkit.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/open_sim_toolkit"
-        android:title="@string/open_sim_toolkit"
-        android:visible="false"
-        app:showAsAction="never" />
-</menu>

app-unpriv/src/main/res/values/sim_toolkit.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="Typos">
-    <string-array name="sim_toolkit_slot_selection">
-        <item>com.android.stk/.StkMain</item>
-        <item>com.android.stk/.StkMainHide</item>
-        <item>com.android.stk/.StkListActivity</item>
-        <item>com.android.stk/.StkLauncherListActivity</item>
-    </string-array>
-    <string-array name="sim_toolkit_slot_1">
-        <item>com.android.stk/.StkMain1</item>
-        <item>com.android.stk/.PrimaryStkMain</item>
-        <item>com.android.stk/.StkLauncherActivity</item>
-        <item>com.android.stk/.StkLauncherActivity_Chn</item>
-        <item>com.android.stk/.StkLauncherActivityI</item>
-        <item>com.android.stk/.OppoStkLauncherActivity1</item>
-        <item>com.android.stk/.OplusStkLauncherActivity1</item>
-        <item>com.android.stk/.mtk.StkLauncherActivityI</item>
-    </string-array>
-    <string-array name="sim_toolkit_slot_2">
-        <item>com.android.stk/.StkMain2</item>
-        <item>com.android.stk/.SecondaryStkMain</item>
-        <item>com.android.stk/.StkLauncherActivity2</item>
-        <item>com.android.stk/.StkLauncherActivityII</item>
-        <item>com.android.stk/.OppoStkLauncherActivity2</item>
-        <item>com.android.stk/.OplusStkLauncherActivity2</item>
-        <item>com.android.stk/.mtk.StkLauncherActivityII</item>
-        <item>com.android.stk1/.StkLauncherActivity</item>
-        <item>com.android.stk2/.StkLauncherActivity</item>
-        <item>com.android.stk2/.StkLauncherActivity_Chn</item>
-        <item>com.android.stk2/.StkLauncherActivity2</item>
-    </string-array>
-</resources>

app-unpriv/src/main/res/values/strings.xml

@@ -2,7 +2,6 @@
     <string name="app_name" translatable="false">EasyEUICC</string>
     <string name="channel_name_format">SIM %d</string>
     <string name="compatibility_check">Compatibility Check</string>
-    <string name="open_sim_toolkit">Open SIM Toolkit</string>
 
     <!-- Compatibility Check Descriptions -->
     <string name="compatibility_check_system_features">System Features</string>
@@ -12,11 +11,11 @@
     <string name="compatibility_check_omapi_connectivity">OMAPI Connectivity</string>
     <string name="compatibility_check_omapi_connectivity_desc">Does your device allow access to Secure Elements on SIM cards via OMAPI?</string>
     <string name="compatibility_check_omapi_connectivity_fail">Unable to detect Secure Element readers for SIM cards via OMAPI. If you have not inserted a SIM in this device, try inserting one and retry this check.</string>
-    <string name="compatibility_check_omapi_connectivity_partial_success_sim_number">Successfully detected Secure Element access, but only for the following SIM slots: <b>SIM%s</b>.</string>
+    <string name="compatibility_check_omapi_connectivity_partial_success_sim_number">Successfully detected Secure Element access, but only for the following SIM slots: %s.</string>
     <string name="compatibility_check_isdr_channel">ISD-R Channel Access</string>
     <string name="compatibility_check_isdr_channel_desc">Does your device support opening an ISD-R (management) channel to eSIMs via OMAPI?</string>
     <string name="compatibility_check_isdr_channel_desc_unknown">Cannot determine whether ISD-R access through OMAPI is supported. You might want to retry with SIM cards inserted (any SIM card will do) if not already.</string>
-    <string name="compatibility_check_isdr_channel_desc_partial_fail">OMAPI access to ISD-R is only possible on the following SIM slots: <b>SIM%s</b>.</string>
+    <string name="compatibility_check_isdr_channel_desc_partial_fail">OMAPI access to ISD-R is only possible on the following SIM slots: %s.</string>
     <string name="compatibility_check_known_broken">Not on the Known Broken List</string>
     <string name="compatibility_check_known_broken_desc">Making sure your device is not known to have bugs associated with removable eSIMs.</string>
     <string name="compatibility_check_known_broken_fail">Oops, your device is known to have bugs when accessing removable eSIMs. This does not necessarily mean that it will not work at all, but you will have to proceed with caution.</string>

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

@@ -3,7 +3,6 @@ package im.angry.openeuicc.core
 import android.content.Context
 import android.util.Log
 import im.angry.openeuicc.OpenEuiccApplication
-import im.angry.openeuicc.R
 import im.angry.openeuicc.util.*
 import java.lang.IllegalArgumentException
 
@@ -27,8 +26,7 @@ class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFacto
                 "Trying TelephonyManager for slot ${port.card.physicalSlotIndex} port ${port.portIndex}"
             )
             try {
-                return EuiccChannelImpl(
+                return EuiccChannel(
-                    context.getString(R.string.telephony_manager),
                     port,
                     TelephonyManagerApduInterface(
                         port,

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

@@ -28,9 +28,9 @@ class PrivilegedEuiccChannelManager(
         }
     }
 
-    override suspend fun notifyEuiccProfilesChanged(logicalSlotId: Int) {
+    override fun notifyEuiccProfilesChanged(logicalSlotId: Int) {
         appContainer.subscriptionManager.apply {
-            findEuiccChannelByLogicalSlot(logicalSlotId)?.let {
+            findEuiccChannelBySlotBlocking(logicalSlotId)?.let {
                 tryRefreshCachedEuiccInfo(it.cardId)
             }
         }

app/src/main/java/im/angry/openeuicc/di/PrivilegedUiComponentFactory.kt

@@ -1,9 +1,10 @@
 package im.angry.openeuicc.di
 
+import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.ui.EuiccManagementFragment
 import im.angry.openeuicc.ui.PrivilegedEuiccManagementFragment
 
 class PrivilegedUiComponentFactory : DefaultUiComponentFactory() {
-    override fun createEuiccManagementFragment(slotId: Int, portId: Int): EuiccManagementFragment =
+    override fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
-        PrivilegedEuiccManagementFragment.newInstance(slotId, portId)
+        PrivilegedEuiccManagementFragment.newInstance(channel.slotId, channel.portId)
 }

app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt

@@ -9,12 +9,12 @@ import android.telephony.euicc.DownloadableSubscription
 import android.telephony.euicc.EuiccInfo
 import android.util.Log
 import net.typeblog.lpac_jni.LocalProfileInfo
+import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
-import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.util.*
-import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
-import kotlin.IllegalStateException
+import java.lang.IllegalStateException
 
 class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
     companion object {
@@ -37,10 +37,16 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
         }
 
     private data class EuiccChannelManagerContext(
-        val euiccChannelManagerService: EuiccChannelManagerService
+        val euiccChannelManager: EuiccChannelManager
     ) {
-        val euiccChannelManager
+        fun findChannel(physicalSlotId: Int): EuiccChannel? =
-            get() = euiccChannelManagerService.euiccChannelManager
+            euiccChannelManager.findEuiccChannelByPhysicalSlotBlocking(physicalSlotId)
+
+        fun findChannel(slotId: Int, portId: Int): EuiccChannel? =
+            euiccChannelManager.findEuiccChannelByPortBlocking(slotId, portId)
+
+        fun findAllChannels(physicalSlotId: Int): List<EuiccChannel>? =
+            euiccChannelManager.findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId)
     }
 
     /**
@@ -53,7 +59,7 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
      *
      * This function cannot be inline because non-local returns may bypass the unbind
      */
-    private fun <T> withEuiccChannelManager(fn: suspend EuiccChannelManagerContext.() -> T): T {
+    private fun <T> withEuiccChannelManager(fn: EuiccChannelManagerContext.() -> T): T {
         val (binder, unbind) = runBlocking {
             bindServiceSuspended(
                 Intent(
@@ -67,24 +73,23 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
             throw RuntimeException("Unable to bind to EuiccChannelManagerService; aborting")
         }
 
-        val localBinder = binder as EuiccChannelManagerService.LocalBinder
+        val ret =
-
+            EuiccChannelManagerContext((binder as EuiccChannelManagerService.LocalBinder).service.euiccChannelManager).fn()
-        val ret = runBlocking {
-            EuiccChannelManagerContext(localBinder.service).fn()
-        }
 
         unbind()
         return ret
     }
 
     override fun onGetEid(slotId: Int): String? = withEuiccChannelManager {
-        val portId = euiccChannelManager.findFirstAvailablePort(slotId)
+        findChannel(slotId)?.lpa?.eID
-        if (portId < 0) return@withEuiccChannelManager null
-        euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
-            channel.lpa.eID
-        }
     }
 
+    // When two eSIM cards are present on one device, the Android settings UI
+    // gets confused and sets the incorrect slotId for profiles from one of
+    // the cards. This function helps Detect this case and abort early.
+    private fun EuiccChannel.profileExists(iccid: String?) =
+        lpa.profiles.any { it.iccid == iccid }
+
     private fun ensurePortIsMapped(slotId: Int, portId: Int) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             return
@@ -116,11 +121,7 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
         telephonyManager.simSlotMapping = mappings.reversed()
     }
 
-    private suspend fun <T> retryWithTimeout(
+    private fun <T> retryWithTimeout(timeoutMillis: Int, backoff: Int = 1000, f: () -> T?): T? {
-        timeoutMillis: Int,
-        backoff: Int = 1000,
-        f: suspend () -> T?
-    ): T? {
         val startTimeMillis = System.currentTimeMillis()
         do {
             try {
@@ -128,7 +129,7 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
             } catch (_: Exception) {
                 // Ignore
             } finally {
-                delay(backoff.toLong())
+                Thread.sleep(backoff.toLong())
             }
         } while (System.currentTimeMillis() - startTimeMillis < timeoutMillis)
         return null
@@ -176,54 +177,38 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
         }
 
         // TODO: Temporarily enable the slot to access its profiles if it is currently unmapped
-        val port = euiccChannelManager.findFirstAvailablePort(slotId)
+        val channel =
-        if (port == -1) {
+            findChannel(slotId) ?: return@withEuiccChannelManager GetEuiccProfileInfoListResult(
-            return@withEuiccChannelManager GetEuiccProfileInfoListResult(
                 RESULT_FIRST_USER,
                 arrayOf(),
                 true
             )
-        }
+        val profiles = channel.lpa.profiles.operational.map {
-
+            EuiccProfileInfo.Builder(it.iccid).apply {
-        try {
+                setProfileName(it.name)
-            return@withEuiccChannelManager euiccChannelManager.withEuiccChannel(
+                setNickname(it.displayName)
-                slotId,
+                setServiceProviderName(it.providerName)
-                port
+                setState(
-            ) { channel ->
+                    when (it.state) {
-                val profiles = channel.lpa.profiles.operational.map {
+                        LocalProfileInfo.State.Enabled -> EuiccProfileInfo.PROFILE_STATE_ENABLED
-                    EuiccProfileInfo.Builder(it.iccid).apply {
+                        LocalProfileInfo.State.Disabled -> EuiccProfileInfo.PROFILE_STATE_DISABLED
-                        setProfileName(it.name)
+                    }
-                        setNickname(it.displayName)
-                        setServiceProviderName(it.providerName)
-                        setState(
-                            when (it.state) {
-                                LocalProfileInfo.State.Enabled -> EuiccProfileInfo.PROFILE_STATE_ENABLED
-                                LocalProfileInfo.State.Disabled -> EuiccProfileInfo.PROFILE_STATE_DISABLED
-                            }
-                        )
-                        setProfileClass(
-                            when (it.profileClass) {
-                                LocalProfileInfo.Clazz.Testing -> EuiccProfileInfo.PROFILE_CLASS_TESTING
-                                LocalProfileInfo.Clazz.Provisioning -> EuiccProfileInfo.PROFILE_CLASS_PROVISIONING
-                                LocalProfileInfo.Clazz.Operational -> EuiccProfileInfo.PROFILE_CLASS_OPERATIONAL
-                            }
-                        )
-                    }.build()
-                }
-
-                GetEuiccProfileInfoListResult(
-                    RESULT_OK,
-                    profiles.toTypedArray(),
-                    channel.port.card.isRemovable
                 )
-            }
+                setProfileClass(
-        } catch (e: EuiccChannelManager.EuiccChannelNotFoundException) {
+                    when (it.profileClass) {
-            return@withEuiccChannelManager GetEuiccProfileInfoListResult(
+                        LocalProfileInfo.Clazz.Testing -> EuiccProfileInfo.PROFILE_CLASS_TESTING
-                RESULT_FIRST_USER,
+                        LocalProfileInfo.Clazz.Provisioning -> EuiccProfileInfo.PROFILE_CLASS_PROVISIONING
-                arrayOf(),
+                        LocalProfileInfo.Clazz.Operational -> EuiccProfileInfo.PROFILE_CLASS_OPERATIONAL
-                true
+                    }
-            )
+                )
+            }.build()
         }
+
+        return@withEuiccChannelManager GetEuiccProfileInfoListResult(
+            RESULT_OK,
+            profiles.toTypedArray(),
+            channel.removable
+        )
     }
 
     override fun onGetEuiccInfo(slotId: Int): EuiccInfo {
@@ -234,30 +219,39 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
         Log.i(TAG, "onDeleteSubscription slotId=$slotId iccid=$iccid")
         if (shouldIgnoreSlot(slotId)) return@withEuiccChannelManager RESULT_FIRST_USER
 
-        val ports = euiccChannelManager.findAvailablePorts(slotId)
+        try {
-        if (ports.isEmpty()) return@withEuiccChannelManager RESULT_FIRST_USER
+            val channels =
+                findAllChannels(slotId) ?: return@withEuiccChannelManager RESULT_FIRST_USER
 
-        // Check that the profile has been disabled on all slots
+            if (!channels[0].profileExists(iccid)) {
-        val enabledAnywhere = ports.any { port ->
+                return@withEuiccChannelManager RESULT_FIRST_USER
-            euiccChannelManager.withEuiccChannel(slotId, port) { channel ->
+            }
+
+            // If the profile is enabled by ANY channel (port), we cannot delete it
+            channels.forEach { channel ->
                 val profile = channel.lpa.profiles.find {
                     it.iccid == iccid
-                } ?: return@withEuiccChannel false
+                } ?: return@withEuiccChannelManager RESULT_FIRST_USER
 
-                profile.state == LocalProfileInfo.State.Enabled
+                if (profile.state == LocalProfileInfo.State.Enabled) {
+                    // Must disable the profile first
+                    return@withEuiccChannelManager RESULT_FIRST_USER
+                }
             }
-        }
 
-        if (enabledAnywhere) return@withEuiccChannelManager RESULT_FIRST_USER
+            euiccChannelManager.beginTrackedOperationBlocking(channels[0].slotId, channels[0].portId) {
+                if (channels[0].lpa.deleteProfile(iccid)) {
+                    return@withEuiccChannelManager RESULT_OK
+                }
 
-        euiccChannelManagerService.waitForForegroundTask()
+                runBlocking {
-        val success = euiccChannelManagerService.launchProfileDeleteTask(slotId, ports[0], iccid)
+                    preferenceRepository.notificationDeleteFlow.first()
-            .waitDone() == null
+                }
+            }
 
-        return@withEuiccChannelManager if (success) {
+            return@withEuiccChannelManager RESULT_FIRST_USER
-            RESULT_OK
+        } catch (e: Exception) {
-        } else {
+            return@withEuiccChannelManager RESULT_FIRST_USER
-            RESULT_FIRST_USER
         }
     }
 
@@ -280,90 +274,51 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
         if (shouldIgnoreSlot(slotId)) return@withEuiccChannelManager RESULT_FIRST_USER
 
         try {
-            // First, try to find a pair of slotId and portId we can use for the switching operation
             // retryWithTimeout is needed here because this function may be called just after
             // AOSP has switched slot mappings, in which case the slots may not be ready yet.
-            val (foundSlotId, foundPortId) = retryWithTimeout(5000) {
+            val channel = if (portIndex == -1) {
-                if (portIndex == -1) {
+                retryWithTimeout(5000) { findChannel(slotId) }
-                    // If port is not indicated, we can use any port
-                    val port = euiccChannelManager.findFirstAvailablePort(slotId).let {
-                        if (it < 0) {
-                            throw IllegalStateException("No mapped port available; may need to try again")
-                        }
-
-                        it
-                    }
-
-                    Pair(slotId, port)
-                } else {
-                    // Else, check until the indicated port is available
-                    euiccChannelManager.withEuiccChannel(slotId, portIndex) { channel ->
-                        if (!channel.valid) {
-                            throw IllegalStateException("Indicated slot / port combination is unavailable; may need to try again")
-                        }
-                    }
-
-                    Pair(slotId, portIndex)
-                }
-            } ?: run {
-                // Failure case: mapped slots / ports aren't usable per constraints
-                // If we can't find a usable slot / port already mapped, and we aren't allowed to
-                // deactivate a SIM, we can only abort
-                if (!forceDeactivateSim) {
-                    return@withEuiccChannelManager RESULT_MUST_DEACTIVATE_SIM
-                }
-
-                // If port ID is not indicated, we just try to map port 0
-                // This is because in order to get here, we have to have failed findFirstAvailablePort(),
-                // which means no eUICC port is mapped or connected properly whatsoever.
-                val foundPortId = if (portIndex == -1) {
-                    0
-                } else {
-                    portIndex
-                }
-
-                // Now we can try to map an unused port
-                try {
-                    ensurePortIsMapped(slotId, foundPortId)
-                } catch (_: Exception) {
-                    return@withEuiccChannelManager RESULT_FIRST_USER
-                }
-
-                // Wait for availability again
-                retryWithTimeout(5000) {
-                    euiccChannelManager.withEuiccChannel(slotId, foundPortId) { channel ->
-                        if (!channel.valid) {
-                            throw IllegalStateException("Indicated slot / port combination is unavailable; may need to try again")
-                        }
-                    }
-                } ?: return@withEuiccChannelManager RESULT_FIRST_USER
-
-                Pair(slotId, foundPortId)
-            }
-
-            Log.i(TAG, "Found slotId=$foundSlotId, portId=$foundPortId for switching")
-
-            // Now, figure out what they want us to do: disabling a profile, or enabling a new one?
-            val (foundIccid, enable) = if (iccid == null) {
-                // iccid == null means disabling
-                val foundIccid =
-                    euiccChannelManager.withEuiccChannel(foundSlotId, foundPortId) { channel ->
-                        channel.lpa.profiles.find { it.state == LocalProfileInfo.State.Enabled }
-                    }?.iccid ?: return@withEuiccChannelManager RESULT_FIRST_USER
-                Pair(foundIccid, false)
             } else {
-                Pair(iccid, true)
+                retryWithTimeout(5000) { findChannel(slotId, portIndex) }
+            } ?: run {
+                if (!forceDeactivateSim) {
+                    // The user must select which SIM to deactivate
+                    return@withEuiccChannelManager RESULT_MUST_DEACTIVATE_SIM
+                } else {
+                    try {
+                        // If we are allowed to deactivate any SIM we like, try mapping the indicated port first
+                        ensurePortIsMapped(slotId, portIndex)
+                        retryWithTimeout(5000) { findChannel(slotId, portIndex) }
+                    } catch (e: Exception) {
+                        // We cannot map the port (or it is already mapped)
+                        // but we can also use any port available on the card
+                        retryWithTimeout(5000) { findChannel(slotId) }
+                    } ?: return@withEuiccChannelManager RESULT_FIRST_USER
+                }
             }
 
-            val res = euiccChannelManagerService.launchProfileSwitchTask(
+            if (iccid != null && !channel.profileExists(iccid)) {
-                foundSlotId,
+                Log.i(TAG, "onSwitchToSubscriptionWithPort iccid=$iccid not found")
-                foundPortId,
+                return@withEuiccChannelManager RESULT_FIRST_USER
-                foundIccid,
+            }
-                enable,
-                30 * 1000
-            ).waitDone()
 
-            if (res != null) return@withEuiccChannelManager RESULT_FIRST_USER
+            euiccChannelManager.beginTrackedOperationBlocking(channel.slotId, channel.portId) {
+                if (iccid != null) {
+                    // Disable any active profile first if present
+                    channel.lpa.disableActiveProfile(false)
+                    if (!channel.lpa.enableProfile(iccid)) {
+                        return@withEuiccChannelManager RESULT_FIRST_USER
+                    }
+                } else {
+                    if (!channel.lpa.disableActiveProfile(true)) {
+                        return@withEuiccChannelManager RESULT_FIRST_USER
+                    }
+                }
+
+                runBlocking {
+                    preferenceRepository.notificationSwitchFlow.first()
+                }
+            }
 
             return@withEuiccChannelManager RESULT_OK
         } catch (e: Exception) {
@@ -380,19 +335,13 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
                 "onUpdateSubscriptionNickname slotId=$slotId iccid=$iccid nickname=$nickname"
             )
             if (shouldIgnoreSlot(slotId)) return@withEuiccChannelManager RESULT_FIRST_USER
-            val port = euiccChannelManager.findFirstAvailablePort(slotId)
+            val channel = findChannel(slotId) ?: return@withEuiccChannelManager RESULT_FIRST_USER
-            if (port < 0) {
+            if (!channel.profileExists(iccid)) {
                 return@withEuiccChannelManager RESULT_FIRST_USER
             }
-
+            val success = channel.lpa
-            euiccChannelManagerService.waitForForegroundTask()
+                .setNickname(iccid, nickname!!)
-            val success =
+            appContainer.subscriptionManager.tryRefreshCachedEuiccInfo(channel.cardId)
-                (euiccChannelManagerService.launchProfileRenameTask(slotId, port, iccid, nickname!!)
-                    .waitDone()) == null
-
-            euiccChannelManager.withEuiccChannel(slotId, port) { channel ->
-                appContainer.subscriptionManager.tryRefreshCachedEuiccInfo(channel.cardId)
-            }
             return@withEuiccChannelManager if (success) {
                 RESULT_OK
             } else {

app/src/main/java/im/angry/openeuicc/ui/PrivilegedEuiccManagementFragment.kt

@@ -6,6 +6,8 @@ import android.widget.Button
 import android.widget.PopupMenu
 import im.angry.openeuicc.R
 import im.angry.openeuicc.util.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import net.typeblog.lpac_jni.LocalProfileInfo
 
 class PrivilegedEuiccManagementFragment: EuiccManagementFragment() {
@@ -14,23 +16,14 @@ class PrivilegedEuiccManagementFragment: EuiccManagementFragment() {
             newInstanceEuicc(PrivilegedEuiccManagementFragment::class.java, slotId, portId)
     }
 
-    private var isMEP = false
-    private var isRemovable = false
-
-    override suspend fun doRefresh() {
-        super.doRefresh()
-        withEuiccChannel { channel ->
-            isMEP = channel.isMEP
-            isRemovable = channel.port.card.isRemovable
-        }
-    }
-
     override suspend fun onCreateFooterViews(
         parent: ViewGroup,
         profiles: List<LocalProfileInfo>
     ): List<View> =
         super.onCreateFooterViews(parent, profiles).let { footers ->
-            if (isMEP) {
+            // isMEP can map to a slow operation (UiccCardInfo.isMultipleEnabledProfilesSupported())
+            // so let's do it in the IO context
+            if (withContext(Dispatchers.IO) { channel.isMEP }) {
                 val view = layoutInflater.inflate(R.layout.footer_mep, parent, false)
                 view.requireViewById<Button>(R.id.footer_mep_slot_mapping).setOnClickListener {
                     (requireActivity() as PrivilegedMainActivity).showSlotMappingFragment()
@@ -43,7 +36,7 @@ class PrivilegedEuiccManagementFragment: EuiccManagementFragment() {
 
     override fun populatePopupWithProfileActions(popup: PopupMenu, profile: LocalProfileInfo) {
         super.populatePopupWithProfileActions(popup, profile)
-        if (profile.isEnabled && !isRemovable) {
+        if (profile.isEnabled && !channel.removable) {
             // Only show the disable option for non-removable eUICCs
             // Some devices without internal eUICCs have the "optimization" of ignoring SIM
             // slots without a valid profile. This can lead to "bricking" of external eUICCs

app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyCompat.kt

@@ -33,7 +33,7 @@ class RealUiccCardInfoCompat(val inner: UiccCardInfo): UiccCardInfoCompat {
     val isEuicc: Boolean
         get() = inner.isEuicc
 
-    override val isRemovable: Boolean
+    val isRemovable: Boolean
         get() = inner.isRemovable
 
     val isMultipleEnabledProfilesSupported: Boolean

app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyUtils.kt

@@ -5,7 +5,6 @@ import android.telephony.TelephonyManager
 import android.telephony.UiccSlotMapping
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.runBlocking
 import java.lang.Exception
 
@@ -16,14 +15,14 @@ val TelephonyManager.dsdsEnabled: Boolean
     get() = activeModemCount >= 2
 
 fun TelephonyManager.setDsdsEnabled(euiccManager: EuiccChannelManager, enabled: Boolean) {
+    val knownChannels = runBlocking {
+        euiccManager.enumerateEuiccChannels()
+    }
+
     // Disable all eSIM profiles before performing a DSDS switch (only for internal eSIMs)
-    runBlocking {
+    knownChannels.forEach {
-        euiccManager.flowEuiccPorts().onEach { (slotId, portId) ->
+        if (!it.removable) {
-            euiccManager.withEuiccChannel(slotId, portId) {
+            it.lpa.disableActiveProfileWithUndo(false)
-                if (!it.port.card.isRemovable) {
-                    it.lpa.disableActiveProfile(false)
-                }
-            }
         }
     }
 
@@ -32,7 +31,7 @@ fun TelephonyManager.setDsdsEnabled(euiccManager: EuiccChannelManager, enabled:
 
 // Disable eSIM profiles before switching the slot mapping
 // This ensures that unmapped eSIM ports never have "ghost" profiles enabled
-suspend fun TelephonyManager.updateSimSlotMapping(
+fun TelephonyManager.updateSimSlotMapping(
     euiccManager: EuiccChannelManager, newMapping: Collection<UiccSlotMapping>,
     currentMapping: Collection<UiccSlotMapping> = simSlotMapping
 ) {
@@ -43,24 +42,14 @@ suspend fun TelephonyManager.updateSimSlotMapping(
         }
     }
 
-    val undo: List<suspend () -> Unit> = unmapped.mapNotNull { mapping ->
+    val undo = unmapped.mapNotNull { mapping ->
-        euiccManager.withEuiccChannel(mapping.physicalSlotIndex, mapping.portIndex) { channel ->
+        euiccManager.findEuiccChannelByPortBlocking(mapping.physicalSlotIndex, mapping.portIndex)?.let { channel ->
-            if (!channel.port.card.isRemovable) {
+            if (!channel.removable) {
-                channel.lpa.disableActiveProfileKeepIccId(false)
+                return@mapNotNull channel.lpa.disableActiveProfileWithUndo(false)
             } else {
                 // Do not do anything for external eUICCs -- we can't really trust them to work properly
                 // with no profile enabled.
-                null
+                return@mapNotNull null
-            }
-        }?.let { iccid ->
-            // Generate undo closure because we can't keep reference to `channel` in the closure above
-            {
-                euiccManager.withEuiccChannel(
-                    mapping.physicalSlotIndex,
-                    mapping.portIndex
-                ) { channel ->
-                    channel.lpa.enableProfile(iccid)
-                }
             }
         }
     }
@@ -86,6 +75,9 @@ fun SubscriptionManager.tryRefreshCachedEuiccInfo(cardId: Int) {
 
 // Every EuiccChannel we use here should be backed by a RealUiccPortInfoCompat
 // except when it is from a USB card reader
+val EuiccChannel.removable
+    get() = (port as? RealUiccPortInfoCompat)?.card?.isRemovable ?: true
+
 val EuiccChannel.cardId
     get() = (port as? RealUiccPortInfoCompat)?.card?.cardId ?: -1
 

app/src/main/res/values/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">OpenEUICC</string>
     <string name="no_euicc">No eUICC found on this device.\nOn some devices, you may need to enable dual SIM first in the menu of this app.</string>
-    <string name="telephony_manager">TelephonyManager (Privileged)</string>
 
     <string name="dsds">Dual SIM</string>
 

libs/lpac-jni/src/main/java/net/typeblog/lpac_jni/impl/RootCertificates.kt

@@ -7,9 +7,6 @@ import java.security.cert.CertificateFactory
 
 const val DEFAULT_PKID_GSMA_RSP2_ROOT_CI1 = "81370f5125d0b1d408d4c3b232e6d25e795bebfb"
 
-val PKID_GSMA_TEST_CI =
-    arrayOf("34eecf13156518d48d30bdf06853404d115f955d", "2209f61cd9ec5c9c854e787341ff83ecf9776a5b")
-
 private fun getCertificate(keyId: String): Certificate? =
     KNOWN_CI_CERTS[keyId]?.toByteArray()?.let { cert ->
         ByteArrayInputStream(cert).use { stream ->
@@ -38,7 +35,7 @@ internal fun keyIdToKeystore(keyIds: Array<String>): KeyStore {
     return ret
 }
 
-// ref: <https://euicc-manual.osmocom.org/docs/pki/ci/>
+// ref: <https://euicc-manual.septs.app/docs/pki/ci/>
 internal val KNOWN_CI_CERTS = hashMapOf(
     // GSM Association - RSP2 Root CI1 (CA: DigiCert)
     // Specs: SGP.21 and SGP.22 version 2 and version 3