Merge branch 'hotfix/5.76.1' into main

Author: aitorvs

app/schemas/com.duckduckgo.app.browser.httpauth.db.HttpAuthDatabase/1.json

@@ -17,11 +17,9 @@
 package com.duckduckgo.app.browser.httpauth
 
 import android.webkit.WebView
+import android.webkit.WebViewDatabase
+import androidx.test.filters.SdkSuppress
 import com.duckduckgo.app.CoroutineTestRule
-import com.duckduckgo.app.browser.httpauth.db.HttpAuthDao
-import com.duckduckgo.app.browser.httpauth.db.HttpAuthEntity
-import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteDao
-import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteEntity
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
@@ -37,14 +35,14 @@ class WebViewHttpAuthStoreTest {
     @Suppress("unused")
     val coroutineRule = CoroutineTestRule()
 
-    private val fireproofWebsiteDao: FireproofWebsiteDao = mock()
-    private val httpAuthDao: HttpAuthDao = mock()
+    private val webViewDatabase: WebViewDatabase = mock()
     private val webView: WebView = mock()
 
-    private val webViewHttpAuthStore = RealWebViewHttpAuthStore(coroutineRule.testDispatcherProvider, fireproofWebsiteDao, httpAuthDao)
+    private val webViewHttpAuthStore = RealWebViewHttpAuthStore(webViewDatabase)
 
     @Test
-    fun whenSetHttpAuthUsernamePasswordThenInsertHttpAuthEntity() {
+    @SdkSuppress(minSdkVersion = android.os.Build.VERSION_CODES.O)
+    fun whenSetHttpAuthUsernamePasswordApi26AndAboveThenInsertHttpAuthEntity() {
         webViewHttpAuthStore.setHttpAuthUsernamePassword(
             webView = webView,
             host = "host",
@@ -53,32 +51,42 @@ class WebViewHttpAuthStoreTest {
             password = "pass",
         )
 
-        verify(httpAuthDao).insert(
-            HttpAuthEntity(
-                host = "host",
-                realm = "realm",
-                username = "name",
-                password = "pass"
-            )
-        )
+        verify(webViewDatabase).setHttpAuthUsernamePassword("host", "realm", "name", "pass")
     }
 
     @Test
-    fun whenGetHttpAuthUsernamePasswordThenReturnWebViewHttpAuthCredentials() {
-        whenever(httpAuthDao.getAuthCredentials("host", "realm"))
-            .thenReturn(HttpAuthEntity(1, "host", "realm", "name", "pass"))
+    @SdkSuppress(minSdkVersion = android.os.Build.VERSION_CODES.O)
+    fun whenGetHttpAuthUsernamePasswordApi26AndAboveThenReturnWebViewHttpAuthCredentials() {
+        whenever(webViewDatabase.getHttpAuthUsernamePassword("host", "realm"))
+            .thenReturn(arrayOf("name", "pass"))
         val credentials = webViewHttpAuthStore.getHttpAuthUsernamePassword(webView, "host", "realm")
 
         assertEquals(WebViewHttpAuthCredentials("name", "pass"), credentials)
     }
 
     @Test
-    fun whenClearHttpAuthUsernamePasswordThenDeleteAllCredentialsExceptExclusions() {
-        whenever(fireproofWebsiteDao.fireproofWebsitesSync())
-            .thenReturn(listOf(FireproofWebsiteEntity("http://fireproofed.me")))
+    @SdkSuppress(maxSdkVersion = android.os.Build.VERSION_CODES.N_MR1)
+    @Suppress("DEPRECATION")
+    fun whenSetHttpAuthUsernamePasswordApiBelow26ThenInsertHttpAuthEntity() {
+        webViewHttpAuthStore.setHttpAuthUsernamePassword(
+            webView = webView,
+            host = "host",
+            realm = "realm",
+            username = "name",
+            password = "pass",
+        )
+
+        verify(webView).setHttpAuthUsernamePassword("host", "realm", "name", "pass")
+    }
 
-        webViewHttpAuthStore.clearHttpAuthUsernamePassword(webView)
+    @Test
+    @SdkSuppress(maxSdkVersion = android.os.Build.VERSION_CODES.N_MR1)
+    @Suppress("DEPRECATION")
+    fun whenGetHttpAuthUsernamePasswordApiBelow26ThenReturnWebViewHttpAuthCredentials() {
+        whenever(webView.getHttpAuthUsernamePassword("host", "realm"))
+            .thenReturn(arrayOf("name", "pass"))
+        val credentials = webViewHttpAuthStore.getHttpAuthUsernamePassword(webView, "host", "realm")
 
-        verify(httpAuthDao).deleteAll(listOf("http://fireproofed.me"))
+        assertEquals(WebViewHttpAuthCredentials("name", "pass"), credentials)
     }
 }

app/src/androidTest/java/com/duckduckgo/app/browser/httpauth/WebViewHttpAuthStoreTest.kt

@@ -17,12 +17,10 @@
 package com.duckduckgo.app.di
 
 import android.content.Context
+import android.webkit.WebViewDatabase
 import androidx.room.Room
 import com.duckduckgo.app.browser.httpauth.RealWebViewHttpAuthStore
 import com.duckduckgo.app.browser.httpauth.WebViewHttpAuthStore
-import com.duckduckgo.app.browser.httpauth.db.HttpAuthDatabase
-import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteDao
-import com.duckduckgo.app.global.DefaultDispatcherProvider
 import com.duckduckgo.app.global.db.AppDatabase
 import dagger.Module
 import dagger.Provides
@@ -43,12 +41,7 @@ class StubDatabaseModule {
     @Singleton
     fun provideWebViewHttpAuthStore(
         context: Context,
-        fireproofWebsiteDao: FireproofWebsiteDao
     ): WebViewHttpAuthStore {
-        val db = Room.inMemoryDatabaseBuilder(context, HttpAuthDatabase::class.java)
-            .allowMainThreadQueries()
-            .build()
-
-        return RealWebViewHttpAuthStore(DefaultDispatcherProvider(), fireproofWebsiteDao, db.httpAuthDao())
+        return RealWebViewHttpAuthStore(WebViewDatabase.getInstance(context))
     }
 }

app/src/androidTest/java/com/duckduckgo/app/di/StubDatabaseModule.kt

@@ -17,14 +17,8 @@
 package com.duckduckgo.app.browser.httpauth
 
 import android.webkit.WebView
+import android.webkit.WebViewDatabase
 import androidx.annotation.UiThread
-import com.duckduckgo.app.browser.httpauth.db.HttpAuthDao
-import com.duckduckgo.app.browser.httpauth.db.HttpAuthEntity
-import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteDao
-import com.duckduckgo.app.fire.fireproofwebsite.data.website
-import com.duckduckgo.app.global.DispatcherProvider
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
 
 data class WebViewHttpAuthCredentials(val username: String, val password: String)
 
@@ -40,37 +34,28 @@ interface WebViewHttpAuthStore {
 }
 
 class RealWebViewHttpAuthStore(
-    private val dispatcherProvider: DispatcherProvider,
-    private val fireproofWebsiteDao: FireproofWebsiteDao,
-    private val httpAuthDao: HttpAuthDao
+    private val webViewDatabase: WebViewDatabase
 ) : WebViewHttpAuthStore {
     override fun setHttpAuthUsernamePassword(webView: WebView, host: String, realm: String, username: String, password: String) {
-        runBlocking {
-            withContext(dispatcherProvider.io()) {
-                httpAuthDao.insert(
-                    HttpAuthEntity(
-                        host = host,
-                        realm = realm,
-                        username = username,
-                        password = password
-                    )
-                )
-            }
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            webViewDatabase.setHttpAuthUsernamePassword(host, realm, username, password)
+        } else {
+            webView.setHttpAuthUsernamePassword(host, realm, username, password)
         }
     }
 
     override fun getHttpAuthUsernamePassword(webView: WebView, host: String, realm: String): WebViewHttpAuthCredentials? {
-        return runBlocking(dispatcherProvider.io()) {
-            val credentials = httpAuthDao.getAuthCredentials(host = host, realm = realm) ?: return@runBlocking null
-            if (credentials.username == null || credentials.password == null) return@runBlocking null
-            return@runBlocking WebViewHttpAuthCredentials(credentials.username!!, credentials.password!!)
-        }
+        val credentials = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            webViewDatabase.getHttpAuthUsernamePassword(host, realm)
+        } else {
+            @Suppress("DEPRECATION")
+            webView.getHttpAuthUsernamePassword(host, realm)
+        } ?: return null
+
+        return WebViewHttpAuthCredentials(username = credentials[0], password = credentials[1])
     }
 
     override fun clearHttpAuthUsernamePassword(webView: WebView) {
-        runBlocking(dispatcherProvider.io()) {
-            val exclusions = fireproofWebsiteDao.fireproofWebsitesSync().map { it.website() }
-            httpAuthDao.deleteAll(exclusions)
-        }
+        webViewDatabase.clearHttpAuthUsernamePassword()
     }
 }

app/src/main/java/com/duckduckgo/app/browser/httpauth/WebViewHttpAuthStore.kt

@@ -17,14 +17,11 @@
 package com.duckduckgo.app.di
 
 import android.content.Context
+import android.webkit.WebViewDatabase
 import androidx.room.Room
-import androidx.room.RoomDatabase
 import com.duckduckgo.app.browser.addtohome.AddToHomeCapabilityDetector
 import com.duckduckgo.app.browser.httpauth.RealWebViewHttpAuthStore
 import com.duckduckgo.app.browser.httpauth.WebViewHttpAuthStore
-import com.duckduckgo.app.browser.httpauth.db.HttpAuthDatabase
-import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteDao
-import com.duckduckgo.app.global.DispatcherProvider
 import com.duckduckgo.app.global.db.AppDatabase
 import com.duckduckgo.app.global.db.MigrationsProvider
 import com.duckduckgo.app.settings.db.SettingsDataStore
@@ -39,14 +36,8 @@ class DatabaseModule {
     @Singleton
     fun provideWebViewHttpAuthStore(
         context: Context,
-        fireproofWebsiteDao: FireproofWebsiteDao,
-        dispatcherProvider: DispatcherProvider
     ): WebViewHttpAuthStore {
-        val httpAuthDb = Room.databaseBuilder(context, HttpAuthDatabase::class.java, "http_auth.db")
-            .setJournalMode(RoomDatabase.JournalMode.TRUNCATE)
-            .build()
-
-        return RealWebViewHttpAuthStore(dispatcherProvider, fireproofWebsiteDao, httpAuthDb.httpAuthDao())
+        return RealWebViewHttpAuthStore(WebViewDatabase.getInstance(context))
     }
 
     @Provides