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

@@ -16,7 +16,6 @@ import im.angry.openeuicc.util.*
 
 class DownloadWizardActivity: BaseEuiccAccessActivity() {
     data class DownloadWizardState(
-        var currentStepFragmentClassName: String?,
         var selectedLogicalSlot: Int,
         var smdp: String,
         var matchingId: String,
@@ -31,12 +30,6 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
     private lateinit var prevButton: Button
 
     private var currentFragment: DownloadWizardStepFragment? = null
-        set(value) {
-            if (this::state.isInitialized) {
-                state.currentStepFragmentClassName = value?.javaClass?.name
-            }
-            field = value
-        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
@@ -50,7 +43,6 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
         })
 
         state = DownloadWizardState(
-            null,
             intent.getIntExtra("selectedLogicalSlot", 0),
             "",
             "",
@@ -96,29 +88,6 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
         }
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putString("currentStepFragmentClassName", state.currentStepFragmentClassName)
-        outState.putInt("selectedLogicalSlot", state.selectedLogicalSlot)
-        outState.putString("smdp", state.smdp)
-        outState.putString("matchingId", state.matchingId)
-        outState.putString("confirmationCode", state.confirmationCode)
-        outState.putString("imei", state.imei)
-    }
-
-    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-        super.onRestoreInstanceState(savedInstanceState)
-        state.currentStepFragmentClassName = savedInstanceState.getString(
-            "currentStepFragmentClassName",
-            state.currentStepFragmentClassName
-        )
-        state.selectedLogicalSlot =
-            savedInstanceState.getInt("selectedLogicalSlot", state.selectedLogicalSlot)
-        state.smdp = savedInstanceState.getString("smdp", state.smdp)
-        state.matchingId = savedInstanceState.getString("matchingId", state.matchingId)
-        state.imei = savedInstanceState.getString("imei", state.imei)
-    }
-
     private fun onPrevPressed() {
         if (currentFragment?.hasPrev == true) {
             val prevFrag = currentFragment?.createPrevFragment()
@@ -143,14 +112,8 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
 
     override fun onInit() {
         progressBar.visibility = View.GONE
-
-        if (state.currentStepFragmentClassName != null) {
-            val clazz = Class.forName(state.currentStepFragmentClassName!!)
-            showFragment(clazz.getDeclaredConstructor().newInstance() as DownloadWizardStepFragment)
-        } else {
         showFragment(DownloadWizardSlotSelectFragment())
     }
-    }
 
     private fun showFragment(
         nextFrag: DownloadWizardStepFragment,

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

@@ -87,7 +87,7 @@ class DownloadWizardSlotSelectFragment : DownloadWizardActivity.DownloadWizardSt
                     channel.lpa.profiles.find { it.state == LocalProfileInfo.State.Enabled }?.displayName
                 )
             }
-        }.toList().sortedBy { it.logicalSlotId }
+        }.toList()
         adapter.slots = slots
 
         // Ensure we always have a selected slot by default