Merge branch 'release/5.228.0'

Author: github-actions[bot]

.github/workflows/build-ad-hoc.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           submodules: recursive
           token: ${{ secrets.GT_DAXMOBILE }}
-          ref: ${{ github.event.inputs.app-version }}
+          ref: ${{ github.event.inputs.ref }}
       - name: Set up JDK version
         uses: actions/setup-java@v4
         with:

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ concurrency:
 jobs:
   code_formatting:
     name: Code Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout repository

.github/workflows/nightly.yml

@@ -12,7 +12,7 @@ concurrency:
 jobs:
   code_formatting:
     name: Code Formatting
-    runs-on: ubuntu-20.04 #https://github.com/actions/runner-images/issues/6709
+    runs-on: ubuntu-24.04 #https://github.com/actions/runner-images/issues/6709
 
     steps:
       - name: Checkout repository
@@ -34,7 +34,7 @@ jobs:
 
   unit_tests:
     name: Unit tests
-    runs-on: ubuntu-20.04 #https://github.com/actions/runner-images/issues/6709
+    runs-on: ubuntu-24.04 #https://github.com/actions/runner-images/issues/6709
 
     steps:
       - name: Checkout repository
@@ -67,7 +67,7 @@ jobs:
 
   lint:
     name: Lint
-    runs-on: ubuntu-20.04 #https://github.com/actions/runner-images/issues/6709
+    runs-on: ubuntu-24.04 #https://github.com/actions/runner-images/issues/6709
 
     steps:
       - name: Checkout repository
@@ -104,7 +104,7 @@ jobs:
           path: lint-report.zip
 
   android_tests:
-    runs-on: ubuntu-20.04 #https://github.com/actions/runner-images/issues/6709
+    runs-on: ubuntu-24.04 #https://github.com/actions/runner-images/issues/6709
     name: Android CI checks
 
     steps:
@@ -165,7 +165,7 @@ jobs:
 
   create_task_when_failed:
     name: Create Asana task when workflow failed
-    runs-on: ubuntu-20.04 #https://github.com/actions/runner-images/issues/6709
+    runs-on: ubuntu-24.04 #https://github.com/actions/runner-images/issues/6709
     needs: [code_formatting, unit_tests, lint, android_tests]
     if: ${{ failure() }}
     steps:

.github/workflows/release_report_error.yml

@@ -13,7 +13,7 @@ concurrency:
 jobs:
   report-release-error:
     name: Create Asana Task
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Create Asana task when workflow failed

.github/workflows/release_tests.yml

@@ -18,7 +18,7 @@ concurrency:
 jobs:
   run-release-tests:
     name: Run Release tests of tag version in Maestro
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout repository

.maestro/security_tests/3_-_AddressBarSpoof,_appschemes.yaml

@@ -33,6 +33,7 @@ interface AppBuildConfig {
     val deviceLocale: Locale
     val isDefaultVariantForced: Boolean
     val buildDateTimeMillis: Long
+    val canSkipOnboarding: Boolean
 
     /**
      * You should call [variantName] in a background thread

app-build-config/app-build-config-api/src/main/java/com/duckduckgo/appbuildconfig/api/AppBuildConfig.kt

@@ -28,7 +28,7 @@
         android:id="@+id/trackers_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/daxColorSurface"
+        android:background="?attr/daxColorToolbar"
         android:theme="@style/Widget.DuckDuckGo.ToolbarTheme"
         app:popupTheme="@style/Widget.DuckDuckGo.PopUpOverflowMenu" />
 

app-tracking-protection/vpn-impl/src/main/res/layout/include_trackers_toolbar.xml

@@ -57,6 +57,11 @@ android {
         } else {
             buildConfigField "boolean", "FORCE_DEFAULT_VARIANT", "false"
         }
+        if (project.hasProperty('skip-onboarding')) {
+            buildConfigField "boolean", "CAN_SKIP_ONBOARDING", "true"
+        } else {
+            buildConfigField "boolean", "CAN_SKIP_ONBOARDING", "false"
+        }
         if (project.hasProperty('build-date-time')) {
             buildConfigField "long", "BUILD_DATE_MILLIS", "${System.currentTimeMillis()}"
         } else {

app/build.gradle

@@ -200,6 +200,7 @@ import com.duckduckgo.downloads.api.DownloadStateListener
 import com.duckduckgo.downloads.api.FileDownloader
 import com.duckduckgo.downloads.api.FileDownloader.PendingFileDownload
 import com.duckduckgo.duckchat.api.DuckChat
+import com.duckduckgo.duckchat.impl.DuckChatPixelName
 import com.duckduckgo.duckplayer.api.DuckPlayer
 import com.duckduckgo.duckplayer.api.DuckPlayer.DuckPlayerOrigin.AUTO
 import com.duckduckgo.duckplayer.api.DuckPlayer.DuckPlayerOrigin.OVERLAY
@@ -2781,6 +2782,20 @@ class BrowserTabViewModelTest {
         assertFalse(browserViewState().canReportSite)
     }
 
+    @Test
+    fun whenUserInDuckPlayerThenCannotReportSite() {
+        setupNavigation(skipHome = false, isBrowsing = true)
+        whenever(mockDuckPlayer.isDuckPlayerUri(anyString())).thenReturn(true)
+        assertFalse(browserViewState().canReportSite)
+    }
+
+    @Test
+    fun whenUserInDuckPlayerThenCannotAllowList() {
+        setupNavigation(skipHome = false, isBrowsing = true)
+        whenever(mockDuckPlayer.isDuckPlayerUri(anyString())).thenReturn(true)
+        assertFalse(browserViewState().canChangePrivacyProtection)
+    }
+
     @Test
     fun whenUserBrowsingPressesBackThenCannotAddToHome() {
         setupNavigation(skipHome = false, isBrowsing = true, canGoBack = false)
@@ -5769,6 +5784,28 @@ class BrowserTabViewModelTest {
         assertCommandNotIssued<Command.SendResponseToJs>()
     }
 
+    @Test
+    fun whenDuckChatMenuItemClickedAndItWasntUsedBeforeThenOpenDuckChatAndSendPixel() = runTest {
+        whenever(mockDuckChat.wasOpenedBefore()).thenReturn(false)
+
+        testee.onDuckChatMenuClicked()
+
+        verify(mockPixel).fire(DuckChatPixelName.DUCK_CHAT_OPEN)
+        verify(mockPixel).fire(DuckChatPixelName.DUCK_CHAT_OPEN_BROWSER_MENU, mapOf("was_used_before" to "0"))
+        verify(mockDuckChat).openDuckChat()
+    }
+
+    @Test
+    fun whenDuckChatMenuItemClickedAndItWasUsedBeforeThenOpenDuckChatAndSendPixel() = runTest {
+        whenever(mockDuckChat.wasOpenedBefore()).thenReturn(true)
+
+        testee.onDuckChatMenuClicked()
+
+        verify(mockPixel).fire(DuckChatPixelName.DUCK_CHAT_OPEN)
+        verify(mockPixel).fire(DuckChatPixelName.DUCK_CHAT_OPEN_BROWSER_MENU, mapOf("was_used_before" to "1"))
+        verify(mockDuckChat).openDuckChat()
+    }
+
     private fun aCredential(): LoginCredentials {
         return LoginCredentials(domain = null, username = null, password = null)
     }