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

@@ -13,7 +13,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
@@ -208,7 +208,7 @@ open class DefaultEuiccChannelManager(
         }
     }
 
-    override fun flowInternalEuiccPorts(): Flow<Pair<Int, Int>> = flow {
+    override fun flowEuiccPorts(): Flow<Pair<Int, Int>> = flow {
         uiccCards.forEach { info ->
             info.ports.forEach { port ->
                 tryOpenEuiccChannel(port)?.also {
@@ -223,13 +223,6 @@ open class DefaultEuiccChannelManager(
         }
     }.flowOn(Dispatchers.IO)
 
-    override fun flowAllOpenEuiccPorts(): Flow<Pair<Int, Int>> =
-        merge(flowInternalEuiccPorts(), flow {
-            if (tryOpenUsbEuiccChannel().second) {
-                emit(Pair(EuiccChannelManager.USB_CHANNEL_ID, 0))
-            }
-        })
-
     override suspend fun tryOpenUsbEuiccChannel(): Pair<UsbDevice?, Boolean> =
         withContext(Dispatchers.IO) {
             usbManager.deviceList.values.forEach { device ->

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

@@ -26,16 +26,7 @@ interface EuiccChannelManager {
      *
      * To obtain a temporary reference to a EuiccChannel, use `withEuiccChannel()`.
      */
-    fun flowInternalEuiccPorts(): Flow<Pair<Int, Int>>
-
-    /**
-     * Same as flowInternalEuiccPorts(), except that this includes non-device internal eUICC chips
-     * as well. Namely, this includes the USB reader.
-     *
-     * Non-internal readers will only be included if they have been opened properly, i.e. with permissions
-     * granted by the user.
-     */
-    fun flowAllOpenEuiccPorts(): Flow<Pair<Int, Int>>
+    fun flowEuiccPorts(): Flow<Pair<Int, Int>>
 
     /**
      * Scan all possible USB devices for CCID readers that may contain eUICC cards.

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

@@ -151,7 +151,7 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
 
         val newPages: MutableList<Page> = mutableListOf()
 
-        euiccChannelManager.flowInternalEuiccPorts().onEach { (slotId, portId) ->
+        euiccChannelManager.flowEuiccPorts().onEach { (slotId, portId) ->
             Log.d(TAG, "slot $slotId port $portId")
 
             euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->

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

@@ -14,7 +14,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.toList
@@ -92,7 +91,7 @@ class DownloadWizardSlotSelectFragment : DownloadWizardActivity.DownloadWizardSt
     private suspend fun init() {
         ensureEuiccChannelManager()
         showProgressBar(-1)
-        val slots = euiccChannelManager.flowAllOpenEuiccPorts().map { (slotId, portId) ->
+        val slots = euiccChannelManager.flowEuiccPorts().map { (slotId, portId) ->
             euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
                 SlotInfo(
                     channel.logicalSlotId,
@@ -151,7 +150,6 @@ class DownloadWizardSlotSelectFragment : DownloadWizardActivity.DownloadWizardSt
         @Suppress("UNUSED_PARAMETER")
         fun onSelect(view: View) {
             if (curIdx < 0) return
-            checkBox.isChecked = true
             if (adapter.currentSelectedIdx == curIdx) return
             val lastIdx = adapter.currentSelectedIdx
             adapter.currentSelectedIdx = curIdx
@@ -176,11 +174,7 @@ class DownloadWizardSlotSelectFragment : DownloadWizardActivity.DownloadWizardSt
                 )
             }
 
-            title.text = if (item.logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
-                root.context.getString(R.string.usb)
-            } else {
-                root.context.getString(R.string.download_wizard_slot_title, item.logicalSlotId)
-            }
+            title.text = root.context.getString(R.string.download_wizard_slot_title, item.logicalSlotId)
             eID.text = item.eID
             activeProfile.text = item.enabledProfileName ?: root.context.getString(R.string.unknown)
             freeSpace.text = formatFreeSpace(item.freeSpace)

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

@@ -18,7 +18,7 @@ val TelephonyManager.dsdsEnabled: Boolean
 fun TelephonyManager.setDsdsEnabled(euiccManager: EuiccChannelManager, enabled: Boolean) {
     // Disable all eSIM profiles before performing a DSDS switch (only for internal eSIMs)
     runBlocking {
-        euiccManager.flowInternalEuiccPorts().onEach { (slotId, portId) ->
+        euiccManager.flowEuiccPorts().onEach { (slotId, portId) ->
             euiccManager.withEuiccChannel(slotId, portId) {
                 if (!it.port.card.isRemovable) {
                     it.lpa.disableActiveProfile(false)