Merge branch 'release/5.241.0'

Author: github-actions[bot]

.github/workflows/end-to-end-robintest.yml

@@ -52,7 +52,14 @@ jobs:
 
       - name: Move APK to new folder
         if: always()
-        run: find . -name "*.apk"  -exec mv '{}' apk/release.apk \;
+        run: find . -name "*play-release*.apk" -exec mv '{}' apk/release.apk \;
+
+      - name: Assemble internal release APK
+        run: ./gradlew assembleInternalRelease -Pforce-default-variant -Pskip-onboarding
+
+      - name: Move APK to new folder
+        if: always()
+        run: find . -name "*internal-release*.apk" -exec mv '{}' apk/internal.apk \;
 
       - name: Onboarding flows
         uses: mobile-dev-inc/[email protected]
@@ -94,6 +101,20 @@ jobs:
           workspace: .maestro
           include-tags: privacyTest
 
+      - name: Internal Privacy Tests
+        if: always()
+        uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
+        with:
+          api-key: ${{ secrets.ROBIN_API_KEY }}
+          project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
+          name: internalPrivacyTest_${{ github.sha }}
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
+          app-file: apk/internal.apk
+          android-api-level: 34
+          workspace: .maestro
+          include-tags: privacyTestInternal
+
       - name: Security Tests
         if: always()
         uses: mobile-dev-inc/[email protected]

.maestro/browsing/visit_site.yaml

@@ -24,4 +24,4 @@ tags:
           id: "omnibarTextInput"
       - eraseText
       - assertVisible:
-          text: "Search or type URL"
+          text: "Search"

.maestro/privacy_tests_internal/1_-_Api_manipulation.yaml

@@ -0,0 +1,54 @@
+appId: com.duckduckgo.mobile.android
+tags:
+  - privacyTestInternal
+---
+- retry:
+    maxRetries: 3
+    commands:
+      - launchApp:
+          clearState: true
+      - runFlow: ../shared/skip_all_onboarding.yaml
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/browserMenu"
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/settingsMenuItem"
+      - scrollUntilVisible:
+          element:
+            text: "Developer Settings"
+          direction: DOWN
+          timeout: 50000
+          speed: 40
+          visibilityPercentage: 100
+          centerElement: false
+      - tapOn: "Developer Settings"
+      - scrollUntilVisible:
+          element:
+            id: "com.duckduckgo.mobile.android:id/overridePrivacyRemoteConfigUrl"
+          direction: DOWN
+          timeout: 50000
+          speed: 40
+          visibilityPercentage: 100
+          centerElement: true
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/overridePrivacyRemoteConfigUrl"
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/trailingSwitch"
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/internal_edit_text"
+      - inputText: "https://privacy-test-pages.site/content-scope-scripts/infra/config/conditional-matching-experiments.json"
+      - hideKeyboard
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/load"
+      - tapOn: "OK"
+      - pressKey: Back
+      - pressKey: Back
+      - pressKey: Back
+      - assertVisible:
+          id: "com.duckduckgo.mobile.android:id/omnibarTextInput"
+      - inputText: "https://privacy-test-pages.site/content-scope-scripts/infra/pages/conditional-matching-experiments.html?automation=1"
+      - pressKey: Enter
+      - tapOn:
+          id: "run-tests"
+      - assertVisible:
+          id: "test-status"
+          text: "pass"

.maestro/security_tests/5_-_AddressBarSpoof,_downloadpath.yaml

@@ -22,7 +22,7 @@ tags:
             - tapOn: "Save to Downloads"
             - copyTextFrom:
                 id: "omnibarTextInput"
-            - assertTrue: ${maestro.copiedText == "Search or type URL"} # Downloads should occur in empty origin.
+            - assertTrue: ${maestro.copiedText == "Search"} # Downloads should occur in empty origin.
             - pressKey: Back
             # Download Cancel Flow:
             - tapOn: "Start"

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

@@ -216,10 +216,11 @@ import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggesti
 import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggestion.AutoCompleteSearchSuggestion
 import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggestion.AutoCompleteUrlSuggestion.AutoCompleteBookmarkSuggestion
 import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggestion.AutoCompleteUrlSuggestion.AutoCompleteSwitchToTabSuggestion
+import com.duckduckgo.browser.api.autocomplete.AutoCompleteSettings
 import com.duckduckgo.browser.api.brokensite.BrokenSiteContext
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.common.test.InstantSchedulersRule
-import com.duckduckgo.common.ui.experiments.visual.store.VisualDesignExperimentDataStore
+import com.duckduckgo.common.ui.experiments.visual.store.ExperimentalThemingDataStore
 import com.duckduckgo.common.ui.tabs.SwipingTabsFeature
 import com.duckduckgo.common.ui.tabs.SwipingTabsFeatureProvider
 import com.duckduckgo.common.utils.DispatcherProvider
@@ -231,6 +232,7 @@ import com.duckduckgo.daxprompts.impl.ReactivateUsersExperiment
 import com.duckduckgo.downloads.api.DownloadStateListener
 import com.duckduckgo.downloads.api.FileDownloader
 import com.duckduckgo.downloads.api.FileDownloader.PendingFileDownload
+import com.duckduckgo.duckchat.api.DuckAiFeatureState
 import com.duckduckgo.duckchat.api.DuckChat
 import com.duckduckgo.duckchat.impl.helper.DuckChatJSHelper
 import com.duckduckgo.duckchat.impl.helper.RealDuckChatJSHelper.Companion.DUCK_CHAT_FEATURE_NAME
@@ -431,6 +433,8 @@ class BrowserTabViewModelTest {
 
     private val mockSettingsDataStore: SettingsDataStore = mock()
 
+    private val mockAutoCompleteSettings: AutoCompleteSettings = mock()
+
     private val mockAdClickManager: AdClickManager = mock()
 
     private val mockUserAllowListRepository: UserAllowListRepository = mock()
@@ -443,6 +447,8 @@ class BrowserTabViewModelTest {
 
     private val mockDuckChat: DuckChat = mock()
 
+    private val mockDuckAiFeatureState: DuckAiFeatureState = mock()
+
     private val mockAppBuildConfig: AppBuildConfig = mock()
 
     private val mockDuckDuckGoUrlDetector: DuckDuckGoUrlDetector = mock()
@@ -551,7 +557,7 @@ class BrowserTabViewModelTest {
     private val mockDefaultBrowserPromptsExperiment: DefaultBrowserPromptsExperiment = mock()
     val mockStack: WebBackForwardList = mock()
 
-    private val mockVisualDesignExperimentDataStore: VisualDesignExperimentDataStore = mock()
+    private val mockExperimentalThemingDataStore: ExperimentalThemingDataStore = mock()
     private val defaultVisualExperimentStateFlow = MutableStateFlow(false)
 
     private val mockSiteErrorHandlerKillSwitch: SiteErrorHandlerKillSwitch = mock()
@@ -643,8 +649,8 @@ class BrowserTabViewModelTest {
         whenever(mockSitePermissionsManager.hasSitePermanentPermission(any(), any())).thenReturn(false)
         whenever(mockToggleReports.shouldPrompt()).thenReturn(false)
         whenever(subscriptions.isEligible()).thenReturn(false)
-        whenever(mockDuckChat.showInBrowserMenu).thenReturn(MutableStateFlow(false))
-        whenever(mockDuckChat.showInputScreen).thenReturn(MutableStateFlow(false))
+        whenever(mockDuckAiFeatureState.showPopupMenuShortcut).thenReturn(MutableStateFlow(false))
+        whenever(mockDuckAiFeatureState.showInputScreen).thenReturn(MutableStateFlow(false))
 
         remoteMessagingModel = givenRemoteMessagingModel(mockRemoteMessagingRepository, mockPixel, coroutineRule.testDispatcherProvider)
 
@@ -703,9 +709,6 @@ class BrowserTabViewModelTest {
         whenever(mockDefaultBrowserPromptsExperiment.showSetAsDefaultPopupMenuItem).thenReturn(
             defaultBrowserPromptsExperimentShowPopupMenuItemFlow,
         )
-        whenever(mockVisualDesignExperimentDataStore.isExperimentEnabled).thenReturn(
-            defaultVisualExperimentStateFlow,
-        )
 
         whenever(mockSiteErrorHandlerKillSwitch.self()).thenReturn(mockSiteErrorHandlerKillSwitchToggle)
 
@@ -764,6 +767,7 @@ class BrowserTabViewModelTest {
             httpErrorPixels = { mockHttpErrorPixels },
             duckPlayer = mockDuckPlayer,
             duckChat = mockDuckChat,
+            duckAiFeatureState = mockDuckAiFeatureState,
             duckPlayerJSHelper = DuckPlayerJSHelper(
                 mockDuckPlayer,
                 mockAppBuildConfig,
@@ -783,7 +787,7 @@ class BrowserTabViewModelTest {
             tabStatsBucketing = mockTabStatsBucketing,
             defaultBrowserPromptsExperiment = mockDefaultBrowserPromptsExperiment,
             swipingTabsFeature = swipingTabsFeatureProvider,
-            visualDesignExperimentDataStore = mockVisualDesignExperimentDataStore,
+            experimentalThemingDataStore = mockExperimentalThemingDataStore,
             siteErrorHandlerKillSwitch = mockSiteErrorHandlerKillSwitch,
             siteErrorHandler = mockSiteErrorHandler,
             siteHttpErrorHandler = mockSiteHttpErrorHandler,
@@ -792,6 +796,7 @@ class BrowserTabViewModelTest {
             onboardingDesignExperimentToggles = fakeOnboardingDesignExperimentToggles,
             tabManager = tabManager,
             addressDisplayFormatter = mockAddressDisplayFormatter,
+            autoCompleteSettings = mockAutoCompleteSettings,
         )
 
         testee.loadData("abc", null, false, false)
@@ -875,7 +880,7 @@ class BrowserTabViewModelTest {
     fun whenViewBecomesVisibleAndDuckAIPoCIsEnabledThenKeyboardNotShown() = runTest {
         whenever(mockExtendedOnboardingFeatureToggles.noBrowserCtas()).thenReturn(mockDisabledToggle)
         whenever(mockWidgetCapabilities.hasInstalledWidgets).thenReturn(true)
-        whenever(mockDuckChat.showInputScreen).thenReturn(MutableStateFlow(true))
+        whenever(mockDuckAiFeatureState.showInputScreen).thenReturn(MutableStateFlow(true))
 
         testee.onViewVisible()
 
@@ -921,15 +926,15 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenViewBecomesVisibleAndDuckChatDisabledThenDuckChatNotVisible() {
-        whenever(mockDuckChat.showInBrowserMenu).thenReturn(MutableStateFlow(false))
+        whenever(mockDuckAiFeatureState.showPopupMenuShortcut).thenReturn(MutableStateFlow(false))
         setBrowserShowing(true)
         testee.onViewVisible()
         assertFalse(browserViewState().showDuckChatOption)
     }
 
     @Test
     fun whenViewBecomesVisibleAndDuckChatEnabledThenDuckChatIsVisible() {
-        whenever(mockDuckChat.showInBrowserMenu).thenReturn(MutableStateFlow(true))
+        whenever(mockDuckAiFeatureState.showPopupMenuShortcut).thenReturn(MutableStateFlow(true))
         setBrowserShowing(true)
         testee.onViewVisible()
         assertTrue(browserViewState().showDuckChatOption)
@@ -1528,14 +1533,14 @@ class BrowserTabViewModelTest {
     @Test
     fun whenTriggeringAutocompleteThenAutoCompleteSuggestionsShown() = runTest {
         whenever(mockAutoCompleteService.autoComplete("foo")).thenReturn(emptyList())
-        doReturn(true).whenever(ctaViewModelMockSettingsStore).autoCompleteSuggestionsEnabled
+        doReturn(true).whenever(mockAutoCompleteSettings).autoCompleteSuggestionsEnabled
         testee.triggerAutocomplete("foo", true, hasQueryChanged = true)
         assertTrue(autoCompleteViewState().showSuggestions)
     }
 
     @Test
     fun whenTriggeringAutoCompleteButNoQueryChangeThenAutoCompleteSuggestionsNotShown() {
-        doReturn(true).whenever(ctaViewModelMockSettingsStore).autoCompleteSuggestionsEnabled
+        doReturn(true).whenever(mockAutoCompleteSettings).autoCompleteSuggestionsEnabled
         testee.triggerAutocomplete("foo", true, hasQueryChanged = false)
         assertFalse(autoCompleteViewState().showSuggestions)
     }
@@ -1556,7 +1561,7 @@ class BrowserTabViewModelTest {
                     ),
                 ),
             )
-        doReturn(true).whenever(ctaViewModelMockSettingsStore).autoCompleteSuggestionsEnabled
+        doReturn(true).whenever(mockAutoCompleteSettings).autoCompleteSuggestionsEnabled
         testee.triggerAutocomplete("https://example.com", true, hasQueryChanged = false)
         assertFalse(autoCompleteViewState().showSuggestions)
         assertTrue(autoCompleteViewState().showFavorites)
@@ -1578,7 +1583,7 @@ class BrowserTabViewModelTest {
             whenever(mockTabRepository.flowTabs).thenReturn(
                 flowOf(listOf(TabEntity(tabId = "1", position = 1, url = "https://example.com", title = "title"))),
             )
-            doReturn(true).whenever(ctaViewModelMockSettingsStore).autoCompleteSuggestionsEnabled
+            doReturn(true).whenever(mockAutoCompleteSettings).autoCompleteSuggestionsEnabled
 
             whenever(mockAutoCompleteRepository.wasHistoryInAutoCompleteIAMDismissed()).thenReturn(false)
             whenever(mockAutoCompleteRepository.countHistoryInAutoCompleteIAMShown()).thenReturn(0)
@@ -1604,7 +1609,7 @@ class BrowserTabViewModelTest {
                 flowOf(listOf(Favorite("abc", "title", "https://example.com", position = 1, lastModified = null))),
             )
             whenever(mockNavigationHistory.getHistory()).thenReturn(flowOf(emptyList()))
-            doReturn(true).whenever(ctaViewModelMockSettingsStore).autoCompleteSuggestionsEnabled
+            doReturn(true).whenever(mockAutoCompleteSettings).autoCompleteSuggestionsEnabled
             testee.autoCompleteStateFlow.value = "query"
             testee.autoCompleteSuggestionsGone()
             verify(mockAutoCompleteRepository, never()).submitUserSeenHistoryIAM()

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

@@ -73,6 +73,7 @@ import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.common.utils.CurrentTimeProvider
 import com.duckduckgo.common.utils.device.DeviceInfo
 import com.duckduckgo.common.utils.plugins.PluginPoint
+import com.duckduckgo.contentscopescripts.api.contentscopeExperiments.ContentScopeExperiments
 import com.duckduckgo.cookies.api.CookieManagerProvider
 import com.duckduckgo.duckchat.api.DuckChat
 import com.duckduckgo.duckplayer.api.DuckPlayer
@@ -81,6 +82,7 @@ import com.duckduckgo.duckplayer.api.DuckPlayer.OpenDuckPlayerInNewTab
 import com.duckduckgo.duckplayer.api.DuckPlayer.OpenDuckPlayerInNewTab.Off
 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.privacy.config.api.AmpLinks
 import com.duckduckgo.subscriptions.api.Subscriptions
@@ -164,6 +166,7 @@ class BrowserWebViewClientTest {
         mock(),
     )
     private val mockDuckChat: DuckChat = mock()
+    private val mockContentScopeExperiments: ContentScopeExperiments = mock()
 
     @UiThreadTest
     @Before
@@ -202,6 +205,7 @@ class BrowserWebViewClientTest {
             mockUriLoadedManager,
             mockAndroidFeaturesHeaderPlugin,
             mockDuckChat,
+            mockContentScopeExperiments,
         )
         testee.webViewClientListener = listener
         whenever(webResourceRequest.url).thenReturn(Uri.EMPTY)
@@ -221,8 +225,11 @@ class BrowserWebViewClientTest {
     @UiThreadTest
     @Test
     fun whenOnPageStartedCalledThenListenerNotified() {
+        val toggle: Toggle = mock()
+        whenever(mockContentScopeExperiments.getActiveExperiments()).thenReturn(listOf(toggle))
+
         testee.onPageStarted(webView, EXAMPLE_URL, null)
-        verify(listener).pageStarted(any())
+        verify(listener).pageStarted(any(), eq(listOf(toggle)))
     }
 
     @UiThreadTest
@@ -1185,7 +1192,12 @@ class BrowserWebViewClientTest {
         var countFinished = 0
         var countStarted = 0
 
-        override fun onPageStarted(webView: WebView, url: String?, site: Site?) {
+        override fun onPageStarted(
+            webView: WebView,
+            url: String?,
+            isDesktopMode: Boolean?,
+            activeExperiments: List<Toggle>,
+        ) {
             countStarted++
         }