Merge branch 'release/5.248.0'

Author: github-actions[bot]

.maestro/tabs/open_multiple_tabs.yaml

@@ -17,6 +17,8 @@ tags:
             - inputText: "https://privacy-test-pages.site"
             - pressKey: Enter
             - runFlow: ../shared/browser_screen/click_on_tabs_button.yaml
+            - assertVisible:
+                text: "0 trackers blocked in the last 7 days"
             - assertVisible:
                 text: "Privacy Test Pages - Home"
             - tapOn: "New Tab"

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

@@ -84,6 +84,11 @@ import com.duckduckgo.duckplayer.api.DuckPlayer.OpenDuckPlayerInNewTab.On
 import com.duckduckgo.duckplayer.api.DuckPlayer.OpenDuckPlayerInNewTab.Unavailable
 import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.history.api.NavigationHistory
+import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScriptPlugin
+import com.duckduckgo.js.messaging.api.PostMessageWrapperPlugin
+import com.duckduckgo.js.messaging.api.SubscriptionEventData
+import com.duckduckgo.js.messaging.api.WebMessagingPlugin
+import com.duckduckgo.js.messaging.api.WebViewCompatMessageCallback
 import com.duckduckgo.privacy.config.api.AmpLinks
 import com.duckduckgo.subscriptions.api.Subscriptions
 import com.duckduckgo.user.agent.api.ClientBrandHintProvider
@@ -97,6 +102,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
+import org.json.JSONObject
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -112,6 +118,8 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 
+private val mockToggle: Toggle = mock()
+
 class BrowserWebViewClientTest {
 
     @get:Rule
@@ -158,6 +166,10 @@ class BrowserWebViewClientTest {
     private val openInNewTabFlow: MutableSharedFlow<OpenDuckPlayerInNewTab> = MutableSharedFlow()
     private val mockUriLoadedManager: UriLoadedManager = mock()
     private val mockAndroidBrowserConfigFeature: AndroidBrowserConfigFeature = mock()
+    private val mockContentScopeExperiments: ContentScopeExperiments = mock()
+    private val fakeAddDocumentStartJavaScriptPlugins = FakeAddDocumentStartJavaScriptPluginPoint()
+    private val fakeMessagingPlugins = FakeWebMessagingPluginPoint()
+    private val fakePostMessageWrapperPlugins = FakePostMessageWrapperPluginPoint()
     private val mockAndroidFeaturesHeaderPlugin = AndroidFeaturesHeaderPlugin(
         mockDuckDuckGoUrlDetector,
         mockCustomHeaderGracePeriodChecker,
@@ -166,15 +178,13 @@ class BrowserWebViewClientTest {
         mock(),
     )
     private val mockDuckChat: DuckChat = mock()
-    private val mockContentScopeExperiments: ContentScopeExperiments = mock()
 
     @UiThreadTest
     @Before
     fun setup() = runTest {
         webView = TestWebView(context)
         whenever(mockDuckPlayer.observeShouldOpenInNewTab()).thenReturn(openInNewTabFlow)
-        val toggle: Toggle = mock()
-        whenever(mockContentScopeExperiments.getActiveExperiments()).thenReturn(listOf(toggle))
+        whenever(mockContentScopeExperiments.getActiveExperiments()).thenReturn(listOf(mockToggle))
         testee = BrowserWebViewClient(
             webViewHttpAuthStore,
             trustedCertificateStore,
@@ -208,6 +218,9 @@ class BrowserWebViewClientTest {
             mockAndroidFeaturesHeaderPlugin,
             mockDuckChat,
             mockContentScopeExperiments,
+            fakeAddDocumentStartJavaScriptPlugins,
+            fakeMessagingPlugins,
+            fakePostMessageWrapperPlugins,
         )
         testee.webViewClientListener = listener
         whenever(webResourceRequest.url).thenReturn(Uri.EMPTY)
@@ -227,11 +240,8 @@ class BrowserWebViewClientTest {
     @UiThreadTest
     @Test
     fun whenOnPageStartedCalledThenListenerNotified() = runTest {
-        val toggle: Toggle = mock()
-        whenever(mockContentScopeExperiments.getActiveExperiments()).thenReturn(listOf(toggle))
-
         testee.onPageStarted(webView, EXAMPLE_URL, null)
-        verify(listener).pageStarted(any(), eq(listOf(toggle)))
+        verify(listener).pageStarted(any(), eq(listOf(mockToggle)))
     }
 
     @UiThreadTest
@@ -333,6 +343,55 @@ class BrowserWebViewClientTest {
         assertEquals(0, jsPlugins.plugin.countStarted)
     }
 
+    @UiThreadTest
+    @Test
+    fun whenOnPageStartedThenReturnActiveExperiments() {
+        val captor = argumentCaptor<List<Toggle>>()
+        testee.onPageStarted(webView, EXAMPLE_URL, null)
+        verify(listener).pageStarted(any(), captor.capture())
+        assertTrue(captor.firstValue.contains(mockToggle))
+    }
+
+    @UiThreadTest
+    @Test
+    fun whenConfigureWebViewThenInjectJsCode() {
+        assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.plugin.countInitted)
+        val mockCallback = mock<WebViewCompatMessageCallback>()
+        testee.configureWebView(DuckDuckGoWebView(context), mockCallback)
+        assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.plugin.countInitted)
+    }
+
+    @UiThreadTest
+    @Test
+    fun whenConfigureWebViewThenAddWebMessageListener() {
+        assertFalse(fakeMessagingPlugins.plugin.registered)
+        val mockCallback = mock<WebViewCompatMessageCallback>()
+        testee.configureWebView(DuckDuckGoWebView(context), mockCallback)
+        assertTrue(fakeMessagingPlugins.plugin.registered)
+    }
+
+    @UiThreadTest
+    @Test
+    fun whenDestroyThenRemoveWebMessageListener() = runTest {
+        val mockCallback = mock<WebViewCompatMessageCallback>()
+        val webView = DuckDuckGoWebView(context)
+        testee.configureWebView(webView, mockCallback)
+        assertTrue(fakeMessagingPlugins.plugin.registered)
+        testee.destroy(webView)
+        assertFalse(fakeMessagingPlugins.plugin.registered)
+    }
+
+    @Test
+    fun whenPostMessageThenCallPostContentScopeMessage() = runTest {
+        val data = SubscriptionEventData("feature", "method", JSONObject())
+
+        assertFalse(fakePostMessageWrapperPlugins.plugin.postMessageCalled)
+
+        testee.postContentScopeMessage(data)
+
+        assertTrue(fakePostMessageWrapperPlugins.plugin.postMessageCalled)
+    }
+
     @UiThreadTest
     @Test
     fun whenOnReceivedHttpAuthRequestThenListenerNotified() {
@@ -1203,7 +1262,11 @@ class BrowserWebViewClientTest {
             countStarted++
         }
 
-        override fun onPageFinished(webView: WebView, url: String?, site: Site?) {
+        override fun onPageFinished(
+            webView: WebView,
+            url: String?,
+            site: Site?,
+        ) {
             countFinished++
         }
     }
@@ -1266,4 +1329,73 @@ class BrowserWebViewClientTest {
     companion object {
         const val EXAMPLE_URL = "https://example.com"
     }
+
+    class FakeAddDocumentStartJavaScriptPlugin : AddDocumentStartJavaScriptPlugin {
+
+        var countInitted = 0
+            private set
+
+        override fun addDocumentStartJavaScript(
+            webView: WebView,
+        ) {
+            countInitted++
+        }
+    }
+
+    class FakeAddDocumentStartJavaScriptPluginPoint : PluginPoint<AddDocumentStartJavaScriptPlugin> {
+
+        val plugin = FakeAddDocumentStartJavaScriptPlugin()
+
+        override fun getPlugins() = listOf(plugin)
+    }
+
+    class FakeWebMessagingPlugin : WebMessagingPlugin {
+        var registered = false
+            private set
+
+        override fun unregister(webView: WebView) {
+            registered = false
+        }
+
+        override fun register(
+            jsMessageCallback: WebViewCompatMessageCallback,
+            webView: WebView,
+        ) {
+            registered = true
+        }
+
+        override fun postMessage(subscriptionEventData: SubscriptionEventData) {
+        }
+
+        override val context: String
+            get() = "test"
+    }
+
+    class FakeWebMessagingPluginPoint : PluginPoint<WebMessagingPlugin> {
+        val plugin = FakeWebMessagingPlugin()
+
+        override fun getPlugins(): Collection<WebMessagingPlugin> {
+            return listOf(plugin)
+        }
+    }
+
+    class FakePostMessageWrapperPlugin : PostMessageWrapperPlugin {
+        var postMessageCalled = false
+            private set
+
+        override fun postMessage(message: SubscriptionEventData) {
+            postMessageCalled = true
+        }
+
+        override val context: String
+            get() = "contentScopeScripts"
+    }
+
+    class FakePostMessageWrapperPluginPoint : PluginPoint<PostMessageWrapperPlugin> {
+        val plugin = FakePostMessageWrapperPlugin()
+
+        override fun getPlugins(): Collection<PostMessageWrapperPlugin> {
+            return listOf(plugin)
+        }
+    }
 }

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

@@ -17,17 +17,28 @@
 package com.duckduckgo.app.browser
 
 import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertFalse
+import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
 
+@RunWith(AndroidJUnit4::class)
 class DuckDuckGoWebViewTest {
 
+    private lateinit var testee: DuckDuckGoWebView
+
+    @Before
+    @UiThreadTest
+    fun setUp() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        testee = DuckDuckGoWebView(context)
+    }
+
     @Test
     @UiThreadTest
     fun whenWebViewInitialisedThenSafeBrowsingDisabled() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        val testee = DuckDuckGoWebView(context)
         assertFalse(testee.settings.safeBrowsingEnabled)
     }
 }

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

@@ -26,7 +26,6 @@ import androidx.test.platform.app.InstrumentationRegistry
 import com.duckduckgo.app.browser.DuckDuckGoUrlDetectorImpl
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.defaultbrowsing.prompts.ui.experiment.OnboardingHomeScreenWidgetExperiment
-import com.duckduckgo.app.browser.senseofprotection.SenseOfProtectionExperiment
 import com.duckduckgo.app.cta.db.DismissedCtaDao
 import com.duckduckgo.app.cta.model.CtaId
 import com.duckduckgo.app.cta.model.DismissedCta
@@ -122,7 +121,6 @@ class CtaViewModelTest {
 
     private val mockBrokenSitePrompt: BrokenSitePrompt = mock()
 
-    private val mockSenseOfProtectionExperiment: SenseOfProtectionExperiment = mock()
     private val mockOnboardingHomeScreenWidgetExperiment: OnboardingHomeScreenWidgetExperiment = mock()
 
     private val mockOnboardingDesignExperimentManager: OnboardingDesignExperimentManager = mock()
@@ -185,7 +183,6 @@ class CtaViewModelTest {
             subscriptions = mockSubscriptions,
             duckPlayer = mockDuckPlayer,
             brokenSitePrompt = mockBrokenSitePrompt,
-            senseOfProtectionExperiment = mockSenseOfProtectionExperiment,
             onboardingHomeScreenWidgetExperiment = mockOnboardingHomeScreenWidgetExperiment,
             onboardingDesignExperimentManager = mockOnboardingDesignExperimentManager,
             rebrandingFeatureToggle = mockRebrandingFeatureToggle,

app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt

@@ -52,13 +52,13 @@ class SearchAndFavoritesGridCalculatorKtTest {
                 return arrayOf(
                     TestCase(2, 100),
                     TestCase(2, 144),
-                    TestCase(3, 212),
+                    TestCase(2, 212),
                     TestCase(3, 279),
-                    TestCase(4, 280),
-                    TestCase(5, 348),
-                    TestCase(6, 416),
-                    TestCase(7, 484),
-                    TestCase(8, 552),
+                    TestCase(3, 280),
+                    TestCase(4, 348),
+                    TestCase(4, 416),
+                    TestCase(4, 484),
+                    TestCase(4, 552),
                 )
             }
         }
@@ -90,10 +90,10 @@ class SearchAndFavoritesGridCalculatorKtTest {
                 return arrayOf(
                     TestCase(1, 100),
                     TestCase(1, 172),
-                    TestCase(2, 270),
-                    TestCase(3, 368),
+                    TestCase(1, 270),
+                    TestCase(2, 368),
                     TestCase(3, 465),
-                    TestCase(4, 466),
+                    TestCase(3, 466),
                     TestCase(4, 564),
                     TestCase(4, 662),
                     TestCase(4, 760),

app/src/androidTest/java/com/duckduckgo/widget/SearchAndFavoritesGridCalculatorKtTest.kt

@@ -105,7 +105,6 @@ class DevSettingsActivity : DuckDuckGoActivity() {
         binding.customTabs.setOnClickListener { viewModel.customTabsClicked() }
         binding.notifications.setOnClickListener { viewModel.notificationsClicked() }
         binding.tabs.setOnClickListener { viewModel.tabsClicked() }
-        binding.showTabSwitcherAnimatedTile.setOnClickListener { viewModel.showAnimatedTileClicked() }
     }
 
     private fun observeViewModel() {

app/src/internal/java/com/duckduckgo/app/dev/settings/DevSettingsActivity.kt

@@ -22,8 +22,6 @@ import com.duckduckgo.anvil.annotations.ContributesViewModel
 import com.duckduckgo.app.dev.settings.db.DevSettingsDataStore
 import com.duckduckgo.app.dev.settings.db.UAOverride
 import com.duckduckgo.app.survey.api.SurveyEndpointDataStore
-import com.duckduckgo.app.tabs.store.TabSwitcherPrefsDataStore
-import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.traces.api.StartupTraces
 import com.duckduckgo.user.agent.api.UserAgentProvider
@@ -43,9 +41,7 @@ class DevSettingsViewModel @Inject constructor(
     private val devSettingsDataStore: DevSettingsDataStore,
     private val startupTraces: StartupTraces,
     private val userAgentProvider: UserAgentProvider,
-    private val dispatcherProvider: DispatcherProvider,
     private val surveyEndpointDataStore: SurveyEndpointDataStore,
-    private val tabSwitcherPrefsDataStore: TabSwitcherPrefsDataStore,
 ) : ViewModel() {
 
     data class ViewState(
@@ -141,11 +137,4 @@ class DevSettingsViewModel @Inject constructor(
     fun tabsClicked() {
         viewModelScope.launch { command.send(Command.Tabs) }
     }
-
-    fun showAnimatedTileClicked() {
-        viewModelScope.launch {
-            tabSwitcherPrefsDataStore.setIsAnimationTileDismissed(isDismissed = false)
-            command.send(Command.Toast("Animated tile dismissal has been reset"))
-        }
-    }
 }