1
0
Fork 0

Enable firebase auto-init, force push renewal after migration

master
Grisha Kruglov 2020-01-15 21:10:07 -08:00 committed by Jonathan Almeida
parent 7f988a85d0
commit 9c25d274d0
3 changed files with 15 additions and 15 deletions

View File

@ -229,7 +229,7 @@
<meta-data
android:name="firebase_messaging_auto_init_enabled"
android:value="false" />
android:value="true" />
<meta-data
android:name="firebase_analytics_collection_enabled"
android:value="false" />

View File

@ -28,9 +28,8 @@ class MigratingFenixApplication : FenixApplication() {
}
val migrationPushSubscriber by lazy {
MigrationPushSubscriber(
this,
components.backgroundServices.pushService,
MigrationPushRenewer(
components.backgroundServices.push,
components.migrationStore
)
}

View File

@ -4,33 +4,34 @@
package org.mozilla.fenix
import android.content.Context
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.collect
import mozilla.components.concept.push.PushService
import mozilla.components.concept.push.PushProcessor
import mozilla.components.lib.state.ext.flowScoped
import mozilla.components.support.base.log.logger.Logger
import mozilla.components.support.migration.state.MigrationProgress
import mozilla.components.support.migration.state.MigrationStore
/**
* Migration-aware subscriber that disables the push service during an active migration
* and re-enables when complete.
* Force-renews push subscription after migration was complete.
*/
class MigrationPushSubscriber(
private val context: Context,
private val service: PushService,
class MigrationPushRenewer(
private val service: PushProcessor?,
private val store: MigrationStore
) {
@UseExperimental(ExperimentalCoroutinesApi::class)
fun start() {
// Stop the service if it is already started.
service.stop()
// Observe for migration completed.
store.flowScoped { flow ->
flow.collect { state ->
Logger("MigrationPushRenewer").debug("Migration state: ${state.progress}")
if (state.progress == MigrationProgress.COMPLETED) {
service.start(context)
Logger("MigrationPushRenewer").debug("Renewing registration....")
// This should force a recreation of firebase device token, re-registration with
// the autopush service, and subsequent update of the FxA device record with
// new push subscription information.
service?.renewRegistration()
}
}
}