Extract RC caching to a different class

duckduckgo · Dec 17, 2024 · cfc8cea · cfc8cea
1 parent cb7c3f5
commit cfc8cea
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 41 deletions.
diff --git a/...in/kotlin/com/duckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionRCFeature.kt b/...in/kotlin/com/duckduckgo/malicioussiteprotection/impl/MaliciousSiteProtectionRCFeature.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2024 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.malicioussiteprotection.impl
+
+import com.duckduckgo.app.di.AppCoroutineScope
+import com.duckduckgo.app.di.IsMainProcess
+import com.duckduckgo.common.utils.DispatcherProvider
+import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.privacy.config.api.PrivacyConfigCallbackPlugin
+import com.squareup.anvil.annotations.ContributesBinding
+import com.squareup.anvil.annotations.ContributesMultibinding
+import dagger.SingleInstanceIn
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import org.json.JSONObject
+
+interface MaliciousSiteProtectionRCFeature {
+    fun isFeatureEnabled(): Boolean
+    fun getHashPrefixUpdateFrequency(): Long
+    fun getFilterSetUpdateFrequency(): Long
+}
+
+@SingleInstanceIn(AppScope::class)
+@ContributesBinding(AppScope::class, MaliciousSiteProtectionRCFeature::class)
+@ContributesMultibinding(AppScope::class, PrivacyConfigCallbackPlugin::class)
+class RealMaliciousSiteProtectionRCFeature @Inject constructor(
+    private val dispatchers: DispatcherProvider,
+    private val maliciousSiteProtectionFeature: MaliciousSiteProtectionFeature,
+    @IsMainProcess private val isMainProcess: Boolean,
+    @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
+) : MaliciousSiteProtectionRCFeature, PrivacyConfigCallbackPlugin {
+    private var isFeatureEnabled = false
+
+    private var hashPrefixUpdateFrequency = 20L
+    private var filterSetUpdateFrequency = 720L
+
+    init {
+        if (isMainProcess) {
+            loadToMemory()
+        }
+    }
+
+    override fun onPrivacyConfigDownloaded() {
+        loadToMemory()
+    }
+
+    override fun getFilterSetUpdateFrequency(): Long {
+        return filterSetUpdateFrequency
+    }
+
+    override fun getHashPrefixUpdateFrequency(): Long {
+        return hashPrefixUpdateFrequency
+    }
+
+    override fun isFeatureEnabled(): Boolean {
+        return isFeatureEnabled
+    }
+
+    private fun loadToMemory() {
+        appCoroutineScope.launch(dispatchers.io()) {
+            isFeatureEnabled = maliciousSiteProtectionFeature.self().isEnabled()
+            maliciousSiteProtectionFeature.self().getSettings()?.let {
+                JSONObject(it).let { settings ->
+                    hashPrefixUpdateFrequency = settings.getLong("hashPrefixUpdateFrequency")
+                    filterSetUpdateFrequency = settings.getLong("filterSetUpdateFrequency")
+                }
+            }
+        }
+    }
+}
diff --git a/...rc/main/kotlin/com/duckduckgo/malicioussiteprotection/impl/RealMaliciousSiteProtection.kt b/...rc/main/kotlin/com/duckduckgo/malicioussiteprotection/impl/RealMaliciousSiteProtection.kt
@@ -17,56 +17,17 @@
 package com.duckduckgo.malicioussiteprotection.impl
 
 import android.net.Uri
-import com.duckduckgo.app.di.AppCoroutineScope
-import com.duckduckgo.app.di.IsMainProcess
-import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.IsMaliciousResult
-import com.duckduckgo.privacy.config.api.PrivacyConfigCallbackPlugin
 import com.squareup.anvil.annotations.ContributesBinding
-import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import org.json.JSONObject
 import timber.log.Timber
 
 @ContributesBinding(AppScope::class, MaliciousSiteProtection::class)
-@ContributesMultibinding(AppScope::class, PrivacyConfigCallbackPlugin::class)
 class RealMaliciousSiteProtection @Inject constructor(
-    private val dispatchers: DispatcherProvider,
-    private val maliciousSiteProtectionFeature: MaliciousSiteProtectionFeature,
-    @IsMainProcess private val isMainProcess: Boolean,
-    @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
-) : MaliciousSiteProtection, PrivacyConfigCallbackPlugin {
-
-    private var isFeatureEnabled = false
-
-    private var hashPrefixUpdateFrequency = 20L
-    private var filterSetUpdateFrequency = 720L
-
-    init {
-        if (isMainProcess) {
-            loadToMemory()
-        }
-    }
-
-    override fun onPrivacyConfigDownloaded() {
-        loadToMemory()
-    }
-
-    private fun loadToMemory() {
-        appCoroutineScope.launch(dispatchers.io()) {
-            isFeatureEnabled = maliciousSiteProtectionFeature.self().isEnabled()
-            maliciousSiteProtectionFeature.self().getSettings()?.let {
-                JSONObject(it).let { settings ->
-                    hashPrefixUpdateFrequency = settings.getLong("hashPrefixUpdateFrequency")
-                    filterSetUpdateFrequency = settings.getLong("filterSetUpdateFrequency")
-                }
-            }
-        }
-    }
+    maliciousSiteProtectionRCFeature: MaliciousSiteProtectionRCFeature,
+) : MaliciousSiteProtection {
 
     override suspend fun isMalicious(url: Uri, confirmationCallback: (isMalicious: Boolean) -> Unit): IsMaliciousResult {
         Timber.tag("MaliciousSiteProtection").d("isMalicious $url")