Closes #6003: MigrationProgressActivity: Always open browser.
parent
69c6de7cd4
commit
388c7017d8
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
package org.mozilla.fenix.migration
|
package org.mozilla.fenix.migration
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
@ -15,6 +16,7 @@ import androidx.recyclerview.widget.ListAdapter
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import kotlinx.android.synthetic.main.activity_migration.*
|
import kotlinx.android.synthetic.main.activity_migration.*
|
||||||
import kotlinx.android.synthetic.main.migration_list_item.view.*
|
import kotlinx.android.synthetic.main.migration_list_item.view.*
|
||||||
|
import mozilla.components.support.base.log.logger.Logger
|
||||||
import mozilla.components.support.migration.AbstractMigrationProgressActivity
|
import mozilla.components.support.migration.AbstractMigrationProgressActivity
|
||||||
import mozilla.components.support.migration.AbstractMigrationService
|
import mozilla.components.support.migration.AbstractMigrationService
|
||||||
import mozilla.components.support.migration.Migration
|
import mozilla.components.support.migration.Migration
|
||||||
|
@ -32,6 +34,7 @@ import org.mozilla.fenix.R
|
||||||
import org.mozilla.fenix.ext.components
|
import org.mozilla.fenix.ext.components
|
||||||
|
|
||||||
class MigrationProgressActivity : AbstractMigrationProgressActivity() {
|
class MigrationProgressActivity : AbstractMigrationProgressActivity() {
|
||||||
|
private val logger = Logger("MigrationProgressActivity")
|
||||||
private val statusAdapter = MigrationStatusAdapter()
|
private val statusAdapter = MigrationStatusAdapter()
|
||||||
override val store: MigrationStore by lazy { components.migrationStore }
|
override val store: MigrationStore by lazy { components.migrationStore }
|
||||||
|
|
||||||
|
@ -69,11 +72,16 @@ class MigrationProgressActivity : AbstractMigrationProgressActivity() {
|
||||||
finish()
|
finish()
|
||||||
overridePendingTransition(0, 0)
|
overridePendingTransition(0, 0)
|
||||||
|
|
||||||
|
store.dispatch(MigrationAction.Clear)
|
||||||
|
|
||||||
// If we received a user-initiated intent, throw this back to the intent receiver.
|
// If we received a user-initiated intent, throw this back to the intent receiver.
|
||||||
if (intent.hasExtra(HomeActivity.OPEN_TO_BROWSER)) {
|
if (intent.hasExtra(HomeActivity.OPEN_TO_BROWSER)) {
|
||||||
store.dispatch(MigrationAction.Clear)
|
|
||||||
intent.setClassName(applicationContext, IntentReceiverActivity::class.java.name)
|
intent.setClassName(applicationContext, IntentReceiverActivity::class.java.name)
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
|
} else {
|
||||||
|
// Fallback: Just launch the browser
|
||||||
|
logger.warn("Intent does not contain OPEN_TO_BROWSER extra, launching HomeActivity")
|
||||||
|
startActivity(Intent(this@MigrationProgressActivity, HomeActivity::class.java))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
text = getString(R.string.migration_update_app_button, getString(R.string.app_name))
|
text = getString(R.string.migration_update_app_button, getString(R.string.app_name))
|
||||||
|
|
Loading…
Reference in New Issue