Merge pull request #19760 from wordpress-mobile/fix/19758-InvalidWizardStep

If the step index saved in the instance state is invalid reset the wizard

Author: Artyom Vlasov

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt

@@ -169,7 +169,13 @@ class SiteCreationMainVM @Inject constructor(
         } else {
             siteCreationState = requireNotNull(savedInstanceState.getParcelableCompat(KEY_SITE_CREATION_STATE))
             val currentStepIndex = savedInstanceState.getInt(KEY_CURRENT_STEP)
-            wizardManager.setCurrentStepIndex(currentStepIndex)
+            try {
+                wizardManager.setCurrentStepIndex(currentStepIndex)
+            } catch (e: IllegalStateException) {
+                // If the current step index is invalid, we reset the wizard
+                wizardManager.setCurrentStepIndex(0)
+                AppLog.e(T.THEMES, "Resetting site creation wizard: ${e.message}")
+            }
         }
         isStarted = true
     }

WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt

@@ -364,6 +364,19 @@ class SiteCreationMainVMTest : BaseUnitTest() {
         verify(tracker, times(1)).trackSiteCreationAccessed(SiteCreationSource.UNSPECIFIED)
     }
 
+    @Test
+    fun `given instance state returns an invalid step, when start, then site creation is reset`() {
+        val expectedState = SiteCreationState(segmentId = SEGMENT_ID)
+        whenever(savedInstanceState.getParcelableCompat<SiteCreationState>(KEY_SITE_CREATION_STATE))
+            .thenReturn(expectedState)
+        whenever(savedInstanceState.getInt(KEY_CURRENT_STEP)).thenReturn(-1) // Invalid step
+
+        val newViewModel = getNewViewModel()
+        newViewModel.start(savedInstanceState, SiteCreationSource.UNSPECIFIED)
+
+        assertEquals(0, wizardManager.currentStep)
+    }
+
     private fun currentWizardState(vm: SiteCreationMainVM) = vm.navigationTargetObservable.lastEvent!!.wizardState
 
     private fun getNewViewModel() = SiteCreationMainVM(