Fix data clearing ANR (#7112)

Task/Issue URL:
https://app.asana.com/1/137249556945/task/1211892024022522?focus=true

### Description
Fixes Data clearing ANR blocking main thread with runBlocking

### Steps to test this PR
Smoke test data clearing when acting around the `WebLocalStorage` to
confirm works as expected.

### UI changes
| Before  | After |
| ------ | ----- |
!(Upload before screenshot)|(Upload after screenshot)|

Author: cmonfortep

app/src/main/java/com/duckduckgo/app/browser/WebDataManager.kt

@@ -36,14 +36,13 @@ import com.squareup.anvil.annotations.ContributesBinding
 import dagger.SingleInstanceIn
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import logcat.LogPriority.ERROR
 import logcat.LogPriority.WARN
 import logcat.asLog
 import logcat.logcat
 import java.io.File
 import javax.inject.Inject
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 
 interface WebDataManager {
     suspend fun clearData(
@@ -92,25 +91,27 @@ class WebViewDataManager @Inject constructor(
         webView.clearHistory()
     }
 
-    private suspend fun clearWebStorage(webStorage: WebStorage) {
-        suspendCoroutine { continuation ->
-            if (androidBrowserConfigFeature.webLocalStorage().isEnabled()) {
-                kotlin.runCatching {
-                    webLocalStorageManager.clearWebLocalStorage()
-                    continuation.resume(Unit)
-                }.onFailure { e ->
-                    logcat(ERROR) { "WebDataManager: Could not selectively clear web storage: ${e.asLog()}" }
-                    if (appBuildConfig.isInternalBuild()) {
-                        sendCrashPixel(e)
-                    }
-                    // fallback, if we crash we delete everything
-                    webStorage.deleteAllData()
-                    continuation.resume(Unit)
+    private suspend fun clearWebStorage(webStorage: WebStorage) = withContext(dispatcherProvider.io()) {
+        if (androidBrowserConfigFeature.webLocalStorage().isEnabled()) {
+            kotlin.runCatching {
+                webLocalStorageManager.clearWebLocalStorage()
+            }.onFailure { e ->
+                logcat(ERROR) { "WebDataManager: Could not selectively clear web storage: ${e.asLog()}" }
+                if (appBuildConfig.isInternalBuild()) {
+                    sendCrashPixel(e)
                 }
-            } else {
-                webStorage.deleteAllData()
-                continuation.resume(Unit)
+                // fallback, if we crash we delete everything
+                deleteAllData(webStorage)
             }
+        } else {
+            deleteAllData(webStorage)
+        }
+    }
+
+    private suspend fun deleteAllData(webStorage: WebStorage) {
+        // WebStorage API must be called on main thread
+        withContext(dispatcherProvider.main()) {
+            webStorage.deleteAllData()
         }
     }
 

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

@@ -28,7 +28,6 @@ import dagger.Lazy
 import dagger.Module
 import dagger.Provides
 import dagger.SingleInstanceIn
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import logcat.logcat
 import org.iq80.leveldb.DB
@@ -39,7 +38,7 @@ import java.nio.charset.StandardCharsets
 import javax.inject.Inject
 
 interface WebLocalStorageManager {
-    fun clearWebLocalStorage()
+    suspend fun clearWebLocalStorage()
 }
 
 @ContributesBinding(AppScope::class)
@@ -56,40 +55,36 @@ class DuckDuckGoWebLocalStorageManager @Inject constructor(
     private var keysToDelete = emptyList<String>()
     private var matchingRegex = emptyList<String>()
 
-    override fun clearWebLocalStorage() = runBlocking {
-        withContext(dispatcherProvider.io()) {
-            val settings = androidBrowserConfigFeature.webLocalStorage().getSettings()
-            val webLocalStorageSettings = webLocalStorageSettingsJsonParser.parseJson(settings)
+    override suspend fun clearWebLocalStorage() = withContext(dispatcherProvider.io()) {
+        val settings = androidBrowserConfigFeature.webLocalStorage().getSettings()
+        val webLocalStorageSettings = webLocalStorageSettingsJsonParser.parseJson(settings)
 
-            val fireproofedDomains = withContext(dispatcherProvider.io()) {
-                fireproofWebsiteRepository.fireproofWebsitesSync().map { it.domain }
-            }
+        val fireproofedDomains = fireproofWebsiteRepository.fireproofWebsitesSync().map { it.domain }
 
-            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) {
+                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" }
-                    } else if (settingsDataStore.clearDuckAiData && domainForMatchingAllowedKey == DUCKDUCKGO_DOMAIN) {
-                        if (keysToDelete.any { key.endsWith(it) }) {
-                            db.delete(entry.key)
-                            logcat { "WebLocalStorageManager: Deleted key: $key" }
-                        }
                     }
                 }
             }

app/src/test/java/com/duckduckgo/app/browser/DuckDuckGoWebLocalStorageManagerTest.kt

@@ -82,7 +82,7 @@ class DuckDuckGoWebLocalStorageManagerTest {
     }
 
     @Test
-    fun whenClearWebLocalStorageThenIteratorSeeksToFirst() {
+    fun whenClearWebLocalStorageThenIteratorSeeksToFirst() = runTest {
         whenever(mockDB.iterator()).thenReturn(mockIterator)
 
         testee.clearWebLocalStorage()
@@ -91,7 +91,7 @@ class DuckDuckGoWebLocalStorageManagerTest {
     }
 
     @Test
-    fun whenClearWebLocalStorageThenDeletesNonAllowedKeys() {
+    fun whenClearWebLocalStorageThenDeletesNonAllowedKeys() = runTest {
         val key1 = bytes("_https://example.com\u0000\u0001key1")
         val key2 = bytes("_https://duckduckgo.com\u0000\u0001key2")
         val entry1 = createMockDBEntry(key1)
@@ -108,7 +108,7 @@ class DuckDuckGoWebLocalStorageManagerTest {
     }
 
     @Test
-    fun whenClearWebLocalStorageThenDoesNotDeleteKeysWithValidSubdomains() {
+    fun whenClearWebLocalStorageThenDoesNotDeleteKeysWithValidSubdomains() = runTest {
         val key1 = bytes("_https://subdomain.duckduckgo.com\u0000\u0001key1")
         val key2 = bytes("_https://another.subdomain.duckduckgo.com\u0000\u0001key2")
 
@@ -126,7 +126,7 @@ class DuckDuckGoWebLocalStorageManagerTest {
     }
 
     @Test
-    fun whenClearWebLocalStorageThenDeletesKeysWithPartialDomainMatch() {
+    fun whenClearWebLocalStorageThenDeletesKeysWithPartialDomainMatch() = runTest {
         val key1 = bytes("_https://notduckduckgo.com\u0000\u0001key1")
         val key2 = bytes("_https://duckduckgo.something.com\u0000\u0001key2")
 
@@ -144,7 +144,7 @@ class DuckDuckGoWebLocalStorageManagerTest {
     }
 
     @Test
-    fun whenClearWebLocalStorageThenDeletesKeysWithInvalidFormat() {
+    fun whenClearWebLocalStorageThenDeletesKeysWithInvalidFormat() = runTest {
         val key1 = bytes("malformed-key")
         val key2 = bytes("_https://duckduckgo.com")
         val key3 = bytes("_https://duckduckgo.com\u0000\u0001")
@@ -165,7 +165,7 @@ class DuckDuckGoWebLocalStorageManagerTest {
     }
 
     @Test
-    fun whenClearWebLocalStorageThenIteratorIsClosed() {
+    fun whenClearWebLocalStorageThenIteratorIsClosed() = runTest {
         whenever(mockDB.iterator()).thenReturn(mockIterator)
         whenever(mockIterator.hasNext()).thenReturn(false)