Merge branch 'release/5.214.0' into main

Author: daxtheduck

.gitignore

@@ -94,4 +94,7 @@ report
 /node_modules/@duckduckgo/content-scope-scripts/build/*
 !/node_modules/@duckduckgo/content-scope-scripts/build/android/
 /node_modules/@duckduckgo/content-scope-scripts/build/android/*
+!/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/
+/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/*
+!/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/duckplayer/
 !/node_modules/@duckduckgo/content-scope-scripts/build/android/contentScope.js

.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml

@@ -120,17 +120,22 @@ tags:
     text: ".*Ad Company"
 - assertVisible:
     text: "ad-company.site"
-- assertVisible:
-    text: "convert.ad-company.site"
 - action: back
 - assertVisible:
     text: "View Non-Tracker Companies"
 - tapOn:
     text: "View Non-Tracker Companies"
 - assertVisible:
-    text: "We did not identify any requests from third-party domains."
+    text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply."
 - assertVisible:
     text: "About our Web Tracking Protections"
-
+- assertVisible:
+    text: "The following domain’s requests were loaded because a publisher-company.site ad on DuckDuckGo was recently clicked. These requests help evaluate ad effectiveness. All ads on DuckDuckGo are non-profiling."
+- assertVisible:
+    text: "How our search ads impact our protections"
+- assertVisible:
+    text: ".*Ad Company"
+- assertVisible:
+    text: "convert.ad-company.site"
 
 

ad-click/ad-click-impl/build.gradle

@@ -27,6 +27,9 @@ android {
     anvil {
         generateDaggerFactories = true // default is false
     }
+    lintOptions {
+        baseline file("lint-baseline.xml")
+    }
     namespace 'com.duckduckgo.adclick.impl'
     compileOptions {
         coreLibraryDesugaringEnabled = true

ad-click/ad-click-impl/lint-baseline.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.5.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.1)" variant="all" version="8.5.1">
+
+    <issue
+        id="DenyListedApi"
+        message="Use com.duckduckgo.data.store.api.SharedPreferencesProvider instead"
+        errorLine1="    private val preferences: SharedPreferences by lazy { context.getSharedPreferences(FILENAME, Context.MODE_PRIVATE) }"
+        errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/duckduckgo/adclick/impl/pixels/AdClickPixels.kt"
+            line="44"
+            column="58"/>
+    </issue>
+
+    <issue
+        id="DenyListedApi"
+        message="Use com.duckduckgo.data.store.api.SharedPreferencesProvider instead"
+        errorLine1="        whenever(mockContext.getSharedPreferences(&quot;com.duckduckgo.adclick.impl.pixels&quot;, 0)).thenReturn(prefs)"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/test/java/com/duckduckgo/adclick/impl/pixels/RealAdClickPixelsTest.kt"
+            line="54"
+            column="18"/>
+    </issue>
+
+</issues>

anrs/anrs-internal/lint-baseline.xml

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.2)" variant="all" version="8.1.2">
+<issues format="6" by="lint 8.5.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.1)" variant="all" version="8.5.1">
+
+    <issue
+        id="NotifyDataSetChanged"
+        message="It will always be more efficient to use more specific change events if you can. Rely on `notifyDataSetChanged` as a last resort."
+        errorLine1="        notifyDataSetChanged()"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/duckduckgo/app/anr/internal/setting/VitalsAdapterList.kt"
+            line="82"
+            column="9"/>
+    </issue>
 
 </issues>

anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesActivePluginPointCodeGenerator.kt

@@ -135,6 +135,12 @@ class ContributesActivePluginPointCodeGenerator : CodeGenerator {
                 element = vmClass.clazz.identifyingElement,
             )
         }
+        if (scope.fqName != appScopeFqName) {
+            throw AnvilCompilationException(
+                "${vmClass.fqName}: Active plugins can only be used in 'AppScope'.",
+                element = vmClass.clazz.identifyingElement,
+            )
+        }
 
         val content = FileSpec.buildFile(generatedPackage, pluginPointClassFileName) {
             // This is the normal plugin point
@@ -332,6 +338,12 @@ class ContributesActivePluginPointCodeGenerator : CodeGenerator {
                 element = vmClass.clazz.identifyingElement,
             )
         }
+        if (scope.fqName != appScopeFqName) {
+            throw AnvilCompilationException(
+                "${vmClass.fqName}: Active plugins can only be used in 'AppScope'.",
+                element = vmClass.clazz.identifyingElement,
+            )
+        }
 
         val content = FileSpec.buildFile(generatedPackage, pluginClassName) {
             // First create the class that will contribute the active plugin.
@@ -626,5 +638,6 @@ class ContributesActivePluginPointCodeGenerator : CodeGenerator {
         private val appCoroutineScopeFqName = FqName("com.duckduckgo.app.di.AppCoroutineScope")
         private val sharedPreferencesFqName = FqName("android.content.SharedPreferences")
         private val jsonAdapterFqName = FqName("com.squareup.moshi.JsonAdapter")
+        private val appScopeFqName = FqName("com.duckduckgo.di.scopes.AppScope")
     }
 }

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

@@ -65,6 +65,7 @@ dependencies {
     implementation project(':network-protection-api')
     implementation project(':data-store-api')
     implementation project(':new-tab-page-api')
+    implementation project(':subscriptions-api')
 
     implementation AndroidX.core.ktx