refactor: improve argument handling in ProfileRenameFragment

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

@@ -88,15 +88,12 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
         requireParentFragment().lifecycleScope.launch {
             ensureEuiccChannelManager()
             euiccChannelManagerService.waitForForegroundTask()
-            euiccChannelManagerService.launchProfileDeleteTask(slotId, portId, iccid).onStart {
+            euiccChannelManagerService.launchProfileDeleteTask(slotId, portId, iccid)
+                .onStart {
                     parentFragment?.notifyEuiccProfilesChanged()
-
+                    runCatching(::dismiss)
-                try {
-                    dismiss()
-                } catch (e: IllegalStateException) {
-                    // Ignored
                 }
-            }.waitDone()
+                .waitDone()
         }
     }
 }

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

@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ProgressBar
 import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.appcompat.widget.Toolbar
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
@@ -18,12 +19,15 @@ import net.typeblog.lpac_jni.LocalProfileAssistant
 
 class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragmentMarker {
     companion object {
+        private const val FIELD_ICCID = "iccid"
+        private const val FIELD_CURRENT_NAME = "currentName"
+
         const val TAG = "ProfileRenameFragment"
 
         fun newInstance(slotId: Int, portId: Int, iccid: String, currentName: String) =
             newInstanceEuicc(ProfileRenameFragment::class.java, slotId, portId) {
-                putString("iccid", iccid)
+                putString(FIELD_ICCID, iccid)
-                putString("currentName", currentName)
+                putString(FIELD_CURRENT_NAME, currentName)
             }
     }
 
@@ -33,6 +37,14 @@ class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragment
 
     private var renaming = false
 
+    private val iccid: String by lazy {
+        requireArguments().getString(FIELD_ICCID)!!
+    }
+
+    private val currentName: String by lazy {
+        requireArguments().getString(FIELD_CURRENT_NAME)!!
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -51,7 +63,7 @@ class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragment
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        profileRenameNewName.editText!!.setText(requireArguments().getString("currentName"))
+        profileRenameNewName.editText!!.setText(currentName)
         toolbar.apply {
             setTitle(R.string.rename)
             setNavigationOnClickListener {
@@ -75,12 +87,8 @@ class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragment
         }
     }
 
-    private fun showErrorAndCancel(errorStrRes: Int) {
+    private fun showErrorAndCancel(@StringRes resId: Int) {
-        Toast.makeText(
+        Toast.makeText(requireContext(), resId, Toast.LENGTH_LONG).show()
-            requireContext(),
-            errorStrRes,
-            Toast.LENGTH_LONG
-        ).show()
 
         renaming = false
         progress.visibility = View.GONE
@@ -91,17 +99,15 @@ class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragment
         progress.isIndeterminate = true
         progress.visibility = View.VISIBLE
 
+        val newName = profileRenameNewName.editText!!.text.toString().trim()
+
         lifecycleScope.launch {
             ensureEuiccChannelManager()
             euiccChannelManagerService.waitForForegroundTask()
-            val res = euiccChannelManagerService.launchProfileRenameTask(
+            val response = euiccChannelManagerService
-                slotId,
+                .launchProfileRenameTask(slotId, portId, iccid, newName).waitDone()
-                portId,
-                requireArguments().getString("iccid")!!,
-                profileRenameNewName.editText!!.text.toString().trim()
-            ).waitDone()
 
-            when (res) {
+            when (response) {
                 is LocalProfileAssistant.ProfileNameTooLongException -> {
                     showErrorAndCancel(R.string.profile_rename_too_long)
                 }