Merge branch 'release/5.255.0'

Author: github-actions[bot]

.github/workflows/privacy-review.yml

@@ -0,0 +1,25 @@
+name: Create Asana task for Privacy Review
+
+on:
+  pull_request:
+    types: [ labeled ]
+
+jobs:
+  call-privacy-review:
+    if: contains(github.event.label.name, 'privacy review')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout native actions repo
+        uses: actions/checkout@v4
+        with:
+            ref: v2.1
+            # Do not change the below path (downstream actions expect it)
+            path: native-github-asana-sync
+            repository: duckduckgo/native-github-asana-sync
+
+      - name: Trigger review task
+        uses: ./native-github-asana-sync/.github/actions/privacy-review/
+        with:
+          team_name: 'Android'
+          asana_pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
+          github_pat: ${{ secrets.DAXMOBILE_ANDROID_AUTOMATION }}

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

@@ -21,6 +21,7 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.extensions.isDdgApp
+import com.duckduckgo.common.utils.extensions.safeGetInstalledApplications
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.mobile.android.vpn.apps.TrackingProtectionAppsRepository.ProtectionState
 import com.duckduckgo.mobile.android.vpn.apps.TrackingProtectionAppsRepository.ProtectionState.PROTECTED
@@ -113,15 +114,15 @@ class RealTrackingProtectionAppsRepository @Inject constructor(
 
     private fun refreshInstalledApps() {
         logcat { "Excluded Apps: refreshInstalledApps" }
-        installedApps = packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
+        installedApps = packageManager.safeGetInstalledApplications(context)
             .asSequence()
             .filterNot { shouldNotBeShown(it) }
     }
 
     override suspend fun getExclusionAppsList(): List<String> = withContext(dispatcherProvider.io()) {
         val exclusionList = appTrackerRepository.getAppExclusionList()
         val manualExclusionList = appTrackerRepository.getManualAppExclusionList()
-        return@withContext packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
+        return@withContext packageManager.safeGetInstalledApplications(context)
             .asSequence()
             .filter { isExcludedFromAppTP(it, exclusionList, manualExclusionList) }
             .sortedBy { it.name }

app-tracking-protection/vpn-impl/src/test/java/com/duckduckgo/mobile/android/vpn/apps/TrackingProtectionAppsRepositoryTest.kt

@@ -16,6 +16,7 @@
 
 package com.duckduckgo.mobile.android.vpn.apps
 
+import android.annotation.SuppressLint
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.NameNotFoundException
@@ -49,6 +50,7 @@ class TrackingProtectionAppsRepositoryTest {
     private lateinit var trackingProtectionAppsRepository: TrackingProtectionAppsRepository
 
     @Before
+    @SuppressLint("DenyListedApi")
     fun setup() {
         whenever(packageManager.getInstalledApplications(PackageManager.GET_META_DATA)).thenReturn(INSTALLED_APPS.asApplicationInfo())
         whenever(packageManager.getApplicationLabel(any())).thenReturn("App Name")

app-tracking-protection/vpn-internal/src/main/java/com/duckduckgo/vpn/internal/feature/VpnInternalSettingsActivity.kt

@@ -18,7 +18,6 @@ package com.duckduckgo.vpn.internal.feature
 
 import android.content.Intent
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.widget.CompoundButton
 import androidx.core.view.isVisible
@@ -35,6 +34,7 @@ import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.extensions.isDdgApp
+import com.duckduckgo.common.utils.extensions.safeGetInstalledApplications
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.mobile.android.app.tracking.AppTrackingProtection
 import com.duckduckgo.mobile.android.vpn.apps.isSystemApp
@@ -164,7 +164,7 @@ class VpnInternalSettingsActivity : DuckDuckGoActivity() {
     }
 
     private fun refreshInstalledApps() {
-        installedApps = packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
+        installedApps = packageManager.safeGetInstalledApplications(this.applicationContext)
             .asSequence()
             .filterNot { shouldNotBeShown(it) }
     }

app-tracking-protection/vpn-internal/src/main/java/com/duckduckgo/vpn/internal/feature/rules/ExceptionRulesDebugActivity.kt

@@ -29,6 +29,7 @@ import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.common.utils.DispatcherProvider
+import com.duckduckgo.common.utils.extensions.safeGetInstalledApplications
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.mobile.android.vpn.stats.AppTrackerBlockingStatsRepository
 import com.duckduckgo.mobile.android.vpn.store.VpnDatabase
@@ -113,7 +114,7 @@ class ExceptionRulesDebugActivity : DuckDuckGoActivity(), RuleTrackerView.RuleTr
     }
 
     private fun getAppTrackers(): List<InstalledAppTrackers> {
-        return packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
+        return packageManager.safeGetInstalledApplications(this.applicationContext)
             .asSequence()
             .map { InstalledApp(it.packageName, packageManager.getApplicationLabel(it).toString()) }
             .map {

app/build.gradle

@@ -1,3 +1,5 @@
+import com.duckduckgo.gradle.ModuleCreator
+
 plugins {
     id 'com.android.application'
 
@@ -608,6 +610,8 @@ tasks.register('assemblePlayReleaseDefaultVariant', Exec) {
     commandLine "$rootDir/gradlew", ':app:assemblePlayRelease', "-Pforce-default-variant"
 }
 
-task newModule(type: com.duckduckgo.gradle.ModuleCreator) {
-    feature = project.hasProperty('feature') ? project.getProperty('feature') : null
+tasks.register('newModule', ModuleCreator) {
+    feature.set(providers.gradleProperty('feature'))
+    repoRootDirectory.set(rootProject.layout.projectDirectory)
+    appBuildGradleFile.set(layout.projectDirectory.file('build.gradle'))
 }

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

@@ -41,7 +41,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.room.Room
-import androidx.test.annotation.UiThreadTest
 import androidx.test.filters.SdkSuppress
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import com.duckduckgo.adclick.api.AdClickManager
@@ -222,8 +221,7 @@ import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggesti
 import com.duckduckgo.browser.api.autocomplete.AutoCompleteSettings
 import com.duckduckgo.browser.api.brokensite.BrokenSiteContext
 import com.duckduckgo.browser.api.webviewcompat.WebViewCompatWrapper
-import com.duckduckgo.browser.ui.omnibar.OmnibarPosition.BOTTOM
-import com.duckduckgo.browser.ui.omnibar.OmnibarPosition.TOP
+import com.duckduckgo.browser.ui.omnibar.OmnibarType
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.common.test.InstantSchedulersRule
 import com.duckduckgo.common.ui.tabs.SwipingTabsFeature
@@ -617,10 +615,6 @@ class BrowserTabViewModelTest {
 
     private val mockWebView: WebView = mock()
 
-    private val fakeAddDocumentStartJavaScriptPlugins = FakeAddDocumentStartJavaScriptPluginPoint()
-    private val fakeMessagingPlugins = FakeWebMessagingPluginPoint()
-    private val fakePostMessageWrapperPlugins = FakePostMessageWrapperPluginPoint()
-
     private val mockDeviceAppLookup: DeviceAppLookup = mock()
 
     @Before
@@ -675,7 +669,7 @@ class BrowserTabViewModelTest {
             whenever(mockSavedSitesRepository.getBookmarks()).thenReturn(bookmarksListFlow.consumeAsFlow())
             whenever(mockRemoteMessagingRepository.messageFlow()).thenReturn(remoteMessageFlow.consumeAsFlow())
             whenever(mockSettingsDataStore.automaticFireproofSetting).thenReturn(AutomaticFireproofSetting.ASK_EVERY_TIME)
-            whenever(mockSettingsDataStore.omnibarPosition).thenReturn(TOP)
+            whenever(mockSettingsDataStore.omnibarType).thenReturn(OmnibarType.SINGLE_TOP)
             whenever(mockSettingsDataStore.isFullUrlEnabled).then { isFullSiteAddressEnabled }
             whenever(mockSSLCertificatesFeature.allowBypass()).thenReturn(mockEnabledToggle)
             whenever(subscriptions.shouldLaunchPrivacyProForUrl(any())).thenReturn(false)
@@ -850,9 +844,6 @@ class BrowserTabViewModelTest {
                     externalIntentProcessingState = mockExternalIntentProcessingState,
                     vpnMenuStateProvider = mockVpnMenuStateProvider,
                     webViewCompatWrapper = mockWebViewCompatWrapper,
-                    addDocumentStartJavascriptPlugins = fakeAddDocumentStartJavaScriptPlugins,
-                    webMessagingPlugins = fakeMessagingPlugins,
-                    postMessageWrapperPlugins = fakePostMessageWrapperPlugins,
                     addressBarTrackersAnimationFeatureToggle = mockAddressBarTrackersAnimationFeatureToggle,
                     autoconsentPixelManager = mockAutoconsentPixelManager,
                 )
@@ -5337,7 +5328,7 @@ class BrowserTabViewModelTest {
     @Test
     fun whenRefreshIsTriggeredByUserThenPrivacyProtectionsPopupManagerIsNotifiedWithBottomPosition() =
         runTest {
-            whenever(mockSettingsDataStore.omnibarPosition).thenReturn(BOTTOM)
+            whenever(mockSettingsDataStore.omnibarType).thenReturn(OmnibarType.SINGLE_BOTTOM)
             testee.onRefreshRequested(triggeredByUser = false)
             verify(mockPrivacyProtectionsPopupManager, never()).onPageRefreshTriggeredByUser(isOmnibarAtTheTop = false)
             testee.onRefreshRequested(triggeredByUser = true)
@@ -7091,102 +7082,6 @@ class BrowserTabViewModelTest {
             verify(mockOnboardingDesignExperimentManager).onWebPageFinishedLoading(url)
         }
 
-    @Test
-    fun whenPageFinishedAndUpdateScriptOnPageFinishedEnabledThenAddDocumentStartJavaScript() =
-        runTest {
-            val url = "https://example.com"
-            val webViewNavState = WebViewNavigationState(mockStack, 100)
-            fakeAndroidConfigBrowserFeature.updateScriptOnPageFinished().setRawStoredState(State(true))
-
-            testee.pageFinished(mockWebView, webViewNavState, url)
-
-            assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.cssPlugin.countInitted)
-            assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.otherPlugin.countInitted)
-        }
-
-    @Test
-    fun whenPageFinishedAndUpdateScriptOnPageFinishedDisabledThenDoNotCallAddDocumentStartJavaScript() =
-        runTest {
-            val url = "https://example.com"
-            val webViewNavState = WebViewNavigationState(mockStack, 100)
-            fakeAndroidConfigBrowserFeature.updateScriptOnPageFinished().setRawStoredState(State(false))
-
-            testee.pageFinished(mockWebView, webViewNavState, url)
-
-            assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.cssPlugin.countInitted)
-            assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.otherPlugin.countInitted)
-        }
-
-    @Test
-    fun whenPrivacyProtectionsUpdatedAndUpdateScriptOnPageFinishedEnabledAndUpdateScriptOnProtectionsChangedEnabledThenAddDocumentStartJavaScript() =
-        runTest {
-            fakeAndroidConfigBrowserFeature.updateScriptOnPageFinished().setRawStoredState(State(true))
-            fakeAndroidConfigBrowserFeature.updateScriptOnProtectionsChanged().setRawStoredState(State(true))
-
-            testee.privacyProtectionsUpdated(mockWebView)
-
-            assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.cssPlugin.countInitted)
-            assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.otherPlugin.countInitted)
-        }
-
-    @Test
-    fun whenPrivacyProtectionsUpdatedAndUpdateScriptOnProtectionsChangedEnabledAndStopLoadingBeforeUpdatingScriptEnabledThenStopLoading() =
-        runTest {
-            fakeAndroidConfigBrowserFeature.updateScriptOnProtectionsChanged().setRawStoredState(State(true))
-            fakeAndroidConfigBrowserFeature.stopLoadingBeforeUpdatingScript().setRawStoredState(State(true))
-
-            testee.privacyProtectionsUpdated(mockWebView)
-
-            verify(mockWebView).stopLoading()
-        }
-
-    @Test
-    fun whenPrivacyProtectionsUpdatedAndUpdateScriptOnProtectionsChangedEnabledAndStopLoadingBeforeUpdatingScriptDisabledThenDoNotStopLoading() =
-        runTest {
-            fakeAndroidConfigBrowserFeature.updateScriptOnProtectionsChanged().setRawStoredState(State(true))
-            fakeAndroidConfigBrowserFeature.stopLoadingBeforeUpdatingScript().setRawStoredState(State(false))
-
-            testee.privacyProtectionsUpdated(mockWebView)
-
-            verify(mockWebView, never()).stopLoading()
-        }
-
-    @Test
-    fun whenPrivacyProtectionsUpdatedAndUpdateScriptOnPageFinishedTrueAndUpdateScriptOnProtectionsChangedFalseThenNotAddDocumentStartJavaScript() =
-        runTest {
-            fakeAndroidConfigBrowserFeature.updateScriptOnPageFinished().setRawStoredState(State(true))
-            fakeAndroidConfigBrowserFeature.updateScriptOnProtectionsChanged().setRawStoredState(State(false))
-
-            testee.privacyProtectionsUpdated(mockWebView)
-
-            assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.cssPlugin.countInitted)
-            assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.otherPlugin.countInitted)
-        }
-
-    @Test
-    fun whenPrivacyProtectionsUpdatedAndUpdateScriptOnPageFinishedDisabledThenAddDocumentStartJavaScriptOnlyOnCSS() =
-        runTest {
-            fakeAndroidConfigBrowserFeature.updateScriptOnPageFinished().setRawStoredState(State(false))
-            fakeAndroidConfigBrowserFeature.updateScriptOnProtectionsChanged().setRawStoredState(State(true))
-
-            testee.privacyProtectionsUpdated(mockWebView)
-
-            assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.cssPlugin.countInitted)
-            assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.otherPlugin.countInitted)
-        }
-
-    @Test
-    fun whenPrivacyProtectionsUpdatedAndUpdateScriptOnPageFinishedFalseAndUpdateScriptOnProtectionsChangedFalseThenNotAddDocumentStartJavaScript() =
-        runTest {
-            fakeAndroidConfigBrowserFeature.updateScriptOnPageFinished().setRawStoredState(State(false))
-            fakeAndroidConfigBrowserFeature.updateScriptOnProtectionsChanged().setRawStoredState(State(false))
-
-            testee.privacyProtectionsUpdated(mockWebView)
-
-            assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.cssPlugin.countInitted)
-            assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.otherPlugin.countInitted)
-        }
-
     @Test
     fun whenCtaShownThenFireInContextDialogShownPixel() =
         runTest {
@@ -7689,46 +7584,6 @@ class BrowserTabViewModelTest {
         assertNull("SERP logo should be cleared when navigating to non-DuckDuckGo URL", omnibarViewState().serpLogo)
     }
 
-    @UiThreadTest
-    @Test
-    fun whenConfigureWebViewThenCallAddDocumentStartJavaScript() =
-        runTest {
-            val mockCallback = mock<WebViewCompatMessageCallback>()
-            val webView = DuckDuckGoWebView(context)
-            assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.cssPlugin.countInitted)
-
-            testee.configureWebView(webView, mockCallback)
-
-            assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.cssPlugin.countInitted)
-        }
-
-    @UiThreadTest
-    @Test
-    fun whenConfigureWebViewThenCallAddMessageListener() =
-        runTest {
-            val mockCallback = mock<WebViewCompatMessageCallback>()
-            val webView = DuckDuckGoWebView(context)
-            assertFalse(fakeMessagingPlugins.plugin.registered)
-
-            testee.configureWebView(webView, mockCallback)
-
-            assertTrue(fakeMessagingPlugins.plugin.registered)
-        }
-
-    @UiThreadTest
-    @Test
-    fun whenPostMessageThenCallPostContentScopeMessage() =
-        runTest {
-            val data = SubscriptionEventData("feature", "method", JSONObject())
-            val webView = DuckDuckGoWebView(context)
-
-            assertFalse(fakePostMessageWrapperPlugins.plugin.postMessageCalled)
-
-            testee.postContentScopeMessage(data, webView)
-
-            assertTrue(fakePostMessageWrapperPlugins.plugin.postMessageCalled)
-        }
-
     private fun aCredential(): LoginCredentials = LoginCredentials(domain = null, username = null, password = null)
 
     private fun assertShowHistoryCommandSent(expectedStackSize: Int) {

app/src/androidTest/java/com/duckduckgo/app/fire/AutomaticDataClearerTest.kt

@@ -54,7 +54,12 @@ class AutomaticDataClearerTest {
     private val mockWorkManager: WorkManager = mock()
     private val pixel: Pixel = mock()
     private val dataClearerForegroundAppRestartPixel =
-        DataClearerForegroundAppRestartPixel(InstrumentationRegistry.getInstrumentation().targetContext, pixel)
+        DataClearerForegroundAppRestartPixel(
+            InstrumentationRegistry.getInstrumentation().targetContext,
+            pixel,
+            coroutineTestRule.testScope,
+            coroutineTestRule.testDispatcherProvider,
+        )
 
     @UiThreadTest
     @Before

app/src/androidTest/java/com/duckduckgo/app/fire/DataClearerForegroundAppRestartPixelTest.kt

@@ -25,16 +25,21 @@ import com.duckduckgo.app.browser.BrowserActivity
 import com.duckduckgo.app.pixels.AppPixelName
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.systemsearch.SystemSearchActivity
+import com.duckduckgo.common.test.CoroutineTestRule
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 
 class DataClearerForegroundAppRestartPixelTest {
 
+    @get:Rule
+    val coroutineTestRule: CoroutineTestRule = CoroutineTestRule()
+
     private val context = InstrumentationRegistry.getInstrumentation().targetContext
     private val pixel = mock<Pixel>()
-    private val testee = DataClearerForegroundAppRestartPixel(context, pixel)
+    private val testee = DataClearerForegroundAppRestartPixel(context, pixel, coroutineTestRule.testScope, coroutineTestRule.testDispatcherProvider)
 
     @Before
     fun setUp() {