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

@@ -162,15 +162,13 @@ open class DefaultEuiccChannelManager(
     override suspend fun <R> withEuiccChannel(
         physicalSlotId: Int,
         portId: Int,
-        fn: suspend (EuiccChannel) -> R
+        fn: (EuiccChannel) -> R
     ): R {
         val channel = findEuiccChannelByPortBlocking(physicalSlotId, portId)
             ?: throw EuiccChannelManager.EuiccChannelNotFoundException()
         val wrapper = EuiccChannelWrapper(channel)
         try {
-            return withContext(Dispatchers.IO) {
+            return fn(wrapper)
-                fn(wrapper)
-            }
         } finally {
             wrapper.invalidateWrapper()
         }

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

@@ -71,15 +71,9 @@ interface EuiccChannelManager {
      * The reference is not supposed to be held outside of the callback. This is enforced via
      * 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 <R> withEuiccChannel(physicalSlotId: Int, portId: Int, fn: (EuiccChannel) -> R): R
-        physicalSlotId: Int,
-        portId: Int,
-        fn: suspend (EuiccChannel) -> R
-    ): R
 
     /**
      * Invalidate all EuiccChannels previously cached by this Manager

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
@@ -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,11 +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
             }
@@ -164,8 +162,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                     preferenceRepository.disableSafeguardFlow.stateIn(lifecycleScope)
             }
 
-            val profiles = withEuiccChannel { channel ->
+            val profiles = withContext(Dispatchers.IO) {
-                logicalSlotId = channel.logicalSlotId
                 euiccChannelManager.notifyEuiccProfilesChanged(channel.logicalSlotId)
                 channel.lpa.profiles.operational
             }

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

@@ -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)
-                }
             }
         }
     }

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

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