Simplify data model

Author: CrisBarreiro

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/AdBlockingExtensionJsInjectorPlugin.kt

@@ -47,7 +47,7 @@ class AdBlockingExtensionJsInjectorPlugin @Inject constructor(
 
     private val payload: StateFlow<String?> = repository
         .scriptletsFlow()
-        .map { data -> data?.let(::buildScript) }
+        .map(::buildScript)
         .stateIn(appScope, SharingStarted.Eagerly, initialValue = null)
 
     @UiThread
@@ -81,8 +81,8 @@ class AdBlockingExtensionJsInjectorPlugin @Inject constructor(
 
     override fun onPageFinished(webView: WebView, url: String?, site: Site?) = Unit
 
-    private fun buildScript(data: AdBlockingScriptletData): String? =
-        data.scriptlets
+    private fun buildScript(scriptlets: List<Scriptlet>): String? =
+        scriptlets
             .takeUnless { it.isEmpty() }
             ?.sortedBy { it.name }
             ?.joinToString(separator = "\n") { it.content }

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/AdBlockingExtensionRepository.kt

@@ -28,7 +28,7 @@ import javax.inject.Inject
 interface AdBlockingExtensionRepository {
     suspend fun getStoredVersion(): String?
     suspend fun storeScriptlets(version: String, scriptlets: Map<String, ByteArray>)
-    fun scriptletsFlow(): Flow<AdBlockingScriptletData?>
+    fun scriptletsFlow(): Flow<List<Scriptlet>>
 }
 
 @SingleInstanceIn(AppScope::class)
@@ -47,16 +47,8 @@ class RealAdBlockingExtensionRepository @Inject constructor(
         )
     }
 
-    override fun scriptletsFlow(): Flow<AdBlockingScriptletData?> =
+    override fun scriptletsFlow(): Flow<List<Scriptlet>> =
         dao.scriptletsFlow().map { rows ->
-            if (rows.isEmpty()) {
-                null
-            } else {
-                AdBlockingScriptletData(
-                    scriptlets = rows.map { row ->
-                        AdBlockingScriptletData.Scriptlet(name = row.name, content = String(row.content))
-                    },
-                )
-            }
+            rows.map { row -> Scriptlet(name = row.name, content = String(row.content)) }
         }
 }

…blocking/impl/AdBlockingScriptletData.kt …/duckduckgo/adblocking/impl/Scriptlet.ktad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/AdBlockingScriptletData.kt renamed to ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/Scriptlet.kt ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/AdBlockingScriptletData.kt renamed to ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/Scriptlet.kt

@@ -16,11 +16,7 @@
 
 package com.duckduckgo.adblocking.impl
 
-data class AdBlockingScriptletData(
-    val scriptlets: List<Scriptlet>,
-) {
-    data class Scriptlet(
-        val name: String,
-        val content: String,
-    )
-}
+data class Scriptlet(
+    val name: String,
+    val content: String,
+)

ad-blocking/ad-blocking-impl/src/test/java/com/duckduckgo/adblocking/impl/AdBlockingExtensionJsInjectorPluginTest.kt

@@ -43,7 +43,7 @@ class AdBlockingExtensionJsInjectorPluginTest {
 
     private var discoverableEnabled = true
     private var operationalEnabled = true
-    private val scriptletsFlow = MutableStateFlow<AdBlockingScriptletData?>(null)
+    private val scriptletsFlow = MutableStateFlow<List<Scriptlet>>(emptyList())
 
     private val isDiscoverableToggle: Toggle = mock {
         on { isEnabled() } doAnswer { discoverableEnabled }
@@ -61,14 +61,10 @@ class AdBlockingExtensionJsInjectorPluginTest {
     private val webView: WebView = mock()
     private val testScope = CoroutineScope(UnconfinedTestDispatcher())
 
-    private val singleScriptlet = AdBlockingScriptletData(
-        scriptlets = listOf(AdBlockingScriptletData.Scriptlet(name = "a.js", content = "console.log('a')")),
-    )
-    private val twoScriptlets = AdBlockingScriptletData(
-        scriptlets = listOf(
-            AdBlockingScriptletData.Scriptlet(name = "b.js", content = "console.log('b')"),
-            AdBlockingScriptletData.Scriptlet(name = "a.js", content = "console.log('a')"),
-        ),
+    private val singleScriptlet = listOf(Scriptlet(name = "a.js", content = "console.log('a')"))
+    private val twoScriptlets = listOf(
+        Scriptlet(name = "b.js", content = "console.log('b')"),
+        Scriptlet(name = "a.js", content = "console.log('a')"),
     )
 
     private val plugin by lazy {
@@ -173,16 +169,9 @@ class AdBlockingExtensionJsInjectorPluginTest {
         verify(webView, never()).evaluateJavascript(any(), isNull())
     }
 
-    @Test
-    fun whenScriptletDataIsNullThenScriptIsNotInjected() {
-        plugin.onPageStarted(webView, url = "https://youtube.com/page", isDesktopMode = null)
-
-        verify(webView, never()).evaluateJavascript(any(), isNull())
-    }
-
     @Test
     fun whenScriptletsListIsEmptyThenScriptIsNotInjected() {
-        scriptletsFlow.value = AdBlockingScriptletData(scriptlets = emptyList())
+        scriptletsFlow.value = emptyList()
 
         plugin.onPageStarted(webView, url = "https://youtube.com/page", isDesktopMode = null)
 
@@ -203,9 +192,7 @@ class AdBlockingExtensionJsInjectorPluginTest {
         scriptletsFlow.value = singleScriptlet
         plugin.onPageStarted(webView, url = "https://youtube.com/page", isDesktopMode = null)
 
-        scriptletsFlow.value = AdBlockingScriptletData(
-            scriptlets = listOf(AdBlockingScriptletData.Scriptlet(name = "a.js", content = "console.log('updated')")),
-        )
+        scriptletsFlow.value = listOf(Scriptlet(name = "a.js", content = "console.log('updated')"))
         plugin.onPageStarted(webView, url = "https://youtube.com/page", isDesktopMode = null)
 
         verify(webView).evaluateJavascript(