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

@@ -1,32 +1,18 @@
 package im.angry.openeuicc.util
 
-import im.angry.openeuicc.core.EuiccChannel
 import net.typeblog.lpac_jni.LocalProfileAssistant
 import net.typeblog.lpac_jni.LocalProfileInfo
 
 val LocalProfileInfo.displayName: String
     get() = nickName.ifEmpty { name }
 
-
-val LocalProfileInfo.isEnabled: Boolean
-    get() = state == LocalProfileInfo.State.Enabled
-
 val List<LocalProfileInfo>.operational: List<LocalProfileInfo>
     get() = filter {
         it.profileClass == LocalProfileInfo.Clazz.Operational
     }
 
-val List<EuiccChannel>.hasMultipleChips: Boolean
+fun LocalProfileAssistant.disableActiveProfileWithUndo(): () -> Unit =
-    get() = distinctBy { it.slotId }.size > 1
+    profiles.find { it.state == LocalProfileInfo.State.Enabled }?.let {
-
+        disableProfile(it.iccid)
-/**
- * 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()
- */
-fun LocalProfileAssistant.disableActiveProfileWithUndo(refreshOnDisable: Boolean): () -> Unit =
-    profiles.find { it.isEnabled }?.let {
-        disableProfile(it.iccid, refreshOnDisable)
         return { enableProfile(it.iccid) }
     } ?: { }

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

@@ -11,12 +11,14 @@ import com.google.zxing.RGBLuminanceSource
 import com.google.zxing.common.HybridBinarizer
 import com.google.zxing.qrcode.QRCodeReader
 import im.angry.openeuicc.OpenEuiccApplication
+import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.di.AppContainer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import net.typeblog.lpac_jni.LocalProfileInfo
 import kotlin.RuntimeException
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -58,6 +60,12 @@ interface OpenEuiccContextMarker {
         get() = appContainer.telephonyManager
 }
 
+val LocalProfileInfo.isEnabled: Boolean
+    get() = state == LocalProfileInfo.State.Enabled
+
+val List<EuiccChannel>.hasMultipleChips: Boolean
+    get() = distinctBy { it.slotId }.size > 1
+
 // Create an instance of OMAPI SEService in a manner that "makes sense" without unpredictable callbacks
 suspend fun connectSEService(context: Context): SEService = suspendCoroutine { cont ->
     // Use a Mutex to make sure the continuation is run *after* the "service" variable is assigned

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

@@ -22,7 +22,7 @@ fun TelephonyManager.setDsdsEnabled(euiccManager: EuiccChannelManager, enabled:
     // Disable all eSIM profiles before performing a DSDS switch (only for internal eSIMs)
     knownChannels.forEach {
         if (!it.removable) {
-            it.lpa.disableActiveProfileWithUndo(false)
+            it.lpa.disableActiveProfileWithUndo()
         }
     }
 
@@ -45,7 +45,7 @@ fun TelephonyManager.updateSimSlotMapping(
     val undo = unmapped.mapNotNull { mapping ->
         euiccManager.findEuiccChannelByPortBlocking(mapping.physicalSlotIndex, mapping.portIndex)?.let { channel ->
             if (!channel.removable) {
-                return@mapNotNull channel.lpa.disableActiveProfileWithUndo(false)
+                return@mapNotNull channel.lpa.disableActiveProfileWithUndo()
             } else {
                 // Do not do anything for external eUICCs -- we can't really trust them to work properly
                 // with no profile enabled.