Merge branch 'release/5.58.0' into main

Author: cmonfortep

README.md

@@ -13,6 +13,10 @@ We use git submodules and so when you are checking out the app, you'll need to e
 Alternatively, if you already have the project checked out, you can initialize the submodules manually.
 
     git submodule update --init
+    
+## Terminology
+
+We have taken steps to update our terminology and remove words with problematic racial connotations, most notably the change to `main` branches, `allow lists`, and `blocklists`. Closed issues or PRs may contain deprecated terminology that should not be used going forward.
 
 ## Contribute
 

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -41,6 +41,9 @@ import com.duckduckgo.app.browser.LongPressHandler.RequiredAction.DownloadFile
 import com.duckduckgo.app.browser.LongPressHandler.RequiredAction.OpenInNewTab
 import com.duckduckgo.app.browser.addtohome.AddToHomeCapabilityDetector
 import com.duckduckgo.app.browser.favicon.FaviconDownloader
+import com.duckduckgo.app.browser.logindetection.LoginDetected
+import com.duckduckgo.app.browser.logindetection.NavigationAwareLoginDetector
+import com.duckduckgo.app.browser.logindetection.NavigationEvent.LoginAttempt
 import com.duckduckgo.app.browser.model.BasicAuthenticationCredentials
 import com.duckduckgo.app.browser.model.BasicAuthenticationRequest
 import com.duckduckgo.app.browser.model.LongPressTarget
@@ -49,13 +52,10 @@ import com.duckduckgo.app.browser.session.WebViewSessionStorage
 import com.duckduckgo.app.cta.db.DismissedCtaDao
 import com.duckduckgo.app.cta.model.CtaId
 import com.duckduckgo.app.cta.model.DismissedCta
+import com.duckduckgo.app.cta.ui.*
 import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteDao
 import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteEntity
-import com.duckduckgo.app.cta.ui.Cta
-import com.duckduckgo.app.cta.ui.CtaViewModel
-import com.duckduckgo.app.cta.ui.DaxBubbleCta
-import com.duckduckgo.app.cta.ui.DaxDialogCta
-import com.duckduckgo.app.cta.ui.HomePanelCta
+import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteRepository
 import com.duckduckgo.app.global.db.AppDatabase
 import com.duckduckgo.app.global.install.AppInstallStore
 import com.duckduckgo.app.global.model.SiteFactory
@@ -83,14 +83,7 @@ import com.duckduckgo.app.trackerdetection.EntityLookup
 import com.duckduckgo.app.trackerdetection.model.TrackingEvent
 import com.duckduckgo.app.usage.search.SearchCountDao
 import com.duckduckgo.app.widget.ui.WidgetCapabilities
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.anyOrNull
-import com.nhaarman.mockitokotlin2.atLeastOnce
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.firstValue
-import com.nhaarman.mockitokotlin2.lastValue
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Observable
 import io.reactivex.Single
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -101,14 +94,10 @@ import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mockito.ArgumentCaptor
+import org.mockito.*
 import org.mockito.ArgumentMatchers.anyString
-import org.mockito.Captor
-import org.mockito.Mock
-import org.mockito.Mockito
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
 import java.util.concurrent.TimeUnit
 
 @ExperimentalCoroutinesApi
@@ -196,6 +185,9 @@ class BrowserTabViewModelTest {
     @Mock
     private lateinit var mockUserWhitelistDao: UserWhitelistDao
 
+    @Mock
+    private lateinit var mockNavigationAwareLoginDetector: NavigationAwareLoginDetector
+
     private lateinit var mockAutoCompleteApi: AutoCompleteApi
 
     private lateinit var ctaViewModel: CtaViewModel
@@ -211,6 +203,8 @@ class BrowserTabViewModelTest {
 
     private val selectedTabLiveData = MutableLiveData<TabEntity>()
 
+    private val loginEventLiveData = MutableLiveData<LoginDetected>()
+
     @Before
     fun before() {
         MockitoAnnotations.initMocks(this)
@@ -241,6 +235,7 @@ class BrowserTabViewModelTest {
         whenever(mockOmnibarConverter.convertQueryToUrl(any(), any())).thenReturn("duckduckgo.com")
         whenever(mockVariantManager.getVariant()).thenReturn(DEFAULT_VARIANT)
         whenever(mockTabsRepository.liveSelectedTab).thenReturn(selectedTabLiveData)
+        whenever(mockNavigationAwareLoginDetector.loginEventLiveData).thenReturn(loginEventLiveData)
         whenever(mockTabsRepository.retrieveSiteData(any())).thenReturn(MutableLiveData())
         whenever(mockPrivacyPractices.privacyPracticesFor(any())).thenReturn(PrivacyPractices.UNKNOWN)
         whenever(mockAppInstallStore.installTimestamp).thenReturn(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1))
@@ -266,7 +261,8 @@ class BrowserTabViewModelTest {
             searchCountDao = mockSearchCountDao,
             pixel = mockPixel,
             dispatchers = coroutineRule.testDispatcherProvider,
-            fireproofWebsiteDao = fireproofWebsiteDao,
+            fireproofWebsiteRepository = FireproofWebsiteRepository(fireproofWebsiteDao, coroutineRule.testDispatcherProvider),
+            navigationAwareLoginDetector = mockNavigationAwareLoginDetector,
             variantManager = mockVariantManager
         )
 
@@ -1768,23 +1764,25 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenUserLoadsNotFireproofWebsiteThenFireproofWebsiteOptionMenuEnabled() {
+    fun whenUserLoadsNotFireproofWebsiteThenFireproofWebsiteBrowserStateUpdated() {
         loadUrl("http://www.example.com/path", isBrowserShowing = true)
         assertTrue(browserViewState().canFireproofSite)
+        assertFalse(browserViewState().isFireproofWebsite)
     }
 
     @Test
-    fun whenUserLoadsFireproofWebsiteThenFireproofWebsiteOptionMenuDisabled() {
+    fun whenUserLoadsFireproofWebsiteThenFireproofWebsiteBrowserStateUpdated() {
         givenFireproofWebsiteDomain("www.example.com")
         loadUrl("http://www.example.com/path", isBrowserShowing = true)
-        assertFalse(browserViewState().canFireproofSite)
+        assertTrue(browserViewState().isFireproofWebsite)
     }
 
     @Test
-    fun whenUserLoadsFireproofWebsiteSubDomainThenFireproofWebsiteOptionMenuEnabled() {
+    fun whenUserLoadsFireproofWebsiteSubDomainThenFireproofWebsiteBrowserStateUpdated() {
         givenFireproofWebsiteDomain("example.com")
         loadUrl("http://mobile.example.com/path", isBrowserShowing = true)
         assertTrue(browserViewState().canFireproofSite)
+        assertFalse(browserViewState().isFireproofWebsite)
     }
 
     @Test
@@ -1796,64 +1794,127 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenUrlIsUpdatedWithNonFireproofWebsiteThenFireproofWebsiteOptionMenuEnabled() {
+    fun whenUrlIsUpdatedWithNonFireproofWebsiteThenFireproofWebsiteBrowserStateUpdated() {
         givenFireproofWebsiteDomain("www.example.com")
         loadUrl("http://www.example.com/", isBrowserShowing = true)
         updateUrl("http://www.example.com/", "http://twitter.com/explore", true)
         assertTrue(browserViewState().canFireproofSite)
+        assertFalse(browserViewState().isFireproofWebsite)
     }
 
     @Test
-    fun whenUrlIsUpdatedWithFireproofWebsiteThenFireproofWebsiteOptionMenuDisabled() {
+    fun whenUrlIsUpdatedWithFireproofWebsiteThenFireproofWebsiteBrowserStateUpdated() {
         givenFireproofWebsiteDomain("twitter.com")
         loadUrl("http://example.com/", isBrowserShowing = true)
         updateUrl("http://example.com/", "http://twitter.com/explore", true)
-        assertFalse(browserViewState().canFireproofSite)
+        assertTrue(browserViewState().isFireproofWebsite)
     }
 
     @Test
     fun whenUserClicksFireproofWebsiteOptionMenuThenShowConfirmationIsIssued() {
         loadUrl("http://mobile.example.com/", isBrowserShowing = true)
-        testee.onFireproofWebsiteClicked()
+        testee.onFireproofWebsiteMenuClicked()
         assertCommandIssued<Command.ShowFireproofWebSiteConfirmation> {
             assertEquals("mobile.example.com", this.fireproofWebsiteEntity.domain)
         }
     }
 
     @Test
-    fun whenUserClicksFireproofWebsiteOptionMenuThenFireproofWebsiteOptionMenuDisabled() {
+    fun whenUserClicksFireproofWebsiteOptionMenuThenFireproofWebsiteBrowserStateUpdated() {
         loadUrl("http://example.com/", isBrowserShowing = true)
-        testee.onFireproofWebsiteClicked()
-        assertFalse(browserViewState().canFireproofSite)
+        testee.onFireproofWebsiteMenuClicked()
+        assertTrue(browserViewState().isFireproofWebsite)
     }
 
     @Test
     fun whenFireproofWebsiteAddedThenPixelSent() {
         loadUrl("http://example.com/", isBrowserShowing = true)
-        testee.onFireproofWebsiteClicked()
+        testee.onFireproofWebsiteMenuClicked()
         verify(mockPixel).fire(Pixel.PixelName.FIREPROOF_WEBSITE_ADDED)
     }
 
+    @Test
+    fun whenUserRemovesFireproofWebsiteFromOptionMenuThenFireproofWebsiteBrowserStateUpdated() {
+        givenFireproofWebsiteDomain("mobile.example.com")
+        loadUrl("http://mobile.example.com/", isBrowserShowing = true)
+        testee.onFireproofWebsiteMenuClicked()
+        assertFalse(browserViewState().isFireproofWebsite)
+    }
+
+    @Test
+    fun whenUserRemovesFireproofWebsiteFromOptionMenuThenPixelSent() {
+        givenFireproofWebsiteDomain("mobile.example.com")
+        loadUrl("http://mobile.example.com/", isBrowserShowing = true)
+        testee.onFireproofWebsiteMenuClicked()
+        verify(mockPixel).fire(Pixel.PixelName.FIREPROOF_WEBSITE_REMOVE)
+    }
+
     @Test
     fun whenUserClicksOnFireproofWebsiteSnackbarUndoActionThenFireproofWebsiteIsRemoved() {
         loadUrl("http://example.com/", isBrowserShowing = true)
-        testee.onFireproofWebsiteClicked()
+        testee.onFireproofWebsiteMenuClicked()
         assertCommandIssued<Command.ShowFireproofWebSiteConfirmation> {
             testee.onFireproofWebsiteSnackbarUndoClicked(this.fireproofWebsiteEntity)
         }
         assertTrue(browserViewState().canFireproofSite)
+        assertFalse(browserViewState().isFireproofWebsite)
     }
 
     @Test
     fun whenUserClicksOnFireproofWebsiteSnackbarUndoActionThenPixelSent() {
         loadUrl("http://example.com/", isBrowserShowing = true)
-        testee.onFireproofWebsiteClicked()
+        testee.onFireproofWebsiteMenuClicked()
         assertCommandIssued<Command.ShowFireproofWebSiteConfirmation> {
             testee.onFireproofWebsiteSnackbarUndoClicked(this.fireproofWebsiteEntity)
         }
         verify(mockPixel).fire(Pixel.PixelName.FIREPROOF_WEBSITE_UNDO)
     }
 
+    @Test
+    fun whenUserFireproofsWebsiteFromLoginDialogThenShowConfirmationIsIssuedWithExpectedDomain() {
+        loadUrl("http://mobile.example.com/", isBrowserShowing = true)
+        testee.onUserConfirmedFireproofDialog("login.example.com")
+        assertCommandIssued<Command.ShowFireproofWebSiteConfirmation> {
+            assertEquals("login.example.com", this.fireproofWebsiteEntity.domain)
+        }
+    }
+
+    @Test
+    fun whenUserFireproofsWebsiteFromLoginDialogThenPixelSent() {
+        testee.onUserConfirmedFireproofDialog("login.example.com")
+        verify(mockPixel).fire(Pixel.PixelName.FIREPROOF_WEBSITE_LOGIN_ADDED)
+    }
+
+    @Test
+    fun whenUserDismissesFireproofWebsiteLoginDialogThenPixelSent() {
+        testee.onUserDismissedFireproofLoginDialog()
+        verify(mockPixel).fire(Pixel.PixelName.FIREPROOF_WEBSITE_LOGIN_DISMISS)
+    }
+
+    @Test
+    fun whenLoginAttempDetectedThenNotifyNavigationAwareLoginDetector() {
+        loadUrl("http://example.com/", isBrowserShowing = true)
+
+        testee.loginDetected()
+
+        verify(mockNavigationAwareLoginDetector).onEvent(LoginAttempt("http://example.com/"))
+    }
+
+    @Test
+    fun whenLoginDetectedOnAFireproofedWebsiteThenDoNotAskToFireproofWebsite() {
+        givenFireproofWebsiteDomain("example.com")
+        loginEventLiveData.value = givenLoginDetected("example.com")
+        assertCommandNotIssued<Command.AskToFireproofWebsite>()
+    }
+
+    @Test
+    fun whenLoginDetectedThenAskToFireproofWebsite() {
+        loginEventLiveData.value = givenLoginDetected("example.com")
+        assertCommandIssued<Command.AskToFireproofWebsite> {
+            assertEquals(FireproofWebsiteEntity("example.com"), this.fireproofWebsite)
+        }
+    }
+
     @Test
     fun whenUserBrowsingPressesBackThenCannotAddBookmark() {
         setupNavigation(skipHome = false, isBrowsing = true, canGoBack = false)
@@ -2041,6 +2102,8 @@ class BrowserTabViewModelTest {
         }
     }
 
+    private fun givenLoginDetected(domain: String) = LoginDetected(authLoginDomain = "", forwardedToDomain = domain)
+
     private fun setBrowserShowing(isBrowsing: Boolean) {
         testee.browserViewState.value = browserViewState().copy(browserShowing = isBrowsing)
     }

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt

@@ -18,22 +18,29 @@ package com.duckduckgo.app.browser
 
 import android.content.Context
 import android.os.Build
-import android.webkit.CookieManager
-import android.webkit.HttpAuthHandler
-import android.webkit.RenderProcessGoneDetail
-import android.webkit.WebView
+import android.webkit.*
 import androidx.test.annotation.UiThreadTest
 import androidx.test.filters.SdkSuppress
 import androidx.test.platform.app.InstrumentationRegistry
+import com.duckduckgo.app.CoroutineTestRule
+import com.duckduckgo.app.browser.logindetection.DOMLoginDetector
+import com.duckduckgo.app.browser.logindetection.WebNavigationEvent
 import com.duckduckgo.app.browser.model.BasicAuthenticationRequest
 import com.duckduckgo.app.global.exception.UncaughtExceptionRepository
+import com.duckduckgo.app.runBlocking
 import com.duckduckgo.app.statistics.store.OfflinePixelCountDataStore
 import com.nhaarman.mockitokotlin2.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 
+@ExperimentalCoroutinesApi
 class BrowserWebViewClientTest {
 
+    @get:Rule
+    var coroutinesTestRule = CoroutineTestRule()
+
     private lateinit var testee: BrowserWebViewClient
     private lateinit var webView: WebView
 
@@ -42,6 +49,7 @@ class BrowserWebViewClientTest {
     private val requestInterceptor: RequestInterceptor = mock()
     private val listener: WebViewClientListener = mock()
     private val cookieManager: CookieManager = mock()
+    private val loginDetector: DOMLoginDetector = mock()
     private val offlinePixelCountDataStore: OfflinePixelCountDataStore = mock()
     private val uncaughtExceptionRepository: UncaughtExceptionRepository = mock()
 
@@ -55,7 +63,8 @@ class BrowserWebViewClientTest {
             requestInterceptor,
             offlinePixelCountDataStore,
             uncaughtExceptionRepository,
-            cookieManager
+            cookieManager,
+            loginDetector
         )
         testee.webViewClientListener = listener
     }
@@ -83,6 +92,13 @@ class BrowserWebViewClientTest {
         verify(listener, never()).pageRefreshed(any())
     }
 
+    @UiThreadTest
+    @Test
+    fun whenOnPageStartedCalledThenEventSentToLoginDetector() = coroutinesTestRule.runBlocking {
+        testee.onPageStarted(webView, EXAMPLE_URL, null)
+        verify(loginDetector).onEvent(WebNavigationEvent.OnPageStarted(webView))
+    }
+
     @UiThreadTest
     @Test
     fun whenOnPageFinishedCalledThenListenerInstructedToUpdateNavigationState() {
@@ -99,6 +115,14 @@ class BrowserWebViewClientTest {
         verify(listener).requiresAuthentication(authenticationRequest)
     }
 
+    @UiThreadTest
+    @Test
+    fun whenShouldInterceptRequestThenEventSentToLoginDetector() = coroutinesTestRule.runBlocking {
+        val webResourceRequest = mock<WebResourceRequest>()
+        testee.shouldInterceptRequest(webView, webResourceRequest)
+        verify(loginDetector).onEvent(WebNavigationEvent.ShouldInterceptRequest(webView, webResourceRequest))
+    }
+
     @Test
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
     fun whenRenderProcessGoneDueToCrashThenCrashDataStoreEntryIsIncremented() {