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

@@ -20,8 +20,7 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
 
     override suspend fun tryOpenEuiccChannel(
         port: UiccPortInfoCompat,
-        isdrAid: ByteArray,
+        isdrAid: ByteArray
-        seId: EuiccChannel.SecureElementId,
     ): EuiccChannel? {
         if (port.portIndex != 0) {
             Log.w(
@@ -47,7 +46,6 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
                     context.preferenceRepository.verboseLoggingFlow
                 ),
                 isdrAid,
-                seId,
                 context.preferenceRepository.verboseLoggingFlow,
                 context.preferenceRepository.ignoreTLSCertificateFlow,
             ).also {
@@ -67,8 +65,7 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
 
     override fun tryOpenUsbEuiccChannel(
         ccidCtx: UsbCcidContext,
-        isdrAid: ByteArray,
+        isdrAid: ByteArray
-        seId: EuiccChannel.SecureElementId
     ): EuiccChannel? {
         try {
             return EuiccChannelImpl(
@@ -79,7 +76,6 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
                     ccidCtx
                 ),
                 isdrAid,
-                seId,
                 context.preferenceRepository.verboseLoggingFlow,
                 context.preferenceRepository.ignoreTLSCertificateFlow,
             )

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

@@ -32,7 +32,7 @@ open class DefaultEuiccChannelManager(
 
     private val channelCache = mutableListOf<EuiccChannel>()
 
-    private var usbChannels = mutableListOf<EuiccChannel>()
+    private var usbChannel: EuiccChannel? = null
 
     private val lock = Mutex()
 
@@ -51,20 +51,15 @@ open class DefaultEuiccChannelManager(
     protected open val uiccCards: Collection<UiccCardInfoCompat>
         get() = (0..<tm.activeModemCountCompat).map { FakeUiccCardInfoCompat(it) }
 
-    private suspend inline fun tryOpenChannelWithKnownAids(openFn: (ByteArray, EuiccChannel.SecureElementId) -> EuiccChannel?): List<EuiccChannel> {
+    private suspend inline fun tryOpenChannelFirstValidAid(openFn: (ByteArray) -> EuiccChannel?): EuiccChannel? {
         val isdrAidList =
             parseIsdrAidList(appContainer.preferenceRepository.isdrAidListFlow.first())
-        var seId = 0
 
-        return isdrAidList.mapNotNull {
+        return isdrAidList.firstNotNullOfOrNull {
-            Log.i(
+            Log.i(TAG, "Opening channel, trying ISDR AID ${it.encodeHex()}")
-                TAG,
-                "Opening channel, trying ISDR AID ${it.encodeHex()}, this will be seId $seId"
-            )
 
-            openFn(it, EuiccChannel.SecureElementId.createFromInt(seId))?.let { channel ->
+            openFn(it)?.let { channel ->
                 if (channel.valid) {
-                    seId += 1
                     channel
                 } else {
                     channel.close()
@@ -74,18 +69,19 @@ open class DefaultEuiccChannelManager(
         }
     }
 
-    private suspend fun tryOpenEuiccChannel(
+    private suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat): EuiccChannel? {
-        port: UiccPortInfoCompat,
-        seId: EuiccChannel.SecureElementId = EuiccChannel.SecureElementId.DEFAULT
-    ): EuiccChannel? {
         lock.withLock {
             if (port.card.physicalSlotIndex == EuiccChannelManager.USB_CHANNEL_ID) {
-                // We only compare seId because we assume we can only open 1 card from USB
+                return if (usbChannel != null && usbChannel!!.valid) {
-                return usbChannels.find { it.seId == seId }
+                    usbChannel
+                } else {
+                    usbChannel = null
+                    null
+                }
             }
 
             val existing =
-                channelCache.find { it.slotId == port.card.physicalSlotIndex && it.portId == port.portIndex && it.seId == seId }
+                channelCache.find { it.slotId == port.card.physicalSlotIndex && it.portId == port.portIndex }
             if (existing != null) {
                 if (existing.valid && port.logicalSlotIndex == existing.logicalSlotId) {
                     return existing
@@ -100,18 +96,12 @@ open class DefaultEuiccChannelManager(
                 return null
             }
 
-            val channels =
+            val channel =
-                tryOpenChannelWithKnownAids { isdrAid, seId ->
+                tryOpenChannelFirstValidAid { euiccChannelFactory.tryOpenEuiccChannel(port, it) }
-                    euiccChannelFactory.tryOpenEuiccChannel(
-                        port,
-                        isdrAid,
-                        seId
-                    )
-                }
 
-            if (channels.isNotEmpty()) {
+            if (channel != null) {
-                channelCache.addAll(channels)
+                channelCache.add(channel)
-                return channels.find { it.seId == seId }
+                return channel
             } else {
                 Log.i(
                     TAG,
@@ -122,13 +112,10 @@ open class DefaultEuiccChannelManager(
         }
     }
 
-    protected suspend fun findEuiccChannelByLogicalSlot(
+    protected suspend fun findEuiccChannelByLogicalSlot(logicalSlotId: Int): EuiccChannel? =
-        logicalSlotId: Int,
-        seId: EuiccChannel.SecureElementId = EuiccChannel.SecureElementId.DEFAULT
-    ): EuiccChannel? =
         withContext(Dispatchers.IO) {
             if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
-                return@withContext usbChannels.find { it.seId == seId }
+                return@withContext usbChannel
             }
 
             for (card in uiccCards) {
@@ -144,7 +131,7 @@ open class DefaultEuiccChannelManager(
 
     private suspend fun findAllEuiccChannelsByPhysicalSlot(physicalSlotId: Int): List<EuiccChannel>? {
         if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
-            return usbChannels.ifEmpty { null }
+            return usbChannel?.let { listOf(it) }
         }
 
         for (card in uiccCards) {
@@ -155,18 +142,14 @@ open class DefaultEuiccChannelManager(
         return null
     }
 
-    private suspend fun findEuiccChannelByPort(
+    private suspend fun findEuiccChannelByPort(physicalSlotId: Int, portId: Int): EuiccChannel? =
-        physicalSlotId: Int,
-        portId: Int,
-        seId: EuiccChannel.SecureElementId = EuiccChannel.SecureElementId.DEFAULT
-    ): EuiccChannel? =
         withContext(Dispatchers.IO) {
             if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
-                return@withContext usbChannels.find { it.seId == seId }
+                return@withContext usbChannel
             }
 
             uiccCards.find { it.physicalSlotIndex == physicalSlotId }?.let { card ->
-                card.ports.find { it.portIndex == portId }?.let { tryOpenEuiccChannel(it, seId) }
+                card.ports.find { it.portIndex == portId }?.let { tryOpenEuiccChannel(it) }
             }
         }
 
@@ -185,17 +168,15 @@ open class DefaultEuiccChannelManager(
                 return@withContext listOf(0)
             }
 
-            findAllEuiccChannelsByPhysicalSlot(physicalSlotId)?.map { it.portId }?.toSet()?.toList()
+            findAllEuiccChannelsByPhysicalSlot(physicalSlotId)?.map { it.portId } ?: listOf()
-                ?: listOf()
         }
 
     override suspend fun <R> withEuiccChannel(
         physicalSlotId: Int,
         portId: Int,
-        seId: EuiccChannel.SecureElementId,
         fn: suspend (EuiccChannel) -> R
     ): R {
-        val channel = findEuiccChannelByPort(physicalSlotId, portId, seId)
+        val channel = findEuiccChannelByPort(physicalSlotId, portId)
             ?: throw EuiccChannelManager.EuiccChannelNotFoundException()
         val wrapper = EuiccChannelWrapper(channel)
         try {
@@ -209,10 +190,9 @@ open class DefaultEuiccChannelManager(
 
     override suspend fun <R> withEuiccChannel(
         logicalSlotId: Int,
-        seId: EuiccChannel.SecureElementId,
         fn: suspend (EuiccChannel) -> R
     ): R {
-        val channel = findEuiccChannelByLogicalSlot(logicalSlotId, seId)
+        val channel = findEuiccChannelByLogicalSlot(logicalSlotId)
             ?: throw EuiccChannelManager.EuiccChannelNotFoundException()
         val wrapper = EuiccChannelWrapper(channel)
         try {
@@ -226,8 +206,8 @@ open class DefaultEuiccChannelManager(
 
     override suspend fun waitForReconnect(physicalSlotId: Int, portId: Int, timeoutMillis: Long) {
         if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
-            usbChannels.forEach { it.close() }
+            usbChannel?.close()
-            usbChannels.clear()
+            usbChannel = null
         } else {
             // If there is already a valid channel, we close it proactively
             // Sometimes the current channel can linger on for a bit even after it should have become invalid
@@ -243,7 +223,7 @@ open class DefaultEuiccChannelManager(
                         // tryOpenUsbEuiccChannel() will always try to reopen the channel, even if
                         // a USB channel already exists
                         tryOpenUsbEuiccChannel()
-                        usbChannels.getOrNull(0)!!
+                        usbChannel!!
                     } else {
                         // tryOpenEuiccChannel() will automatically dispose of invalid channels
                         // and recreate when needed
@@ -284,20 +264,6 @@ open class DefaultEuiccChannelManager(
             }
         })
 
-    override fun flowEuiccSecureElements(
-        slotId: Int,
-        portId: Int
-    ): Flow<EuiccChannel.SecureElementId> = flow {
-        // Emit the "default" channel first
-        // TODO: This function below should really return a list, not just one SE
-        findEuiccChannelByPort(slotId, portId, seId = EuiccChannel.SecureElementId.DEFAULT)?.let {
-            emit(EuiccChannel.SecureElementId.DEFAULT)
-
-            channelCache.filter { it.slotId == slotId && it.portId == portId && it.seId != EuiccChannel.SecureElementId.DEFAULT }
-                .forEach { emit(it.seId) }
-        }
-    }
-
     override suspend fun tryOpenUsbEuiccChannel(): Pair<UsbDevice?, Boolean> =
         withContext(Dispatchers.IO) {
             usbManager.deviceList.values.forEach { device ->
@@ -311,17 +277,15 @@ open class DefaultEuiccChannelManager(
                     "Found CCID interface on ${device.deviceId}:${device.vendorId}, and has permission; trying to open channel"
                 )
 
-                val ccidCtx =
+                val ccidCtx = UsbCcidContext.createFromUsbDevice(context, device, iface) ?: return@forEach
-                    UsbCcidContext.createFromUsbDevice(context, device, iface) ?: return@forEach
 
                 try {
-                    val channels = tryOpenChannelWithKnownAids { isdrAid, seId ->
+                    val channel = tryOpenChannelFirstValidAid {
-                        euiccChannelFactory.tryOpenUsbEuiccChannel(ccidCtx, isdrAid, seId)
+                        euiccChannelFactory.tryOpenUsbEuiccChannel(ccidCtx, it)
                     }
-                    if (channels.isNotEmpty() && channels[0].valid) {
+                    if (channel != null && channel.lpa.valid) {
                         ccidCtx.allowDisconnect = true
-                        usbChannels.clear()
+                        usbChannel = channel
-                        usbChannels.addAll(channels)
                         return@withContext Pair(device, true)
                     }
                 } catch (e: Exception) {
@@ -345,8 +309,8 @@ open class DefaultEuiccChannelManager(
             channel.close()
         }
 
-        usbChannels.forEach { it.close() }
+        usbChannel?.close()
-        usbChannels.clear()
+        usbChannel = null
         channelCache.clear()
         euiccChannelFactory.cleanup()
     }

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

@@ -1,7 +1,5 @@
 package im.angry.openeuicc.core
 
-import android.os.Parcel
-import android.os.Parcelable
 import im.angry.openeuicc.util.*
 import net.typeblog.lpac_jni.ApduInterface
 import net.typeblog.lpac_jni.LocalProfileAssistant
@@ -15,56 +13,6 @@ interface EuiccChannel {
     val logicalSlotId: Int
     val portId: Int
 
-    /**
-     * A semi-obscure wrapper over the integer ID of a secure element on a card.
-     *
-     * Because the ID is arbitrary, this is intended to discourage the use of the
-     * integer value directly. Additionally, it prevents accidentally calling the
-     * wrong function in EuiccChannelManager with a ton of integer parameters.
-     */
-    class SecureElementId private constructor(val id: Int) : Parcelable {
-        companion object {
-            val DEFAULT = SecureElementId(0)
-
-            /**
-             * Create a SecureElementId from an integer ID. You should not
-             */
-            fun createFromInt(id: Int): SecureElementId =
-                SecureElementId(id)
-
-            @Suppress("unused")
-            @JvmField
-            val CREATOR = object : Parcelable.Creator<SecureElementId> {
-                override fun createFromParcel(parcel: Parcel): SecureElementId =
-                    createFromInt(parcel.readInt())
-
-                override fun newArray(size: Int): Array<SecureElementId?> = arrayOfNulls(size)
-            }
-        }
-
-        override fun hashCode(): Int =
-            id.hashCode()
-
-        override fun equals(other: Any?): Boolean =
-            if (other is SecureElementId) {
-                this.id == other.id
-            } else {
-                super.equals(other)
-            }
-
-        override fun describeContents(): Int = id
-
-        override fun writeToParcel(parcel: Parcel, flags: Int) {
-            parcel.writeInt(id)
-        }
-    }
-
-    /**
-     * Some chips support multiple SEs on one chip. The seId here is intended
-     * to distinguish channels opened from these different SEs.
-     */
-    val seId: SecureElementId
-
     val lpa: LocalProfileAssistant
 
     val valid: Boolean

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

@@ -6,12 +6,11 @@ import im.angry.openeuicc.util.*
 // This class is here instead of inside DI because it contains a bit more logic than just
 // "dumb" dependency injection.
 interface EuiccChannelFactory {
-    suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat, isdrAid: ByteArray, seId: EuiccChannel.SecureElementId): EuiccChannel?
+    suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat, isdrAid: ByteArray): EuiccChannel?
 
     fun tryOpenUsbEuiccChannel(
         ccidCtx: UsbCcidContext,
-        isdrAid: ByteArray,
+        isdrAid: ByteArray
-        seId: EuiccChannel.SecureElementId
     ): EuiccChannel?
 
     /**

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

@@ -14,7 +14,6 @@ class EuiccChannelImpl(
     override val intrinsicChannelName: String?,
     override val apduInterface: ApduInterface,
     override val isdrAid: ByteArray,
-    override val seId: EuiccChannel.SecureElementId,
     verboseLoggingFlow: Flow<Boolean>,
     ignoreTLSCertificateFlow: Flow<Boolean>
 ) : EuiccChannel {

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

@@ -37,14 +37,6 @@ interface EuiccChannelManager {
      */
     fun flowAllOpenEuiccPorts(): Flow<Pair<Int, Int>>
 
-    /**
-     * Iterate over all the Secure Elements available on one eUICC.
-     *
-     * This is going to almost always return only 1 result, except in the case where
-     * a card has multiple SEs.
-     */
-    fun flowEuiccSecureElements(slotId: Int, portId: Int): Flow<EuiccChannel.SecureElementId>
-
     /**
      * 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
@@ -89,16 +81,14 @@ interface EuiccChannelManager {
     suspend fun <R> withEuiccChannel(
         physicalSlotId: Int,
         portId: Int,
-        seId: EuiccChannel.SecureElementId = EuiccChannel.SecureElementId.DEFAULT,
         fn: suspend (EuiccChannel) -> R
     ): R
 
     /**
-     * Same as withEuiccChannel(Int, Int, SecureElementId, (EuiccChannel) -> R) but instead uses logical slot ID
+     * Same as withEuiccChannel(Int, Int, (EuiccChannel) -> R) but instead uses logical slot ID
      */
     suspend fun <R> withEuiccChannel(
         logicalSlotId: Int,
-        seId: EuiccChannel.SecureElementId = EuiccChannel.SecureElementId.DEFAULT,
         fn: suspend (EuiccChannel) -> R
     ): R
 

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

@@ -26,8 +26,6 @@ class EuiccChannelWrapper(orig: EuiccChannel) : EuiccChannel {
         get() = channel.logicalSlotId
     override val portId: Int
         get() = channel.portId
-    override val seId: EuiccChannel.SecureElementId
-        get() = channel.seId
     private val lpaDelegate = lazy {
         LocalProfileAssistantWrapper(channel.lpa)
     }

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

@@ -2,18 +2,13 @@ package im.angry.openeuicc.di
 
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceFragmentCompat
-import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.ui.EuiccManagementFragment
 import im.angry.openeuicc.ui.NoEuiccPlaceholderFragment
 import im.angry.openeuicc.ui.SettingsFragment
 
 open class DefaultUiComponentFactory : UiComponentFactory {
-    override fun createEuiccManagementFragment(
+    override fun createEuiccManagementFragment(slotId: Int, portId: Int): EuiccManagementFragment =
-        slotId: Int,
+        EuiccManagementFragment.newInstance(slotId, portId)
-        portId: Int,
-        seId: EuiccChannel.SecureElementId
-    ): EuiccManagementFragment =
-        EuiccManagementFragment.newInstance(slotId, portId, seId)
 
     override fun createNoEuiccPlaceholderFragment(): Fragment = NoEuiccPlaceholderFragment()
 

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

@@ -2,16 +2,10 @@ package im.angry.openeuicc.di
 
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceFragmentCompat
-import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.ui.EuiccManagementFragment
 
 interface UiComponentFactory {
-    fun createEuiccManagementFragment(
+    fun createEuiccManagementFragment(slotId: Int, portId: Int): EuiccManagementFragment
-        slotId: Int,
-        portId: Int,
-        seId: EuiccChannel.SecureElementId
-    ): EuiccManagementFragment
-
     fun createNoEuiccPlaceholderFragment(): Fragment
     fun createSettingsFragment(): Fragment
 }

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

@@ -36,7 +36,6 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     private lateinit var infoList: RecyclerView
 
     private var logicalSlotId: Int = -1
-    private var seId: EuiccChannel.SecureElementId = EuiccChannel.SecureElementId.DEFAULT
 
     data class Item(
         @StringRes
@@ -61,12 +60,6 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         }
 
         logicalSlotId = intent.getIntExtra("logicalSlotId", 0)
-        seId = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            intent.getParcelableExtra("seId", EuiccChannel.SecureElementId::class.java)
-        } else {
-            @Suppress("DEPRECATION")
-            intent.getParcelableExtra("seId")!!
-        } ?: EuiccChannel.SecureElementId.DEFAULT
 
         val channelTitle = if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
             getString(R.string.usb)
@@ -99,7 +92,7 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
 
         lifecycleScope.launch {
             (infoList.adapter!! as EuiccInfoAdapter).euiccInfoItems =
-                euiccChannelManager.withEuiccChannel(logicalSlotId, fn = ::buildEuiccInfoItems)
+                euiccChannelManager.withEuiccChannel(logicalSlotId, ::buildEuiccInfoItems)
 
             swipeRefresh.isRefreshing = false
         }
@@ -107,43 +100,19 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
 
     private fun buildEuiccInfoItems(channel: EuiccChannel) = buildList {
         add(Item(R.string.euicc_info_access_mode, channel.type))
-        add(
+        add(Item(R.string.euicc_info_removable, formatByBoolean(channel.port.card.isRemovable, YES_NO)))
-            Item(
+        add(Item(R.string.euicc_info_eid, channel.lpa.eID, copiedToastResId = R.string.toast_eid_copied))
-                R.string.euicc_info_removable,
-                formatByBoolean(channel.port.card.isRemovable, YES_NO)
-            )
-        )
-        add(
-            Item(
-                R.string.euicc_info_eid,
-                channel.lpa.eID,
-                copiedToastResId = R.string.toast_eid_copied
-            )
-        )
         add(Item(R.string.euicc_info_isdr_aid, channel.isdrAid.encodeHex()))
         channel.tryParseEuiccVendorInfo()?.let { vendorInfo ->
             vendorInfo.skuName?.let { add(Item(R.string.euicc_info_sku, it)) }
-            vendorInfo.serialNumber?.let {
+            vendorInfo.serialNumber?.let { add(Item(R.string.euicc_info_sn, it, copiedToastResId = R.string.toast_sn_copied)) }
-                add(
-                    Item(
-                        R.string.euicc_info_sn,
-                        it,
-                        copiedToastResId = R.string.toast_sn_copied
-                    )
-                )
-            }
             vendorInfo.firmwareVersion?.let { add(Item(R.string.euicc_info_fw_ver, it)) }
             vendorInfo.bootloaderVersion?.let { add(Item(R.string.euicc_info_bl_ver, it)) }
         }
         channel.lpa.euiccInfo2.let { info ->
             add(Item(R.string.euicc_info_sgp22_version, info?.sgp22Version.toString()))
             add(Item(R.string.euicc_info_firmware_version, info?.euiccFirmwareVersion.toString()))
-            add(
+            add(Item(R.string.euicc_info_globalplatform_version, info?.globalPlatformVersion.toString()))
-                Item(
-                    R.string.euicc_info_globalplatform_version,
-                    info?.globalPlatformVersion.toString()
-                )
-            )
             add(Item(R.string.euicc_info_pp_version, info?.ppVersion.toString()))
             add(Item(R.string.euicc_info_sas_accreditation_number, info?.sasAccreditationNumber))
             add(Item(R.string.euicc_info_free_nvram, info?.freeNvram?.let(::formatFreeSpace)))

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

@@ -31,7 +31,6 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import net.typeblog.lpac_jni.LocalProfileInfo
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.service.EuiccChannelManagerService
 import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.ui.wizard.DownloadWizardActivity
@@ -50,12 +49,8 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
     companion object {
         const val TAG = "EuiccManagementFragment"
 
-        fun newInstance(
+        fun newInstance(slotId: Int, portId: Int): EuiccManagementFragment =
-            slotId: Int,
+            newInstanceEuicc(EuiccManagementFragment::class.java, slotId, portId)
-            portId: Int,
-            seId: EuiccChannel.SecureElementId
-        ): EuiccManagementFragment =
-            newInstanceEuicc(EuiccManagementFragment::class.java, slotId, portId, seId)
     }
 
     private lateinit var swipeRefresh: SwipeRefreshLayout
@@ -153,7 +148,6 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         R.id.show_notifications -> {
             Intent(requireContext(), NotificationsActivity::class.java).apply {
                 putExtra("logicalSlotId", logicalSlotId)
-                putExtra("seId", seId)
                 startActivity(this)
             }
             true
@@ -162,14 +156,13 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         R.id.euicc_info -> {
             Intent(requireContext(), EuiccInfoActivity::class.java).apply {
                 putExtra("logicalSlotId", logicalSlotId)
-                putExtra("seId", seId)
                 startActivity(this)
             }
             true
         }
 
         R.id.euicc_memory_reset -> {
-            EuiccMemoryResetFragment.newInstance(slotId, portId, seId, eid)
+            EuiccMemoryResetFragment.newInstance(slotId, portId, eid)
                 .show(childFragmentManager, EuiccMemoryResetFragment.TAG)
             true
         }
@@ -301,10 +294,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         }
     }
 
-    protected open fun populatePopupWithProfileActions(
+    protected open fun populatePopupWithProfileActions(popup: PopupMenu, profile: LocalProfileInfo) {
-        popup: PopupMenu,
-        profile: LocalProfileInfo
-    ) {
         popup.inflate(R.menu.profile_options)
         if (profile.isEnabled) {
             popup.menu.findItem(R.id.enable).isVisible = false
@@ -331,7 +321,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         }
     }
 
-    inner class FooterViewHolder : ViewHolder(FrameLayout(requireContext())) {
+    inner class FooterViewHolder: ViewHolder(FrameLayout(requireContext())) {
         init {
             itemView.layoutParams = ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -423,36 +413,20 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                     enableOrDisableProfile(profile.iccid, true)
                     true
                 }
-
                 R.id.disable -> {
                     enableOrDisableProfile(profile.iccid, false)
                     true
                 }
-
                 R.id.rename -> {
-                    ProfileRenameFragment.newInstance(
+                    ProfileRenameFragment.newInstance(slotId, portId, profile.iccid, profile.displayName)
-                        slotId,
-                        portId,
-                        seId,
-                        profile.iccid,
-                        profile.displayName
-                    )
                         .show(childFragmentManager, ProfileRenameFragment.TAG)
                     true
                 }
-
                 R.id.delete -> {
-                    ProfileDeleteFragment.newInstance(
+                    ProfileDeleteFragment.newInstance(slotId, portId, profile.iccid, profile.displayName)
-                        slotId,
-                        portId,
-                        seId,
-                        profile.iccid,
-                        profile.displayName
-                    )
                         .show(childFragmentManager, ProfileDeleteFragment.TAG)
                     true
                 }
-
                 else -> false
             }
     }
@@ -464,11 +438,9 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
             when (ViewHolder.Type.fromInt(viewType)) {
                 ViewHolder.Type.PROFILE -> {
-                    val view = LayoutInflater.from(parent.context)
+                    val view = LayoutInflater.from(parent.context).inflate(R.layout.euicc_profile, parent, false)
-                        .inflate(R.layout.euicc_profile, parent, false)
                     ProfileViewHolder(view)
                 }
-
                 ViewHolder.Type.FOOTER -> {
                     FooterViewHolder()
                 }
@@ -479,11 +451,9 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                 position < profiles.size -> {
                     ViewHolder.Type.PROFILE.value
                 }
-
                 position >= profiles.size && position < profiles.size + footerViews.size -> {
                     ViewHolder.Type.FOOTER.value
                 }
-
                 else -> -1
             }
 
@@ -492,7 +462,6 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                 is ProfileViewHolder -> {
                     holder.setProfile(profiles[position])
                 }
-
                 is FooterViewHolder -> {
                     holder.attach(footerViews[position - profiles.size])
                 }

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

@@ -11,7 +11,6 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.util.EuiccChannelFragmentMarker
 import im.angry.openeuicc.util.EuiccProfilesChangedListener
@@ -30,8 +29,8 @@ class EuiccMemoryResetFragment : DialogFragment(), EuiccChannelFragmentMarker {
 
         private const val FIELD_EID = "eid"
 
-        fun newInstance(slotId: Int, portId: Int, seId: EuiccChannel.SecureElementId, eid: String) =
+        fun newInstance(slotId: Int, portId: Int, eid: String) =
-            newInstanceEuicc(EuiccMemoryResetFragment::class.java, slotId, portId, seId) {
+            newInstanceEuicc(EuiccMemoryResetFragment::class.java, slotId, portId) {
                 putString(FIELD_EID, eid)
             }
     }

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

@@ -23,7 +23,6 @@ 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.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
@@ -113,12 +112,10 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
                 startActivity(Intent(this, SettingsActivity::class.java))
                 true
             }
-
             R.id.reload -> {
                 refresh()
                 true
             }
-
             else -> super.onOptionsItemSelected(item)
         }
 
@@ -157,8 +154,7 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         euiccChannelManager.flowInternalEuiccPorts().onEach { (slotId, portId) ->
             Log.d(TAG, "slot $slotId port $portId")
 
-            euiccChannelManager.flowEuiccSecureElements(slotId, portId).onEach { seId ->
+            euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
-                euiccChannelManager.withEuiccChannel(slotId, portId, seId) { channel ->
                 if (preferenceRepository.verboseLoggingFlow.first()) {
                     Log.d(TAG, channel.lpa.eID)
                 }
@@ -170,15 +166,10 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
                 val channelName =
                     appContainer.customizableTextProvider.formatInternalChannelName(channel.logicalSlotId)
                 newPages.add(Page(channel.logicalSlotId, channelName) {
-                        appContainer.uiComponentFactory.createEuiccManagementFragment(
+                    appContainer.uiComponentFactory.createEuiccManagementFragment(slotId, portId)
-                            slotId,
-                            portId,
-                            seId
-                        )
                 })
             }
         }.collect()
-        }.collect()
 
         // If USB readers exist, add them at the very last
         // We use a wrapper fragment to handle logic specific to USB readers

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

@@ -1,7 +1,6 @@
 package im.angry.openeuicc.ui
 
 import android.annotation.SuppressLint
-import android.os.Build
 import android.os.Bundle
 import android.text.Html
 import android.view.ContextMenu
@@ -21,7 +20,6 @@ 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
@@ -29,13 +27,12 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.typeblog.lpac_jni.LocalProfileNotification
 
-class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
+class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     private lateinit var swipeRefresh: SwipeRefreshLayout
     private lateinit var notificationList: RecyclerView
     private val notificationAdapter = NotificationAdapter()
 
     private var logicalSlotId = -1
-    private var seId = EuiccChannel.SecureElementId.DEFAULT
 
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
@@ -54,22 +51,11 @@ class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker
     override fun onInit() {
         notificationList.layoutManager =
             LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
-        notificationList.addItemDecoration(
+        notificationList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
-            DividerItemDecoration(
-                this,
-                LinearLayoutManager.VERTICAL
-            )
-        )
         notificationList.adapter = notificationAdapter
         registerForContextMenu(notificationList)
 
         logicalSlotId = intent.getIntExtra("logicalSlotId", 0)
-        seId = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            intent.getParcelableExtra("seId", EuiccChannel.SecureElementId::class.java)
-        } else {
-            @Suppress("DEPRECATION")
-            intent.getParcelableExtra("seId")!!
-        } ?: EuiccChannel.SecureElementId.DEFAULT
 
         // This is slightly different from the MainActivity logic
         // due to the length (we don't want to display the full USB product name)
@@ -100,7 +86,6 @@ class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker
                 finish()
                 true
             }
-
             R.id.help -> {
                 AlertDialog.Builder(this, R.style.AlertDialogTheme).apply {
                     setMessage(R.string.profile_notifications_help)
@@ -111,7 +96,6 @@ class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker
                 }
                 true
             }
-
             else -> super.onOptionsItemSelected(item)
         }
 
@@ -152,7 +136,7 @@ class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker
     )
 
     @SuppressLint("ClickableViewAccessibility")
-    inner class NotificationViewHolder(private val root: View) :
+    inner class NotificationViewHolder(private val root: View):
         RecyclerView.ViewHolder(root), View.OnCreateContextMenuListener, OnMenuItemClickListener {
         private val address: TextView = root.requireViewById(R.id.notification_address)
         private val sequenceNumber: TextView =
@@ -186,8 +170,7 @@ class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker
                     LocalProfileNotification.Operation.Delete -> R.string.profile_notification_operation_delete
                     LocalProfileNotification.Operation.Enable -> R.string.profile_notification_operation_enable
                     LocalProfileNotification.Operation.Disable -> R.string.profile_notification_operation_disable
-                }
+                })
-            )
 
         fun updateNotification(value: LocalProfileNotificationWrapper) {
             notification = value
@@ -198,13 +181,10 @@ class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker
                 value.inner.seqNumber
             )
             profileName.text = Html.fromHtml(
-                root.context.getString(
+                root.context.getString(R.string.profile_notification_name_format,
-                    R.string.profile_notification_name_format,
                     operationToLocalizedText(value.inner.profileManagementOperation),
-                    value.profileName, value.inner.iccid
+                    value.profileName, value.inner.iccid),
-                ),
+                Html.FROM_HTML_MODE_COMPACT)
-                Html.FROM_HTML_MODE_COMPACT
-            )
         }
 
         override fun onCreateContextMenu(
@@ -233,7 +213,6 @@ class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker
                     }
                     true
                 }
-
                 R.id.notification_delete -> {
                     launchTask {
                         withContext(Dispatchers.IO) {
@@ -246,12 +225,11 @@ class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker
                     }
                     true
                 }
-
                 else -> false
             }
     }
 
-    inner class NotificationAdapter : RecyclerView.Adapter<NotificationViewHolder>() {
+    inner class NotificationAdapter: RecyclerView.Adapter<NotificationViewHolder>() {
         var notifications: List<LocalProfileNotificationWrapper> = listOf()
             @SuppressLint("NotifyDataSetChanged")
             set(value) {

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

@@ -9,7 +9,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.onStart
@@ -21,8 +20,8 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
         private const val FIELD_ICCID = "iccid"
         private const val FIELD_NAME = "name"
 
-        fun newInstance(slotId: Int, portId: Int, seId: EuiccChannel.SecureElementId, iccid: String, name: String) =
+        fun newInstance(slotId: Int, portId: Int, iccid: String, name: String) =
-            newInstanceEuicc(ProfileDeleteFragment::class.java, slotId, portId, seId) {
+            newInstanceEuicc(ProfileDeleteFragment::class.java, slotId, portId) {
                 putString(FIELD_ICCID, iccid)
                 putString(FIELD_NAME, name)
         }

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

@@ -12,7 +12,6 @@ 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.core.EuiccChannel
 import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.launch
@@ -25,8 +24,8 @@ class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragment
 
         const val TAG = "ProfileRenameFragment"
 
-        fun newInstance(slotId: Int, portId: Int, seId: EuiccChannel.SecureElementId, iccid: String, currentName: String) =
+        fun newInstance(slotId: Int, portId: Int, iccid: String, currentName: String) =
-            newInstanceEuicc(ProfileRenameFragment::class.java, slotId, portId, seId) {
+            newInstanceEuicc(ProfileRenameFragment::class.java, slotId, portId) {
                 putString(FIELD_ICCID, iccid)
                 putString(FIELD_CURRENT_NAME, currentName)
             }

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

@@ -20,7 +20,6 @@ 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
@@ -157,9 +156,7 @@ class UsbCcidReaderFragment : Fragment(), OpenEuiccContextMarker {
                     R.id.child_container,
                     appContainer.uiComponentFactory.createEuiccManagementFragment(
                         slotId = EuiccChannelManager.USB_CHANNEL_ID,
-                        portId = 0,
+                        portId = 0
-                        // TODO: What if a USB card has multiple SEs?
-                        seId = EuiccChannel.SecureElementId.DEFAULT
                     )
                 )
             }

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

@@ -1,6 +1,5 @@
 package im.angry.openeuicc.util
 
-import android.os.Build
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import im.angry.openeuicc.core.EuiccChannel
@@ -10,7 +9,6 @@ import im.angry.openeuicc.ui.BaseEuiccAccessActivity
 
 private const val FIELD_SLOT_ID = "slotId"
 private const val FIELD_PORT_ID = "portId"
-private const val FIELD_SE_ID = "seId"
 
 interface EuiccChannelFragmentMarker : OpenEuiccContextMarker
 
@@ -19,19 +17,12 @@ private typealias BundleSetter = Bundle.() -> Unit
 // We must use extension functions because there is no way to add bounds to the type of "self"
 // in the definition of an interface, so the only way is to limit where the extension functions
 // can be applied.
-fun <T> newInstanceEuicc(
+fun <T> newInstanceEuicc(clazz: Class<T>, slotId: Int, portId: Int, addArguments: BundleSetter = {}): T
-    clazz: Class<T>,
-    slotId: Int,
-    portId: Int,
-    seId: EuiccChannel.SecureElementId,
-    addArguments: BundleSetter = {}
-): T
         where T : Fragment, T : EuiccChannelFragmentMarker =
     clazz.getDeclaredConstructor().newInstance().apply {
         arguments = Bundle()
         arguments!!.putInt(FIELD_SLOT_ID, slotId)
         arguments!!.putInt(FIELD_PORT_ID, portId)
-        arguments!!.putParcelable(FIELD_SE_ID, seId)
         arguments!!.addArguments()
     }
 
@@ -44,18 +35,6 @@ val <T> T.slotId: Int
 val <T> T.portId: Int
         where T : Fragment, T : EuiccChannelFragmentMarker
     get() = requireArguments().getInt(FIELD_PORT_ID)
-val <T> T.seId: EuiccChannel.SecureElementId
-        where T : Fragment, T : EuiccChannelFragmentMarker
-    get() =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            requireArguments().getParcelable(
-                FIELD_SE_ID,
-                EuiccChannel.SecureElementId::class.java
-            )!!
-        } else {
-            @Suppress("DEPRECATION")
-            requireArguments().getParcelable(FIELD_SE_ID)!!
-        }
 val <T> T.isUsb: Boolean
         where T : Fragment, T : EuiccChannelFragmentMarker
     get() = slotId == EuiccChannelManager.USB_CHANNEL_ID
@@ -75,12 +54,7 @@ val <T> T.euiccChannelManagerService: EuiccChannelManagerService
 suspend fun <T, R> T.withEuiccChannel(fn: suspend (EuiccChannel) -> R): R
         where T : Fragment, T : EuiccChannelFragmentMarker {
     ensureEuiccChannelManager()
-    return euiccChannelManager.withEuiccChannel(
+    return euiccChannelManager.withEuiccChannel(slotId, portId, fn)
-        slotId,
-        portId,
-        seId,
-        fn
-    )
 }
 
 suspend fun <T> T.ensureEuiccChannelManager() where T : Fragment, T : OpenEuiccContextMarker =

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

@@ -16,14 +16,13 @@ class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFacto
     @Suppress("NAME_SHADOWING")
     override suspend fun tryOpenEuiccChannel(
         port: UiccPortInfoCompat,
-        isdrAid: ByteArray,
+        isdrAid: ByteArray
-        seId: EuiccChannel.SecureElementId,
     ): EuiccChannel? {
         val port = port as RealUiccPortInfoCompat
         if (port.card.isRemovable) {
             // Attempt unprivileged (OMAPI) before TelephonyManager
             // but still try TelephonyManager in case OMAPI is broken
-            super.tryOpenEuiccChannel(port, isdrAid, seId)?.let { return it }
+            super.tryOpenEuiccChannel(port, isdrAid)?.let { return it }
         }
 
         if (port.card.isEuicc || preferenceRepository.removableTelephonyManagerFlow.first()) {
@@ -42,7 +41,6 @@ class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFacto
                         context.preferenceRepository.verboseLoggingFlow
                     ),
                     isdrAid,
-                    seId,
                     context.preferenceRepository.verboseLoggingFlow,
                     context.preferenceRepository.ignoreTLSCertificateFlow,
                 )
@@ -55,6 +53,6 @@ class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFacto
             }
         }
 
-        return super.tryOpenEuiccChannel(port, isdrAid, seId)
+        return super.tryOpenEuiccChannel(port, isdrAid)
     }
 }

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

@@ -1,18 +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.PrivilegedEuiccManagementFragment
 import im.angry.openeuicc.ui.PrivilegedSettingsFragment
 
 class PrivilegedUiComponentFactory : DefaultUiComponentFactory() {
-    override fun createEuiccManagementFragment(
+    override fun createEuiccManagementFragment(slotId: Int, portId: Int): EuiccManagementFragment =
-        slotId: Int,
+        PrivilegedEuiccManagementFragment.newInstance(slotId, portId)
-        portId: Int,
-        seId: EuiccChannel.SecureElementId
-    ): EuiccManagementFragment =
-        PrivilegedEuiccManagementFragment.newInstance(slotId, portId, seId)
 
     override fun createSettingsFragment(): Fragment =
         PrivilegedSettingsFragment()

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

@@ -5,18 +5,13 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.PopupMenu
 import im.angry.openeuicc.R
-import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.util.*
 import net.typeblog.lpac_jni.LocalProfileInfo
 
-class PrivilegedEuiccManagementFragment : EuiccManagementFragment() {
+class PrivilegedEuiccManagementFragment: EuiccManagementFragment() {
     companion object {
-        fun newInstance(
+        fun newInstance(slotId: Int, portId: Int): EuiccManagementFragment =
-            slotId: Int,
+            newInstanceEuicc(PrivilegedEuiccManagementFragment::class.java, slotId, portId)
-            portId: Int,
-            seId: EuiccChannel.SecureElementId
-        ): EuiccManagementFragment =
-            newInstanceEuicc(PrivilegedEuiccManagementFragment::class.java, slotId, portId, seId)
     }
 
     private var isMEP = false