From e3408b12b439256c3e358e8fd657bfb8241e83ba Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Wed, 8 Jan 2020 13:35:14 +0100 Subject: [PATCH] Update Mozilla Android Components to 28.0.0-SNAPSHOT. --- app/src/main/java/org/mozilla/fenix/Config.kt | 7 ++++++- .../mozilla/fenix/components/metrics/ActivationPing.kt | 2 +- .../java/org/mozilla/fenix/MigratingFenixApplication.kt | 9 ++++++++- .../migration/java/org/mozilla/fenix/MigrationService.kt | 2 ++ buildSrc/src/main/java/Dependencies.kt | 6 +++--- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/Config.kt b/app/src/main/java/org/mozilla/fenix/Config.kt index 59bdec96d..f8bc1720a 100644 --- a/app/src/main/java/org/mozilla/fenix/Config.kt +++ b/app/src/main/java/org/mozilla/fenix/Config.kt @@ -5,7 +5,7 @@ package org.mozilla.fenix enum class ReleaseChannel { - FenixDebug, FenixNightly, FenixBeta, FenixProduction, FennecProduction; + FenixDebug, FenixNightly, FenixBeta, FenixProduction, FennecProduction, FennecBeta, FennecNightly; val isReleased: Boolean get() = when (this) { @@ -27,12 +27,15 @@ enum class ReleaseChannel { get() = when (this) { FenixProduction -> true FenixBeta -> true + FennecProduction -> true + FennecBeta -> true else -> false } val isNightlyOrDebug: Boolean get() = when (this) { FenixNightly -> true + FennecNightly -> true FenixDebug -> true else -> false } @@ -45,6 +48,8 @@ object Config { "fenixNightly" -> ReleaseChannel.FenixNightly "debug" -> ReleaseChannel.FenixDebug "fennecProduction" -> ReleaseChannel.FennecProduction + "fennecBeta" -> ReleaseChannel.FennecBeta + "fennecNightly" -> ReleaseChannel.FennecNightly // Builds for local performance analysis, recording benchmarks, automation, etc. // This should be treated like a released channel because we want to test diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/ActivationPing.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/ActivationPing.kt index ea1fee014..bdd51efe8 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/ActivationPing.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/ActivationPing.kt @@ -166,7 +166,7 @@ class ActivationPing(private val context: Context) { } Logger.info("ActivationPing - generating ping (has `identifier`: ${hashedId != null})") - Pings.activation.send() + Pings.activation.submit() markAsTriggered() } } diff --git a/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt b/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt index e6f3bd906..a3df57d77 100644 --- a/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt +++ b/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt @@ -7,6 +7,7 @@ package org.mozilla.fenix import android.content.Context import kotlinx.coroutines.runBlocking import mozilla.components.support.migration.FennecMigrator +import mozilla.components.support.migration.state.MigrationStore /** * An application class which knows how to migrate Fennec data. @@ -26,12 +27,14 @@ class MigratingFenixApplication : FenixApplication() { .build() } + val migrationStore by lazy { MigrationStore() } + override fun setupInMainProcessOnly() { migrateGeckoBlocking() super.setupInMainProcessOnly() - migrator.startMigrationServiceIfNeeded(MigrationService::class.java) + migrator.startMigrationIfNeeded(migrationStore, MigrationService::class.java) } private fun migrateGeckoBlocking() { @@ -48,3 +51,7 @@ class MigratingFenixApplication : FenixApplication() { fun Context.getMigratorFromApplication(): FennecMigrator { return (applicationContext as MigratingFenixApplication).migrator } + +fun Context.getMigrationStoreFromApplication(): MigrationStore { + return (applicationContext as MigratingFenixApplication).migrationStore +} diff --git a/app/src/migration/java/org/mozilla/fenix/MigrationService.kt b/app/src/migration/java/org/mozilla/fenix/MigrationService.kt index 6eef420c8..5060eb821 100644 --- a/app/src/migration/java/org/mozilla/fenix/MigrationService.kt +++ b/app/src/migration/java/org/mozilla/fenix/MigrationService.kt @@ -5,10 +5,12 @@ package org.mozilla.fenix import mozilla.components.support.migration.AbstractMigrationService +import mozilla.components.support.migration.state.MigrationStore /** * Background service for running the migration from legacy Firefox for Android (Fennec). */ class MigrationService : AbstractMigrationService() { override val migrator by lazy { getMigratorFromApplication() } + override val store: MigrationStore by lazy { getMigrationStoreFromApplication() } } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 848ac074c..a30543803 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -31,16 +31,16 @@ object Versions { const val androidx_work = "2.2.0" const val google_material = "1.1.0-beta01" - const val mozilla_android_components = "27.0.0-SNAPSHOT" + const val mozilla_android_components = "28.0.0-SNAPSHOT" // Note that android-components also depends on application-services, // and in fact is our main source of appservices-related functionality. // The version number below tracks the application-services version // that we depend on directly for the fenix-megazord (and for it's // forUnitTest variant), and it's important that it be kept in // sync with the version used by android-components above. - const val mozilla_appservices = "0.44.0" + const val mozilla_appservices = "0.47.0" - const val mozilla_glean = "22.1.0" + const val mozilla_glean = "23.0.0" const val adjust = "4.18.3" const val installreferrer = "1.0"