Improve dataset update scheduling

duckduckgo · Feb 24, 2025 · db8b30d · db8b30d
1 parent c98926a
commit db8b30d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 7 deletions.
diff --git a/...com/duckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionFiltersUpdateWorker.kt b/...com/duckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionFiltersUpdateWorker.kt
@@ -17,13 +17,15 @@
 package com.duckduckgo.malicioussiteprotection.impl
 
 import android.content.Context
+import androidx.lifecycle.LifecycleOwner
 import androidx.work.BackoffPolicy
 import androidx.work.CoroutineWorker
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import com.duckduckgo.anvil.annotations.ContributesWorker
+import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.malicioussiteprotection.impl.data.MaliciousSiteRepository
@@ -66,14 +68,30 @@ class MaliciousSiteProtectionFiltersUpdateWorker(
     scope = AppScope::class,
     boundType = PrivacyConfigCallbackPlugin::class,
 )
+@ContributesMultibinding(
+    scope = AppScope::class,
+    boundType = MainProcessLifecycleObserver::class,
+)
 @SingleInstanceIn(AppScope::class)
 class MaliciousSiteProtectionFiltersUpdateWorkerScheduler @Inject constructor(
     private val workManager: WorkManager,
     private val maliciousSiteProtectionFeature: MaliciousSiteProtectionRCFeature,
 
-) : PrivacyConfigCallbackPlugin {
+) : PrivacyConfigCallbackPlugin, MainProcessLifecycleObserver {
+
+    override fun onCreate(owner: LifecycleOwner) {
+        enqueuePeriodicWork()
+    }
 
     override fun onPrivacyConfigDownloaded() {
+        enqueuePeriodicWork()
+    }
+
+    private fun enqueuePeriodicWork() {
+        if (maliciousSiteProtectionFeature.isFeatureEnabled().not() || maliciousSiteProtectionFeature.canUpdateDatasets().not()) {
+            workManager.cancelUniqueWork(MALICIOUS_SITE_PROTECTION_FILTERS_UPDATE_WORKER_TAG)
+            return
+        }
         val workerRequest = PeriodicWorkRequestBuilder<MaliciousSiteProtectionFiltersUpdateWorker>(
             maliciousSiteProtectionFeature.getFilterSetUpdateFrequency(),
             TimeUnit.MINUTES,
@@ -83,7 +101,7 @@ class MaliciousSiteProtectionFiltersUpdateWorkerScheduler @Inject constructor(
             .build()
         workManager.enqueueUniquePeriodicWork(
             MALICIOUS_SITE_PROTECTION_FILTERS_UPDATE_WORKER_TAG,
-            ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE,
+            ExistingPeriodicWorkPolicy.UPDATE,
             workerRequest,
         )
     }

diff --git a/...uckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionHashPrefixesUpdateWorker.kt b/...uckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionHashPrefixesUpdateWorker.kt
@@ -17,13 +17,15 @@
 package com.duckduckgo.malicioussiteprotection.impl
 
 import android.content.Context
+import androidx.lifecycle.LifecycleOwner
 import androidx.work.BackoffPolicy
 import androidx.work.CoroutineWorker
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import com.duckduckgo.anvil.annotations.ContributesWorker
+import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.malicioussiteprotection.impl.data.MaliciousSiteRepository
@@ -66,14 +68,30 @@ class MaliciousSiteProtectionHashPrefixesUpdateWorker(
     scope = AppScope::class,
     boundType = PrivacyConfigCallbackPlugin::class,
 )
+@ContributesMultibinding(
+    scope = AppScope::class,
+    boundType = MainProcessLifecycleObserver::class,
+)
 @SingleInstanceIn(AppScope::class)
 class MaliciousSiteProtectionHashPrefixesUpdateWorkerScheduler @Inject constructor(
     private val workManager: WorkManager,
     private val maliciousSiteProtectionFeature: MaliciousSiteProtectionRCFeature,
 
-) : PrivacyConfigCallbackPlugin {
+) : PrivacyConfigCallbackPlugin, MainProcessLifecycleObserver {
+
+    override fun onCreate(owner: LifecycleOwner) {
+        enqueuePeriodicWork()
+    }
 
     override fun onPrivacyConfigDownloaded() {
+        enqueuePeriodicWork()
+    }
+
+    private fun enqueuePeriodicWork() {
+        if (maliciousSiteProtectionFeature.isFeatureEnabled().not() || maliciousSiteProtectionFeature.canUpdateDatasets().not()) {
+            workManager.cancelUniqueWork(MALICIOUS_SITE_PROTECTION_HASH_PREFIXES_UPDATE_WORKER_TAG)
+            return
+        }
         val workerRequest = PeriodicWorkRequestBuilder<MaliciousSiteProtectionHashPrefixesUpdateWorker>(
             maliciousSiteProtectionFeature.getHashPrefixUpdateFrequency(),
             TimeUnit.MINUTES,
@@ -83,7 +101,7 @@ class MaliciousSiteProtectionHashPrefixesUpdateWorkerScheduler @Inject construct
             .build()
         workManager.enqueueUniquePeriodicWork(
             MALICIOUS_SITE_PROTECTION_HASH_PREFIXES_UPDATE_WORKER_TAG,
-            ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE,
+            ExistingPeriodicWorkPolicy.UPDATE,
             workerRequest,
         )
     }

diff --git a/...duckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionFiltersUpdateWorkerTest.kt b/...duckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionFiltersUpdateWorkerTest.kt
@@ -93,7 +93,7 @@ class MaliciousSiteProtectionFiltersUpdateWorkerSchedulerTest {
     private val scheduler = MaliciousSiteProtectionFiltersUpdateWorkerScheduler(workManager, maliciousSiteProtectionFeature)
 
     @Test
-    fun onPrivacyConfigDownloaded_schedulesWorkerWithUpdateFrequencyFromRCFlagAndReenqueuePolicy() {
+    fun onPrivacyConfigDownloaded_schedulesWorkerWithUpdateFrequencyFromRCFlagAndUpdatePolicy() {
         val updateFrequencyMinutes = 15L
 
         whenever(maliciousSiteProtectionFeature.getFilterSetUpdateFrequency()).thenReturn(updateFrequencyMinutes)
@@ -103,7 +103,7 @@ class MaliciousSiteProtectionFiltersUpdateWorkerSchedulerTest {
         val workRequestCaptor = ArgumentCaptor.forClass(PeriodicWorkRequest::class.java)
         verify(workManager).enqueueUniquePeriodicWork(
             eq("MALICIOUS_SITE_PROTECTION_FILTERS_UPDATE_WORKER_TAG"),
-            eq(ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE),
+            eq(ExistingPeriodicWorkPolicy.UPDATE),
             capture(workRequestCaptor),
         )
 

diff --git a/...uckgo/malicioussiteprotection/impl/MaliciousSiteProtectionHashPrefixesUpdateWorkerTest.kt b/...uckgo/malicioussiteprotection/impl/MaliciousSiteProtectionHashPrefixesUpdateWorkerTest.kt
@@ -103,7 +103,7 @@ class MaliciousSiteProtectionHashPrefixesUpdateWorkerSchedulerTest {
         val workRequestCaptor = ArgumentCaptor.forClass(PeriodicWorkRequest::class.java)
         verify(workManager).enqueueUniquePeriodicWork(
             eq("MALICIOUS_SITE_PROTECTION_HASH_PREFIXES_UPDATE_WORKER_TAG"),
-            eq(ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE),
+            eq(ExistingPeriodicWorkPolicy.UPDATE),
             capture(workRequestCaptor),
         )