blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fennec migration: enable logins migration

master
Grisha Kruglov 2019-12-03 14:08:09 -08:00 committed by Grisha Kruglov
parent 45c6e3a784
commit 42d6915699
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/components/Core.kt
View File

@ -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) {

4
app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt
View File

@ -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()