Merge branch 'release/5.234.1'

github-actions[bot] · github-actions[bot] · commit 5519012b4568 · 2025-05-20T08:36:46.000Z
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/blocklist/AppTrackerListUpdateWorker.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/blocklist/AppTrackerListUpdateWorker.kt
@@ -29,6 +29,7 @@ import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.mobile.android.vpn.di.AppTpBlocklistUpdateMutex
+import com.duckduckgo.mobile.android.vpn.pixels.DeviceShieldPixels
 import com.duckduckgo.mobile.android.vpn.store.VpnDatabase
 import com.duckduckgo.mobile.android.vpn.trackers.AppTrackerMetadata
 import com.squareup.anvil.annotations.ContributesMultibinding
@@ -56,10 +57,23 @@ class AppTrackerListUpdateWorker(context: Context, workerParameters: WorkerParam
     @AppTpBlocklistUpdateMutex
     lateinit var mutex: Mutex
 
+    @Inject
+    lateinit var deviceShieldPixels: DeviceShieldPixels
+
     override suspend fun doWork(): Result {
         return withContext(dispatchers.io()) {
             val updateBlocklistResult = mutex.withLock {
-                updateTrackerBlocklist()
+                val res = updateTrackerBlocklist()
+
+                // Report current blocklist status after update
+                deviceShieldPixels.reportBlocklistStats(
+                    mapOf(
+                        "blocklist_etag" to vpnDatabase.vpnAppTrackerBlockingDao().getTrackerBlocklistMetadata()?.eTag.toString(),
+                        "blocklist_size" to vpnDatabase.vpnAppTrackerBlockingDao().getTrackerBlockListSize().toString(),
+                    ),
+                )
+
+                res
             }
 
             val success = Result.success()
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/pixels/DeviceShieldPixelNames.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/pixels/DeviceShieldPixelNames.kt
@@ -184,6 +184,7 @@ enum class DeviceShieldPixelNames(override val pixelName: String, val enqueue: B
     ATP_REPORT_ANY_LOCAL_ADDR_DNS_SET_DAILY("m_atp_report_anylocal_dns_error_d"),
     ATP_REPORT_DNS_SET_ERROR("m_atp_report_dns_error_c"),
     ATP_REPORT_DNS_SET_ERROR_DAILY("m_atp_report_dns_error_d"),
+    ATP_REPORT_BLOCKLIST_STATS_DAILY("m_atp_report_blocklist_stats_d"),
 
     ATP_DID_SHOW_PROMOTE_ALWAYS_ON_DIALOG_UNIQUE("m_atp_imp_promote_always_on_dialog_u"),
     ATP_DID_SHOW_PROMOTE_ALWAYS_ON_DIALOG_DAILY("m_atp_imp_promote_always_on_dialog_d"),
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/pixels/DeviceShieldPixels.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/pixels/DeviceShieldPixels.kt
@@ -319,6 +319,8 @@ interface DeviceShieldPixels {
     fun reportAnylocalDnsError()
     fun reportGeneralDnsError()
 
+    fun reportBlocklistStats(payload: Map<String, String>)
+
     /**
      * Will fire when the user is interacting with the Promote Always On Dialog
      */
@@ -756,6 +758,10 @@ class RealDeviceShieldPixels @Inject constructor(
         firePixel(DeviceShieldPixelNames.ATP_REPORT_DNS_SET_ERROR)
     }
 
+    override fun reportBlocklistStats(payload: Map<String, String>) {
+        tryToFireDailyPixel(DeviceShieldPixelNames.ATP_REPORT_BLOCKLIST_STATS_DAILY, payload)
+    }
+
     override fun didEnableAppProtectionFromDetail() {
         firePixel(DeviceShieldPixelNames.ATP_DID_ENABLE_APP_PROTECTION_FROM_DETAIL)
     }
diff --git a/app-tracking-protection/vpn-store/src/main/java/com/duckduckgo/mobile/android/vpn/dao/VpnAppTrackerBlockingDao.kt b/app-tracking-protection/vpn-store/src/main/java/com/duckduckgo/mobile/android/vpn/dao/VpnAppTrackerBlockingDao.kt
@@ -44,6 +44,9 @@ interface VpnAppTrackerBlockingDao {
     @Query("DELETE from vpn_app_tracker_blocking_list")
     fun deleteTrackerBlockList()
 
+    @Query("SELECT COUNT(*) FROM vpn_app_tracker_blocking_list")
+    fun getTrackerBlockListSize(): Int
+
     @Query("DELETE FROM vpn_app_tracker_blocking_app_packages")
     fun deleteAppPackages()
 
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -276,9 +276,9 @@ import com.duckduckgo.site.permissions.api.SitePermissionsManager
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.LocationPermissionRequest
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.SitePermissionQueryResponse
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.SitePermissions
+import com.duckduckgo.subscriptions.api.SUBSCRIPTIONS_FEATURE_NAME
 import com.duckduckgo.subscriptions.api.Subscriptions
-import com.duckduckgo.subscriptions.impl.messaging.RealSubscriptionsJSHelper.Companion.SUBSCRIPTIONS_FEATURE_NAME
-import com.duckduckgo.subscriptions.impl.messaging.SubscriptionsJSHelper
+import com.duckduckgo.subscriptions.api.SubscriptionsJSHelper
 import com.duckduckgo.sync.api.favicons.FaviconsFetchingPrompt
 import com.duckduckgo.voice.api.VoiceSearchAvailability
 import com.duckduckgo.voice.api.VoiceSearchAvailabilityPixelLogger
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -341,9 +341,9 @@ import com.duckduckgo.site.permissions.api.SitePermissionsManager
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.LocationPermissionRequest
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.SitePermissionQueryResponse
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.SitePermissions
+import com.duckduckgo.subscriptions.api.SUBSCRIPTIONS_FEATURE_NAME
 import com.duckduckgo.subscriptions.api.Subscriptions
-import com.duckduckgo.subscriptions.impl.messaging.RealSubscriptionsJSHelper.Companion.SUBSCRIPTIONS_FEATURE_NAME
-import com.duckduckgo.subscriptions.impl.messaging.SubscriptionsJSHelper
+import com.duckduckgo.subscriptions.api.SubscriptionsJSHelper
 import com.duckduckgo.sync.api.favicons.FaviconsFetchingPrompt
 import dagger.Lazy
 import io.reactivex.schedulers.Schedulers
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -1 +1 @@
-VERSION=5.234.0
+VERSION=5.234.1
diff --git a/build.gradle b/build.gradle
@@ -140,6 +140,7 @@ subprojects {
                                 && dependencyPath.endsWith("api")
                                 && dependencyPath != ":feature-toggles-api"
                                 && dependencyPath != ":navigation-api"
+                                && dependencyPath != ":js-messaging-api"
                         ) {
                             if (projectPath.endsWith(":feature-toggles-api") &&
                                     (dependencyPath == ":experiments-api"
diff --git a/malicious-site-protection/malicious-site-protection-impl/src/main/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/MaliciousSiteRepository.kt b/malicious-site-protection/malicious-site-protection-impl/src/main/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/MaliciousSiteRepository.kt
@@ -24,7 +24,6 @@ import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.M
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.PHISHING
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.SCAM
 import com.duckduckgo.malicioussiteprotection.impl.MaliciousSitePixelName.MALICIOUS_SITE_CLIENT_TIMEOUT
-import com.duckduckgo.malicioussiteprotection.impl.MaliciousSiteProtectionRCFeature
 import com.duckduckgo.malicioussiteprotection.impl.data.db.MaliciousSiteDao
 import com.duckduckgo.malicioussiteprotection.impl.data.db.RevisionEntity
 import com.duckduckgo.malicioussiteprotection.impl.data.network.FilterResponse
@@ -83,7 +82,6 @@ class RealMaliciousSiteRepository @Inject constructor(
     private val maliciousSiteDatasetService: MaliciousSiteDatasetService,
     private val dispatcherProvider: DispatcherProvider,
     private val pixels: Pixel,
-    private val maliciousSiteProtectionFeature: MaliciousSiteProtectionRCFeature,
 ) : MaliciousSiteRepository {
 
     private val writeMutex = Mutex()
@@ -177,7 +175,7 @@ class RealMaliciousSiteRepository @Inject constructor(
     ): Result<Unit> {
         return withContext(dispatcherProvider.io()) {
             val networkRevision = maliciousSiteService.getRevision().revision
-            val localRevisions = getLocalRevisions(type)
+            val localRevisions = writeMutex.withLock { getLocalRevisions(type) }
 
             try {
                 loadData(localRevisions, networkRevision)
diff --git a/malicious-site-protection/malicious-site-protection-impl/src/test/kotlin/com/duckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionReferenceTest.kt b/malicious-site-protection/malicious-site-protection-impl/src/test/kotlin/com/duckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionReferenceTest.kt
@@ -99,7 +99,6 @@ class MaliciousSiteProtectionReferenceTest(private val testCase: TestCase) {
         maliciousSiteDatasetService,
         coroutineRule.testDispatcherProvider,
         mockPixel,
-        mockMaliciousSiteProtectionRCFeature,
     )
 
     @Before
@@ -148,7 +147,6 @@ class MaliciousSiteProtectionReferenceTest(private val testCase: TestCase) {
             ),
         )
         whenever(mockMaliciousSiteProtectionRCFeature.isFeatureEnabled()).thenReturn(true)
-        whenever(mockMaliciousSiteProtectionRCRepository.isExempted(any())).thenReturn(false)
         repository.loadFilters(*enumValues<Feed>())
         repository.loadHashPrefixes(*enumValues<Feed>())
 
diff --git a/malicious-site-protection/malicious-site-protection-impl/src/test/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/RealMaliciousSiteRepositoryTest.kt b/malicious-site-protection/malicious-site-protection-impl/src/test/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/RealMaliciousSiteRepositoryTest.kt
@@ -4,7 +4,6 @@ import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.PHISHING
 import com.duckduckgo.malicioussiteprotection.impl.MaliciousSitePixelName.MALICIOUS_SITE_CLIENT_TIMEOUT
-import com.duckduckgo.malicioussiteprotection.impl.MaliciousSiteProtectionRCFeature
 import com.duckduckgo.malicioussiteprotection.impl.data.db.FilterEntity
 import com.duckduckgo.malicioussiteprotection.impl.data.db.HashPrefixEntity
 import com.duckduckgo.malicioussiteprotection.impl.data.db.MaliciousSiteDao
@@ -44,14 +43,12 @@ class RealMaliciousSiteRepositoryTest {
     private val maliciousSiteService: MaliciousSiteService = mock()
     private val maliciousSiteDatasetService: MaliciousSiteDatasetService = mock()
     private val mockPixel: Pixel = mock()
-    private val mockMaliciousSiteProtectionRCFeature: MaliciousSiteProtectionRCFeature = mock()
     private val repository = RealMaliciousSiteRepository(
         maliciousSiteDao,
         maliciousSiteService,
         maliciousSiteDatasetService,
         coroutineRule.testDispatcherProvider,
         mockPixel,
-        mockMaliciousSiteProtectionRCFeature,
     )
 
     @Test
diff --git a/subscriptions/subscriptions-api/build.gradle b/subscriptions/subscriptions-api/build.gradle
@@ -23,6 +23,7 @@ apply from: "$rootProject.projectDir/gradle/android-library.gradle"
 
 dependencies {
     implementation project(path: ':navigation-api')
+    implementation project(':js-messaging-api')
     implementation KotlinX.coroutines.core
 }
 
diff --git a/subscriptions/subscriptions-api/src/main/java/com/duckduckgo/subscriptions/api/SubscriptionsJSHelper.kt b/subscriptions/subscriptions-api/src/main/java/com/duckduckgo/subscriptions/api/SubscriptionsJSHelper.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.subscriptions.api
+
+import com.duckduckgo.js.messaging.api.JsCallbackData
+import org.json.JSONObject
+
+interface SubscriptionsJSHelper {
+    suspend fun processJsCallbackMessage(
+        featureName: String,
+        method: String,
+        id: String?,
+        data: JSONObject?,
+    ): JsCallbackData?
+}
+
+const val SUBSCRIPTIONS_FEATURE_NAME = "subscriptions"
diff --git a/subscriptions/subscriptions-dummy-impl/build.gradle b/subscriptions/subscriptions-dummy-impl/build.gradle
@@ -27,6 +27,7 @@ dependencies {
     implementation project(':anvil-annotations')
     implementation project(':di')
     implementation project(':subscriptions-api')
+    implementation project(':js-messaging-api')
 
     implementation KotlinX.coroutines.android
     implementation Google.dagger
diff --git a/subscriptions/subscriptions-dummy-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsJSHelperDummy.kt b/subscriptions/subscriptions-dummy-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsJSHelperDummy.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.duckduckgo.subscriptions.impl
+
+import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.js.messaging.api.JsCallbackData
+import com.duckduckgo.subscriptions.api.SubscriptionsJSHelper
+import com.squareup.anvil.annotations.ContributesBinding
+import javax.inject.Inject
+import org.json.JSONObject
+
+@ContributesBinding(AppScope::class)
+class SubscriptionsJSHelperDummy @Inject constructor() : SubscriptionsJSHelper {
+    override suspend fun processJsCallbackMessage(
+        featureName: String,
+        method: String,
+        id: String?,
+        data: JSONObject?,
+    ): JsCallbackData? {
+        return null
+    }
+}
diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionsJSHelper.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionsJSHelper.kt
@@ -18,21 +18,13 @@ package com.duckduckgo.subscriptions.impl.messaging
 
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.js.messaging.api.JsCallbackData
+import com.duckduckgo.subscriptions.api.SubscriptionsJSHelper
 import com.duckduckgo.subscriptions.impl.SubscriptionsManager
 import com.squareup.anvil.annotations.ContributesBinding
 import javax.inject.Inject
 import org.json.JSONArray
 import org.json.JSONObject
 
-interface SubscriptionsJSHelper {
-    suspend fun processJsCallbackMessage(
-        featureName: String,
-        method: String,
-        id: String?,
-        data: JSONObject?,
-    ): JsCallbackData?
-}
-
 @ContributesBinding(AppScope::class)
 class RealSubscriptionsJSHelper @Inject constructor(
     private val subscriptionsManager: SubscriptionsManager,
@@ -77,7 +69,6 @@ class RealSubscriptionsJSHelper @Inject constructor(
     }
 
     companion object {
-        const val SUBSCRIPTIONS_FEATURE_NAME = "subscriptions"
         private const val METHOD_HANDSHAKE = "handshake"
         private const val METHOD_SUBSCRIPTION_DETAILS = "subscriptionDetails"
         private const val AVAILABLE_MESSAGES = "availableMessages"
diff --git a/versions.properties b/versions.properties
@@ -39,7 +39,7 @@ version.androidx.biometric=1.1.0
 
 version.androidx.core-splashscreen=1.0.1
 
-version.androidx.datastore=1.1.4
+version.androidx.datastore=1.1.6
 
 version.androidx.localbroadcastmanager=1.1.0
 

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,6 @@ class MaliciousSiteProtectionReferenceTest(private val testCase: TestCase) {`
`99`	`99`	`maliciousSiteDatasetService,`
`100`	`100`	`coroutineRule.testDispatcherProvider,`
`101`	`101`	`mockPixel,`
`102`		`- mockMaliciousSiteProtectionRCFeature,`
`103`	`102`	`)`
`104`	`103`
`105`	`104`	`@Before`
`@@ -148,7 +147,6 @@ class MaliciousSiteProtectionReferenceTest(private val testCase: TestCase) {`
`148`	`147`	`),`
`149`	`148`	`)`
`150`	`149`	`whenever(mockMaliciousSiteProtectionRCFeature.isFeatureEnabled()).thenReturn(true)`
`151`		`- whenever(mockMaliciousSiteProtectionRCRepository.isExempted(any())).thenReturn(false)`
`152`	`150`	`repository.loadFilters(*enumValues<Feed>())`
`153`	`151`	`repository.loadHashPrefixes(*enumValues<Feed>())`
`154`	`152`