Merge branch 'release/5.250.0'

Author: github-actions[bot]

.maestro/duckplayer/common/load_youtube_video.yaml

@@ -7,4 +7,4 @@ appId: com.duckduckgo.mobile.android
 - pressKey: Enter
 - runFlow: handle_youtube_cookies.yaml
 - tapOn:
-      text: "DuckDuckGo vs Google: 5 Reasons You Should Switch.*"
+      text: "DuckDuckGo vs Google.*"

anrs/anrs-internal/build.gradle

@@ -31,7 +31,7 @@ dependencies {
     anvil project(':anvil-compiler')
     implementation project(':anvil-annotations')
     implementation project(':di')
-    implementation project(':common-ui')
+    implementation project(':design-system')
     implementation project(':common-utils')
     implementation project(':navigation-api')
     implementation project(':statistics-api')

app-tracking-protection/vpn-impl/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     implementation project(':browser-api')
     implementation project(':di')
     implementation project(':common-utils')
-    implementation project(':common-ui')
+    implementation project(':design-system')
     implementation project(':statistics-api')
     implementation project(':app-build-config-api')
     implementation project(':feature-toggles-api')

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/service/TrackerBlockingVpnService.kt

@@ -710,12 +710,17 @@ class TrackerBlockingVpnService : VpnService(), CoroutineScope by MainScope(), V
             }
         }
 
-        ServiceCompat.startForeground(
-            this,
-            VPN_FOREGROUND_SERVICE_ID,
-            VpnEnabledNotificationBuilder.buildVpnEnabledNotification(applicationContext, vpnNotification),
-            FOREGROUND_SERVICE_TYPE_SPECIAL_USE,
-        )
+        try {
+            ServiceCompat.startForeground(
+                this,
+                VPN_FOREGROUND_SERVICE_ID,
+                VpnEnabledNotificationBuilder.buildVpnEnabledNotification(applicationContext, vpnNotification),
+                FOREGROUND_SERVICE_TYPE_SPECIAL_USE,
+            )
+        } catch (_: Throwable) {
+            // signal the error
+            return false
+        }
 
         return vpnNotification != emptyNotification
     }

app-tracking-protection/vpn-impl/src/main/res/values/donottranslate.xml

@@ -39,5 +39,6 @@
 
     <!-- New Tab -->
     <string name="vpn_NewTabSectionSettingsTitle">App Tracking Protection Status</string>
+    <string name="vpnMenuTitle">VPN</string>
 
 </resources>

app-tracking-protection/vpn-internal/build.gradle

@@ -43,7 +43,7 @@ dependencies {
     implementation project(':app-tracking-api')
     implementation project(':di')
     implementation project(':common-utils')
-    implementation project(':common-ui')
+    implementation project(':design-system')
     implementation project(':app-build-config-api')
     implementation project(':feature-toggles-api')
     implementation project(':internal-features-api')

app/build.gradle

@@ -264,8 +264,7 @@ dependencies {
     implementation project(':experiments-impl')
     implementation project(':common-utils')
     implementation project(':app-store')
-    implementation project(':common-ui')
-    internalImplementation project(':common-ui-internal')
+    implementation project(':design-system')
     implementation project(':di')
     implementation project(':app-tracking-api')
     implementation project(':vpn-impl')

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

@@ -26,7 +26,6 @@ import android.net.http.SslError
 import android.os.Build
 import android.print.PrintAttributes
 import android.view.MenuItem
-import android.view.MotionEvent
 import android.view.View
 import android.webkit.HttpAuthHandler
 import android.webkit.PermissionRequest
@@ -107,6 +106,7 @@ import com.duckduckgo.app.browser.logindetection.LoginDetected
 import com.duckduckgo.app.browser.logindetection.NavigationAwareLoginDetector
 import com.duckduckgo.app.browser.logindetection.NavigationEvent
 import com.duckduckgo.app.browser.logindetection.NavigationEvent.LoginAttempt
+import com.duckduckgo.app.browser.menu.VpnMenuStateProvider
 import com.duckduckgo.app.browser.model.BasicAuthenticationCredentials
 import com.duckduckgo.app.browser.model.BasicAuthenticationRequest
 import com.duckduckgo.app.browser.model.LongPressTarget
@@ -128,6 +128,7 @@ import com.duckduckgo.app.browser.viewstate.FindInPageViewState
 import com.duckduckgo.app.browser.viewstate.GlobalLayoutViewState
 import com.duckduckgo.app.browser.viewstate.HighlightableButton
 import com.duckduckgo.app.browser.viewstate.LoadingViewState
+import com.duckduckgo.app.browser.viewstate.VpnMenuState
 import com.duckduckgo.app.browser.webview.MaliciousSiteBlockedWarningLayout.Action.LearnMore
 import com.duckduckgo.app.browser.webview.MaliciousSiteBlockedWarningLayout.Action.LeaveSite
 import com.duckduckgo.app.browser.webview.MaliciousSiteBlockedWarningLayout.Action.ReportError
@@ -450,6 +451,8 @@ class BrowserTabViewModelTest {
 
     private val mockExternalIntentProcessingState: ExternalIntentProcessingState = mock()
 
+    private val mockVpnMenuStateProvider: VpnMenuStateProvider = mock()
+
     private val mockHasPendingTabLaunchFlow = MutableStateFlow(false)
 
     private val mockHasPendingDuckAiOpenFlow = MutableStateFlow(false)
@@ -660,6 +663,7 @@ class BrowserTabViewModelTest {
         whenever(mockDuckAiFeatureState.showInputScreenAutomaticallyOnNewTab).thenReturn(mockDuckAiFeatureStateInputScreenOpenAutomaticallyFlow)
         whenever(mockExternalIntentProcessingState.hasPendingTabLaunch).thenReturn(mockHasPendingTabLaunchFlow)
         whenever(mockExternalIntentProcessingState.hasPendingDuckAiOpen).thenReturn(mockHasPendingDuckAiOpenFlow)
+        whenever(mockVpnMenuStateProvider.getVpnMenuState()).thenReturn(flowOf(VpnMenuState.Hidden))
         whenever(mockOnboardingDesignExperimentManager.isModifiedControlEnrolledAndEnabled()).thenReturn(false)
         whenever(mockOnboardingDesignExperimentManager.isBuckEnrolledAndEnabled()).thenReturn(false)
         whenever(mockOnboardingDesignExperimentManager.isBbEnrolledAndEnabled()).thenReturn(false)
@@ -810,6 +814,7 @@ class BrowserTabViewModelTest {
             serpEasterEggLogosToggles = mockSerpEasterEggLogoToggles,
             nonHttpAppLinkChecker = nonHttpAppLinkChecker,
             externalIntentProcessingState = mockExternalIntentProcessingState,
+            vpnMenuStateProvider = mockVpnMenuStateProvider,
         )
 
         testee.loadData("abc", null, false, false)
@@ -5610,110 +5615,6 @@ class BrowserTabViewModelTest {
         verify(mockPixel).fire(AppPixelName.TAB_MANAGER_CLICKED_DAILY, params, emptyMap(), Daily())
     }
 
-    @Test
-    fun whenOnUserTouchedOmnibarTextInputWithEmptyTextAndActionUpThenPixelFired() {
-        testee.onUserTouchedOmnibarTextInput(MotionEvent.ACTION_UP)
-
-        verify(mockPixel).fire(AppPixelName.ADDRESS_BAR_NEW_TAB_PAGE_CLICKED)
-    }
-
-    @Test
-    fun whenOnUserTouchedOmnibarTextInputWithUrlAndActionUpThenPixelFired() {
-        loadUrl("https://example.com")
-        testee.onUserTouchedOmnibarTextInput(MotionEvent.ACTION_UP)
-
-        verify(mockPixel).fire(AppPixelName.ADDRESS_BAR_WEBSITE_CLICKED)
-    }
-
-    @Test
-    fun whenOnUserTouchedOmnibarTextInputWithQueryAndActionUpThenPixelFired() {
-        loadUrl("https://duckduckgo.com/?q=example")
-        testee.onUserTouchedOmnibarTextInput(MotionEvent.ACTION_UP)
-
-        verify(mockPixel).fire(AppPixelName.ADDRESS_BAR_SERP_CLICKED)
-    }
-
-    @Test
-    fun whenOnUserTouchedOmnibarTextInputWithAnyTextAndOtherActionThenPixelNotFired() {
-        loadUrl("https://duckduckgo.com/?q=example")
-        testee.onUserTouchedOmnibarTextInput(MotionEvent.ACTION_DOWN)
-
-        verify(mockPixel, never()).fire(AppPixelName.ADDRESS_BAR_NEW_TAB_PAGE_CLICKED)
-        verify(mockPixel, never()).fire(AppPixelName.ADDRESS_BAR_WEBSITE_CLICKED)
-        verify(mockPixel, never()).fire(AppPixelName.ADDRESS_BAR_SERP_CLICKED)
-    }
-
-    @Test
-    fun whenOnClearOmnibarTextInputWithEmptyTextThenPixelFired() {
-        testee.onClearOmnibarTextInput()
-
-        verify(mockPixel).fire(AppPixelName.ADDRESS_BAR_NEW_TAB_PAGE_ENTRY_CLEARED)
-    }
-
-    @Test
-    fun whenOnClearOmnibarTextInputWithUrlThenPixelFired() {
-        loadUrl("https://example.com")
-        testee.onClearOmnibarTextInput()
-
-        verify(mockPixel).fire(AppPixelName.ADDRESS_BAR_WEBSITE_ENTRY_CLEARED)
-    }
-
-    @Test
-    fun whenOnClearOmnibarTextInputWithQueryUrlThenPixelFired() {
-        loadUrl("https://duckduckgo.com/?q=example")
-        testee.onClearOmnibarTextInput()
-
-        verify(mockPixel).fire(AppPixelName.ADDRESS_BAR_SERP_ENTRY_CLEARED)
-    }
-
-    @Test
-    fun whenSendPixelsOnBackKeyPressedWithEmptyTextThenPixelFired() {
-        testee.sendPixelsOnBackKeyPressed()
-
-        verify(mockPixel).fire(AppPixelName.ADDRESS_BAR_NEW_TAB_PAGE_CANCELLED)
-    }
-
-    @Test
-    fun whenSendPixelsOnBackKeyPressedWithUrlThenPixelFired() {
-        loadUrl("https://example.com")
-        testee.sendPixelsOnBackKeyPressed()
-
-        verify(mockPixel).fire(AppPixelName.ADDRESS_BAR_WEBSITE_CANCELLED)
-    }
-
-    @Test
-    fun whenSendPixelsOnBackKeyPressedWithQueryUrlThenPixelFired() {
-        loadUrl("https://duckduckgo.com/?q=example")
-
-        testee.sendPixelsOnBackKeyPressed()
-
-        verify(mockPixel).fire(AppPixelName.ADDRESS_BAR_SERP_CANCELLED)
-    }
-
-    @Test
-    fun whenSendPixelsOnEnterKeyPressedWithEmptyTextThenPixelFired() {
-        testee.sendPixelsOnEnterKeyPressed()
-
-        verify(mockPixel).fire(AppPixelName.KEYBOARD_GO_NEW_TAB_CLICKED)
-    }
-
-    @Test
-    fun whenSendPixelsOnEnterKeyPressedWithUrlThenPixelFired() {
-        loadUrl("https://example.com")
-        testee.sendPixelsOnEnterKeyPressed()
-
-        verify(mockPixel).fire(AppPixelName.KEYBOARD_GO_WEBSITE_CLICKED)
-    }
-
-    @Test
-    fun whenSendPixelsOnEnterKeyPressedWithQueryUrlThenPixelFired() {
-        loadUrl("https://duckduckgo.com/?q=example")
-
-        testee.sendPixelsOnEnterKeyPressed()
-
-        verify(mockPixel).fire(AppPixelName.KEYBOARD_GO_SERP_CLICKED)
-    }
-
     @Test
     fun whenNewTabShownThenPixelIsFired() {
         testee.onNewTabShown()

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

@@ -138,6 +138,7 @@ import com.duckduckgo.app.browser.history.NavigationHistorySheet.NavigationHisto
 import com.duckduckgo.app.browser.httpauth.WebViewHttpAuthStore
 import com.duckduckgo.app.browser.logindetection.DOMLoginDetector
 import com.duckduckgo.app.browser.menu.BrowserPopupMenu
+import com.duckduckgo.app.browser.menu.VpnMenuStore
 import com.duckduckgo.app.browser.model.BasicAuthenticationCredentials
 import com.duckduckgo.app.browser.model.BasicAuthenticationRequest
 import com.duckduckgo.app.browser.model.LongPressTarget
@@ -173,6 +174,7 @@ import com.duckduckgo.app.browser.viewstate.LoadingViewState
 import com.duckduckgo.app.browser.viewstate.OmnibarViewState
 import com.duckduckgo.app.browser.viewstate.PrivacyShieldViewState
 import com.duckduckgo.app.browser.viewstate.SavedSiteChangedViewState
+import com.duckduckgo.app.browser.viewstate.VpnMenuState
 import com.duckduckgo.app.browser.webauthn.WebViewPasskeyInitializer
 import com.duckduckgo.app.browser.webshare.WebShareChooser
 import com.duckduckgo.app.browser.webshare.WebViewCompatWebShareChooser
@@ -307,6 +309,7 @@ import com.duckduckgo.mobile.android.R as CommonR
 import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackingProtectionScreens.AppTrackerOnboardingActivityWithEmptyParamsParams
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.duckduckgo.navigation.api.GlobalActivityStarter.DeeplinkActivityParams
+import com.duckduckgo.networkprotection.api.NetworkProtectionScreens.NetworkProtectionManagementScreenNoParams
 import com.duckduckgo.privacy.dashboard.api.ui.DashboardOpener
 import com.duckduckgo.privacy.dashboard.api.ui.PrivacyDashboardHybridScreenParams.BrokenSiteForm
 import com.duckduckgo.privacy.dashboard.api.ui.PrivacyDashboardHybridScreenParams.BrokenSiteForm.BrokenSiteFormReportFlow
@@ -407,6 +410,9 @@ class BrowserTabFragment :
     @Inject
     lateinit var pixel: Pixel
 
+    @Inject
+    lateinit var vpnMenuStore: VpnMenuStore
+
     @Inject
     lateinit var ctaViewModel: CtaViewModel
 
@@ -1346,6 +1352,10 @@ class BrowserTabFragment :
                     pixel.fire(CustomTabPixelNames.CUSTOM_TABS_OPEN_IN_DDG)
                 }
             }
+
+            onMenuItemClicked(vpnMenuItem) {
+                viewModel.onVpnMenuClicked()
+            }
         }
     }
 
@@ -1376,6 +1386,15 @@ class BrowserTabFragment :
         // small delay added to let keyboard disappear and avoid jarring transition
         binding.rootView.postDelayed(POPUP_MENU_DELAY) {
             if (isAdded) {
+                // Check if VPN menu item will be shown to non-subscribed user and increment count
+                val currentViewState = viewModel.browserViewState.value
+                if (currentViewState != null) {
+                    val shouldShowVpnMenuItem = !currentViewState.browserShowing && !isActiveCustomTab()
+                    if (currentViewState.vpnMenuState == VpnMenuState.NotSubscribed && shouldShowVpnMenuItem) {
+                        vpnMenuStore.incrementVpnMenuShownCount()
+                    }
+                }
+
                 popupMenu.show(binding.rootView, omnibar.toolbar)
                 viewModel.onPopupMenuLaunched()
                 if (isActiveCustomTab()) {
@@ -1993,6 +2012,10 @@ class BrowserTabFragment :
                 }
             }
 
+            is Command.LaunchVpnManagement -> {
+                globalActivityStarter.start(requireContext(), NetworkProtectionManagementScreenNoParams)
+            }
+
             is Command.DialNumber -> {
                 val intent = Intent(Intent.ACTION_DIAL)
                 intent.data = Uri.parse("tel:${it.telephoneNumber}")