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

@@ -50,20 +50,21 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     }
 
     override fun onInit() {
+        euiccChannel = euiccChannelManager
+            .findEuiccChannelBySlotBlocking(intent.getIntExtra("logicalSlotId", 0))!!
+
         notificationList.layoutManager =
             LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         notificationList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
         notificationList.adapter = notificationAdapter
         registerForContextMenu(notificationList)
 
-        val logicalSlotId = intent.getIntExtra("logicalSlotId", 0)
-
         // This is slightly different from the MainActivity logic
         // due to the length (we don't want to display the full USB product name)
-        val channelTitle = if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
+        val channelTitle = if (euiccChannel.logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
             getString(R.string.usb)
         } else {
-            getString(R.string.channel_name_format, logicalSlotId)
+            getString(R.string.channel_name_format, euiccChannel.logicalSlotId)
         }
 
         title = getString(R.string.profile_notifications_detailed_format, channelTitle)
@@ -104,18 +105,6 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         swipeRefresh.isRefreshing = true
 
         lifecycleScope.launch {
-            if (!this@NotificationsActivity::euiccChannel.isInitialized) {
-                withContext(Dispatchers.IO) {
-                    euiccChannelManagerLoaded.await()
-                    euiccChannel = euiccChannelManager.findEuiccChannelBySlotBlocking(
-                        intent.getIntExtra(
-                            "logicalSlotId",
-                            0
-                        )
-                    )!!
-                }
-            }
-
             task()
 
             swipeRefresh.isRefreshing = false

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

@@ -149,6 +149,13 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
     @SuppressLint("MissingPermission")
     override fun onStart() {
         super.onStart()
+        profileDownloadIMEI.editText!!.text = Editable.Factory.getInstance().newEditable(
+            try {
+                telephonyManager.getImei(channel.logicalSlotId) ?: ""
+            } catch (e: Exception) {
+                ""
+            }
+        )
 
         lifecycleScope.launch(Dispatchers.IO) {
             ensureEuiccChannelManager()
@@ -159,12 +166,6 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
                 return@launch
             }
 
-            val imei = try {
-                telephonyManager.getImei(channel.logicalSlotId) ?: ""
-            } catch (e: Exception) {
-                ""
-            }
-
             // Fetch remaining NVRAM
             val str = channel.lpa.euiccInfo2?.freeNvram?.also {
                 freeNvram = it
@@ -173,8 +174,6 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
             withContext(Dispatchers.Main) {
                 profileDownloadFreeSpace.text = getString(R.string.profile_download_free_space,
                     str ?: getText(R.string.unknown))
-                profileDownloadIMEI.editText!!.text =
-                    Editable.Factory.getInstance().newEditable(imei)
             }
         }
     }