diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt index 9cf2c10dd..078d48cd1 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt @@ -200,7 +200,7 @@ class Core(private val context: Context) { */ fun getSecureAbove22Preferences() = SecureAbove22Preferences(context, KEY_STORAGE_NAME) - private val passwordsEncryptionKey: String = + val passwordsEncryptionKey: String = getSecureAbove22Preferences().getString(PASSWORDS_KEY) ?: generateEncryptionKey(KEY_STRENGTH).also { if (context.settings().passwordsEncryptionKeyGenerated) { diff --git a/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt b/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt index 7273b971c..bf001a2ad 100644 --- a/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt +++ b/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt @@ -34,6 +34,10 @@ class MigratingFenixApplication : FenixApplication() { .migrateOpenTabs(this.components.core.sessionManager) .migrateHistory(this.components.core.historyStorage) .migrateBookmarks(this.components.core.bookmarksStorage) + .migrateLogins( + this.components.core.passwordsStorage.store, + this.components.core.passwordsEncryptionKey + ) .migrateFxa(this.components.backgroundServices.accountManager) .build()