Fix for mozilla-mobile#7980 - MigrationStore's COMPLETE action now re…

…directs to MigrationProgressActivity

In order to ensure that the user's migration screen is not being bypassed by mistake, we handle the
migration's store COMPLETED state the same way we handle the MIGRATING state.

We can do this because we can treat the initial state (NONE) as being either a fresh start of the
app, either the user's intention of starting the home activity.

Before this change, if the app was being open from the shortcut after the migration was complete,
the user would have been encountered the home activity instead of the migration one.

app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt

@@ -22,6 +22,7 @@ import mozilla.components.support.migration.Migration.History
 import mozilla.components.support.migration.Migration.Logins
 import mozilla.components.support.migration.Migration.Settings
 import mozilla.components.support.migration.MigrationResults
+import mozilla.components.support.migration.state.MigrationAction
 import mozilla.components.support.migration.state.MigrationProgress
 import mozilla.components.support.migration.state.MigrationStore
 import org.mozilla.fenix.HomeActivity
@@ -62,6 +63,7 @@ class MigrationProgressActivity : AbstractMigrationProgressActivity() {
 
                 // If we received a user-initiated intent, throw this back to the intent receiver.
                 if (intent.hasExtra(HomeActivity.OPEN_TO_BROWSER)) {
+                    store.dispatch(MigrationAction.Clear)
                     intent.setClassName(applicationContext, IntentReceiverActivity::class.java.name)
                     startActivity(intent)
                 }

app/src/migration/java/org/mozilla/fenix/MigrationDecisionActivity.kt

@@ -24,8 +24,8 @@ class MigrationDecisionActivity : Activity() {
         val intent = if (intent != null) intent else Intent()
 
         val activity = when (store.state.progress) {
-            MigrationProgress.COMPLETED, MigrationProgress.NONE -> HomeActivity::class.java
-            MigrationProgress.MIGRATING -> MigrationProgressActivity::class.java
+            MigrationProgress.NONE -> HomeActivity::class.java
+            MigrationProgress.MIGRATING, MigrationProgress.COMPLETED -> MigrationProgressActivity::class.java
         }
 
         intent.setClass(applicationContext, activity)