Duck.ai: delete local chats FF

Author: malmstein

app/src/main/java/com/duckduckgo/app/browser/weblocalstorage/WebLocalStorageManager.kt

@@ -53,7 +53,7 @@ class DuckDuckGoWebLocalStorageManager @Inject constructor(
 ) : WebLocalStorageManager {
 
     private var domains = emptyList<String>()
-    private var allowedKeys = emptyList<String>()
+    private var keysToDelete = emptyList<String>()
     private var matchingRegex = emptyList<String>()
 
     override fun clearWebLocalStorage() = runBlocking {
@@ -69,11 +69,11 @@ class DuckDuckGoWebLocalStorageManager @Inject constructor(
         }
 
         domains = webLocalStorageSettings.domains.list + fireproofedDomains
-        allowedKeys = webLocalStorageSettings.allowedKeys.list
+        keysToDelete = webLocalStorageSettings.keysToDelete.list
         matchingRegex = webLocalStorageSettings.matchingRegex.list
 
         logcat { "WebLocalStorageManager: Allowed domains: $domains" }
-        logcat { "WebLocalStorageManager: Allowed keys: $allowedKeys" }
+        logcat { "WebLocalStorageManager: Keys to delete: $keysToDelete" }
         logcat { "WebLocalStorageManager: Matching regex: $matchingRegex" }
 
         val db = databaseProvider.get()
@@ -92,7 +92,7 @@ class DuckDuckGoWebLocalStorageManager @Inject constructor(
                     if (key.endsWith("duckaiHasAgreedToTerms")) {
                         logcat { "WebLocalStorageManager: Don't delete key: $key" }
                     } else {
-                        if (allowedKeys.none { key.endsWith(it) }) {
+                        if (keysToDelete.any { key.endsWith(it) }) {
                             db.delete(entry.key)
                             logcat { "WebLocalStorageManager: Deleted key: $key" }
                         }

app/src/main/java/com/duckduckgo/app/browser/weblocalstorage/WebLocalStorageSettingsJsonParser.kt

@@ -26,12 +26,12 @@ import javax.inject.Inject
 import kotlinx.coroutines.withContext
 
 data class Domains(val list: List<String> = emptyList())
-data class AllowedKeys(val list: List<String> = emptyList())
+data class KeysToDelete(val list: List<String> = emptyList())
 data class MatchingRegex(val list: List<String> = emptyList())
 
 data class WebLocalStorageSettings(
     val domains: Domains = Domains(),
-    val allowedKeys: AllowedKeys = AllowedKeys(),
+    val keysToDelete: KeysToDelete = KeysToDelete(),
     val matchingRegex: MatchingRegex = MatchingRegex(),
 )
 
@@ -52,23 +52,23 @@ class WebLocalStorageSettingsJsonParserImpl @Inject constructor(
     }
 
     override suspend fun parseJson(json: String?): WebLocalStorageSettings = withContext(dispatcherProvider.io()) {
-        if (json == null) return@withContext WebLocalStorageSettings(Domains(), AllowedKeys(), MatchingRegex())
+        if (json == null) return@withContext WebLocalStorageSettings(Domains(), KeysToDelete(), MatchingRegex())
 
         kotlin.runCatching {
             val parsed = jsonAdapter.fromJson(json)
             val domains = parsed?.asDomains() ?: Domains()
-            val allowedKeys = parsed?.asAllowedKeys() ?: AllowedKeys()
+            val keysToDelete = parsed?.asKeysToDelete() ?: KeysToDelete()
             val matchingRegex = parsed?.asMatchingRegex() ?: MatchingRegex()
-            WebLocalStorageSettings(domains, allowedKeys, matchingRegex)
-        }.getOrDefault(WebLocalStorageSettings(Domains(), AllowedKeys(), MatchingRegex()))
+            WebLocalStorageSettings(domains, keysToDelete, matchingRegex)
+        }.getOrDefault(WebLocalStorageSettings(Domains(), KeysToDelete(), MatchingRegex()))
     }
 
     private fun SettingsJson.asDomains(): Domains {
         return Domains(domains ?: emptyList())
     }
 
-    private fun SettingsJson.asAllowedKeys(): AllowedKeys {
-        return AllowedKeys(allowedKeys ?: emptyList())
+    private fun SettingsJson.asKeysToDelete(): KeysToDelete {
+        return KeysToDelete(keysToDelete ?: emptyList())
     }
 
     private fun SettingsJson.asMatchingRegex(): MatchingRegex {
@@ -77,7 +77,7 @@ class WebLocalStorageSettingsJsonParserImpl @Inject constructor(
 
     private data class SettingsJson(
         val domains: List<String>?,
-        val allowedKeys: List<String>?,
+        val keysToDelete: List<String>?,
         val matchingRegex: List<String>?,
     )
 }