Change preferences containing passwords to appStateKeys

jobobby04 · Feb 19, 2024 · 33cc57d · 33cc57d
1 parent 2daccb5
commit 33cc57d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt
@@ -655,6 +655,20 @@ object EXHMigrations {
                     }
                 }
 
+                if (oldVersion under 65) {
+                    val appStatePrefsToReplace = listOf(
+                        "__PRIVATE_sql_password",
+                        "__PRIVATE_encrypt_database",
+                        "__PRIVATE_cbz_password",
+                    )
+
+                    replacePreferences(
+                        preferenceStore = preferenceStore,
+                        filterPredicate = { it.key in appStatePrefsToReplace },
+                        newKey = { Preference.appStateKey(it.replace("__PRIVATE_", "").trim()) },
+                    )
+                }
+
                 // if (oldVersion under 1) { } (1 is current release version)
                 // do stuff here when releasing changed crap
 

diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt
@@ -24,9 +24,9 @@ class SecurityPreferences(
 
     fun authenticatorDays() = this.preferenceStore.getInt("biometric_days", 0x7F)
 
-    fun encryptDatabase() = this.preferenceStore.getBoolean(Preference.privateKey("encrypt_database"), false)
+    fun encryptDatabase() = this.preferenceStore.getBoolean(Preference.appStateKey("encrypt_database"), false)
 
-    fun sqlPassword() = this.preferenceStore.getString(Preference.privateKey("sql_password"), "")
+    fun sqlPassword() = this.preferenceStore.getString(Preference.appStateKey("sql_password"), "")
 
     fun passwordProtectDownloads() = preferenceStore.getBoolean(
         Preference.privateKey("password_protect_downloads"),
@@ -35,7 +35,7 @@ class SecurityPreferences(
 
     fun encryptionType() = this.preferenceStore.getEnum("encryption_type", EncryptionType.AES_256)
 
-    fun cbzPassword() = this.preferenceStore.getString(Preference.privateKey("cbz_password"), "")
+    fun cbzPassword() = this.preferenceStore.getString(Preference.appStateKey("cbz_password"), "")
     // SY <--
 
     /**