diff --git a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt b/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt index d93373614..11e670a03 100644 --- a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt +++ b/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) } diff --git a/app/src/migration/java/org/mozilla/fenix/MigrationDecisionActivity.kt b/app/src/migration/java/org/mozilla/fenix/MigrationDecisionActivity.kt index e0951b323..108320df3 100644 --- a/app/src/migration/java/org/mozilla/fenix/MigrationDecisionActivity.kt +++ b/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)