Fix for #8722 - Update complete notification is not routing to onboarding screen
Now handling migration completed and clear states as routes to home screen.master
parent
511c36e191
commit
680249f724
|
@ -24,8 +24,8 @@ class MigrationDecisionActivity : Activity() {
|
||||||
val intent = if (intent != null) intent else Intent()
|
val intent = if (intent != null) intent else Intent()
|
||||||
|
|
||||||
val activity = when (store.state.progress) {
|
val activity = when (store.state.progress) {
|
||||||
MigrationProgress.NONE -> HomeActivity::class.java
|
MigrationProgress.NONE, MigrationProgress.COMPLETED -> HomeActivity::class.java
|
||||||
MigrationProgress.MIGRATING, MigrationProgress.COMPLETED -> MigrationProgressActivity::class.java
|
MigrationProgress.MIGRATING -> MigrationProgressActivity::class.java
|
||||||
}
|
}
|
||||||
|
|
||||||
intent.setClass(applicationContext, activity)
|
intent.setClass(applicationContext, activity)
|
||||||
|
|
|
@ -7,7 +7,6 @@ package org.mozilla.fenix
|
||||||
import mozilla.components.support.migration.AbstractMigrationService
|
import mozilla.components.support.migration.AbstractMigrationService
|
||||||
import mozilla.components.support.migration.state.MigrationStore
|
import mozilla.components.support.migration.state.MigrationStore
|
||||||
import org.mozilla.fenix.ext.components
|
import org.mozilla.fenix.ext.components
|
||||||
import org.mozilla.fenix.migration.MigrationProgressActivity
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Background service for running the migration from legacy Firefox for Android (Fennec).
|
* Background service for running the migration from legacy Firefox for Android (Fennec).
|
||||||
|
@ -15,5 +14,5 @@ import org.mozilla.fenix.migration.MigrationProgressActivity
|
||||||
class MigrationService : AbstractMigrationService() {
|
class MigrationService : AbstractMigrationService() {
|
||||||
override val migrator by lazy { getMigratorFromApplication() }
|
override val migrator by lazy { getMigratorFromApplication() }
|
||||||
override val store: MigrationStore by lazy { components.migrationStore }
|
override val store: MigrationStore by lazy { components.migrationStore }
|
||||||
override val migrationActivity = MigrationProgressActivity::class.java
|
override val migrationActivity = MigrationDecisionActivity::class.java
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue