Skip to content

Move local storage cleanup off the main thread #6905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Move local storage cleanup off the main thread #6905

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 28 additions & 26 deletions app/src/main/java/com/duckduckgo/app/browser/weblocalstorage/WebLocalStorageManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,41 +57,43 @@ class DuckDuckGoWebLocalStorageManager @Inject constructor(
private var matchingRegex = emptyList<String>()

override fun clearWebLocalStorage() = runBlocking {
val settings = androidBrowserConfigFeature.webLocalStorage().getSettings()
val webLocalStorageSettings = webLocalStorageSettingsJsonParser.parseJson(settings)
withContext(dispatcherProvider.io()) {
val settings = androidBrowserConfigFeature.webLocalStorage().getSettings()
val webLocalStorageSettings = webLocalStorageSettingsJsonParser.parseJson(settings)

val fireproofedDomains = if (androidBrowserConfigFeature.fireproofedWebLocalStorage().isEnabled()) {
withContext(dispatcherProvider.io()) {
fireproofWebsiteRepository.fireproofWebsitesSync().map { it.domain }
val fireproofedDomains = if (androidBrowserConfigFeature.fireproofedWebLocalStorage().isEnabled()) {
withContext(dispatcherProvider.io()) {
fireproofWebsiteRepository.fireproofWebsitesSync().map { it.domain }
}
} else {
emptyList()
}
} else {
emptyList()
}

domains = webLocalStorageSettings.domains.list + fireproofedDomains
keysToDelete = webLocalStorageSettings.keysToDelete.list
matchingRegex = webLocalStorageSettings.matchingRegex.list
domains = webLocalStorageSettings.domains.list + fireproofedDomains
keysToDelete = webLocalStorageSettings.keysToDelete.list
matchingRegex = webLocalStorageSettings.matchingRegex.list

logcat { "WebLocalStorageManager: Allowed domains: $domains" }
logcat { "WebLocalStorageManager: Keys to delete: $keysToDelete" }
logcat { "WebLocalStorageManager: Matching regex: $matchingRegex" }
logcat { "WebLocalStorageManager: Allowed domains: $domains" }
logcat { "WebLocalStorageManager: Keys to delete: $keysToDelete" }
logcat { "WebLocalStorageManager: Matching regex: $matchingRegex" }

val db = databaseProvider.get()
db.iterator().use { iterator ->
iterator.seekToFirst()
val db = databaseProvider.get()
db.iterator().use { iterator ->
iterator.seekToFirst()

while (iterator.hasNext()) {
val entry = iterator.next()
val key = String(entry.key, StandardCharsets.UTF_8)
while (iterator.hasNext()) {
val entry = iterator.next()
val key = String(entry.key, StandardCharsets.UTF_8)

val domainForMatchingAllowedKey = getDomainForMatchingAllowedKey(key)
if (domainForMatchingAllowedKey == null) {
db.delete(entry.key)
logcat { "WebLocalStorageManager: Deleted key: $key" }
} else if (settingsDataStore.clearDuckAiData && domainForMatchingAllowedKey == DUCKDUCKGO_DOMAIN) {
if (keysToDelete.any { key.endsWith(it) }) {
val domainForMatchingAllowedKey = getDomainForMatchingAllowedKey(key)
if (domainForMatchingAllowedKey == null) {
db.delete(entry.key)
logcat { "WebLocalStorageManager: Deleted key: $key" }
} else if (settingsDataStore.clearDuckAiData && domainForMatchingAllowedKey == DUCKDUCKGO_DOMAIN) {
if (keysToDelete.any { key.endsWith(it) }) {
db.delete(entry.key)
logcat { "WebLocalStorageManager: Deleted key: $key" }
}
}
}
}
Expand Down
Loading