From d10a30e356188868f801e403fd29cd24e8737f77 Mon Sep 17 00:00:00 2001 From: Christian Sadilek Date: Tue, 4 Feb 2020 14:56:02 -0500 Subject: [PATCH] Closes #4983: Fennec migration: Keep installed add-ons --- .../main/java/org/mozilla/fenix/components/Components.kt | 3 --- .../java/org/mozilla/fenix/MigratingFenixApplication.kt | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt index 2294d2689..1ca406192 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Components.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt @@ -58,9 +58,6 @@ class Components(private val context: Context) { ) } - /** - * Add-on - */ val addonCollectionProvider by lazy { AddonCollectionProvider(context, core.client, maxCacheAgeInMinutes = DAY_IN_MINUTES) } diff --git a/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt b/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt index d0a266d71..aa3abfc57 100644 --- a/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt +++ b/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt @@ -22,7 +22,11 @@ class MigratingFenixApplication : FenixApplication() { this.components.core.passwordsEncryptionKey ) .migrateFxa(this.components.backgroundServices.accountManager) - .migrateAddons(this.components.core.engine) + .migrateAddons( + this.components.core.engine, + this.components.addonCollectionProvider, + this.components.addonUpdater + ) .migrateTelemetryIdentifiers() .build() }