Move EuiccChannelManagerService to withEuiccChannel()

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

@@ -88,8 +88,7 @@ open class DefaultEuiccChannelManager(
         }
     }
 
-    override fun findEuiccChannelBySlotBlocking(logicalSlotId: Int): EuiccChannel? =
+    private suspend fun findEuiccChannelBySlot(logicalSlotId: Int): EuiccChannel? =
-        runBlocking {
         withContext(Dispatchers.IO) {
             if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
                 return@withContext usbChannel
@@ -105,6 +104,10 @@ open class DefaultEuiccChannelManager(
 
             null
         }
+
+    override fun findEuiccChannelBySlotBlocking(logicalSlotId: Int): EuiccChannel? =
+        runBlocking {
+            findEuiccChannelBySlot(logicalSlotId)
         }
 
     override fun findEuiccChannelByPhysicalSlotBlocking(physicalSlotId: Int): EuiccChannel? =
@@ -164,7 +167,23 @@ open class DefaultEuiccChannelManager(
         portId: Int,
         fn: suspend (EuiccChannel) -> R
     ): R {
-        val channel = findEuiccChannelByPortBlocking(physicalSlotId, portId)
+        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 = findEuiccChannelBySlot(logicalSlotId)
             ?: throw EuiccChannelManager.EuiccChannelNotFoundException()
         val wrapper = EuiccChannelWrapper(channel)
         try {

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

@@ -81,6 +81,14 @@ interface EuiccChannelManager {
         fn: suspend (EuiccChannel) -> R
     ): R
 
+    /**
+     * Same as withEuiccChannel(Int, Int, (EuiccChannel) -> R) but instead uses logical slot ID
+     */
+    suspend fun <R> withEuiccChannel(
+        logicalSlotId: Int,
+        fn: suspend (EuiccChannel) -> R
+    ): R
+
     /**
      * Invalidate all EuiccChannels previously cached by this Manager
      */

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

@@ -287,8 +287,8 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
             R.drawable.ic_task_sim_card_download
         ) {
             euiccChannelManager.beginTrackedOperation(slotId, portId) {
-                val channel = euiccChannelManager.findEuiccChannelByPort(slotId, portId)
+                val res = euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
-                val res = channel!!.lpa.downloadProfile(
+                    channel.lpa.downloadProfile(
                         smdp,
                         matchingId,
                         imei,
@@ -300,6 +300,7 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
                                     ForegroundTaskState.InProgress(state.progress)
                             }
                         })
+                }
 
                 if (!res) {
                     // TODO: Provide more details on the error
@@ -321,10 +322,12 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
             getString(R.string.task_profile_rename_failure),
             R.drawable.ic_task_rename
         ) {
-            val res = euiccChannelManager.findEuiccChannelByPort(slotId, portId)!!.lpa.setNickname(
+            val res = euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
+                channel.lpa.setNickname(
                     iccid,
                     name
                 )
+            }
 
             if (!res) {
                 throw RuntimeException("Profile not renamed")
@@ -342,10 +345,9 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
             R.drawable.ic_task_delete
         ) {
             euiccChannelManager.beginTrackedOperation(slotId, portId) {
-                euiccChannelManager.findEuiccChannelByPort(
+                euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
-                    slotId,
+                    channel.lpa.deleteProfile(iccid)
-                    portId
+                }
-                )!!.lpa.deleteProfile(iccid)
 
                 preferenceRepository.notificationDeleteFlow.first()
             }
@@ -366,8 +368,10 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
             R.drawable.ic_task_switch
         ) {
             euiccChannelManager.beginTrackedOperation(slotId, portId) {
-                val channel = euiccChannelManager.findEuiccChannelByPort(slotId, portId)!!
+                val (res, refreshed) = euiccChannelManager.withEuiccChannel(
-                val (res, refreshed) =
+                    slotId,
+                    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
@@ -378,6 +382,7 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
                     } else {
                         Pair(true, true)
                     }
+                }
 
                 if (!res) {
                     throw RuntimeException("Could not switch profile")