Fix missing version on empty scriptlets

Author: CrisBarreiro

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

@@ -38,8 +38,9 @@ class RealAdBlockingExtensionRepository @Inject constructor(
 
     override suspend fun storeScriptlets(version: String, scriptlets: Map<String, ByteArray>) {
         dao.replaceAll(
-            scriptlets.map { (name, content) ->
-                ScriptletEntity(name = name, version = version, content = content)
+            version = version,
+            scriptlets = scriptlets.map { (name, content) ->
+                ScriptletEntity(name = name, content = content)
             },
         )
     }

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

@@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 abstract class AdBlockingExtensionDao {
 
-    @Query("SELECT version FROM ad_blocking_scriptlets LIMIT 1")
+    @Query("SELECT version FROM ad_blocking_scriptlets_metadata WHERE id = ${ScriptletMetadataEntity.SINGLETON_ID}")
     abstract suspend fun getVersion(): String?
 
     @Query("SELECT * FROM ad_blocking_scriptlets")
@@ -38,9 +38,13 @@ abstract class AdBlockingExtensionDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract suspend fun insertScriptlets(scriptlets: List<ScriptletEntity>)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun upsertMetadata(metadata: ScriptletMetadataEntity)
+
     @Transaction
-    open suspend fun replaceAll(scriptlets: List<ScriptletEntity>) {
+    open suspend fun replaceAll(version: String, scriptlets: List<ScriptletEntity>) {
         deleteAllScriptlets()
         insertScriptlets(scriptlets)
+        upsertMetadata(ScriptletMetadataEntity(version = version))
     }
 }

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

@@ -22,8 +22,8 @@ import androidx.room.migration.Migration
 
 @Database(
     exportSchema = true,
-    version = 1,
-    entities = [ScriptletEntity::class],
+    version = 2,
+    entities = [ScriptletEntity::class, ScriptletMetadataEntity::class],
 )
 abstract class AdBlockingExtensionDatabase : RoomDatabase() {
     abstract fun adBlockingExtensionDao(): AdBlockingExtensionDao

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

@@ -22,18 +22,16 @@ import androidx.room.PrimaryKey
 @Entity(tableName = "ad_blocking_scriptlets")
 data class ScriptletEntity(
     @PrimaryKey val name: String,
-    val version: String,
     val content: ByteArray,
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other !is ScriptletEntity) return false
-        return name == other.name && version == other.version && content.contentEquals(other.content)
+        return name == other.name && content.contentEquals(other.content)
     }
 
     override fun hashCode(): Int {
         var result = name.hashCode()
-        result = 31 * result + version.hashCode()
         result = 31 * result + content.contentHashCode()
         return result
     }

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026 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.adblocking.impl.store
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "ad_blocking_scriptlets_metadata")
+data class ScriptletMetadataEntity(
+    @PrimaryKey val id: Int = SINGLETON_ID,
+    val version: String,
+) {
+    companion object {
+        const val SINGLETON_ID = 0
+    }
+}

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

@@ -26,6 +26,7 @@ import org.junit.After
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -87,4 +88,12 @@ class AdBlockingExtensionRepositoryTest {
         val stored = database.adBlockingExtensionDao().scriptletsFlow().first()
         assertEquals(setOf("new/path.js"), stored.map { it.name }.toSet())
     }
+
+    @Test
+    fun whenStoreScriptletsCalledWithEmptyMapThenVersionIsStillPersisted() = runTest {
+        repository.storeScriptlets(version = "2026.3.9", scriptlets = emptyMap())
+
+        assertEquals("2026.3.9", repository.getStoredVersion())
+        assertTrue(database.adBlockingExtensionDao().scriptletsFlow().first().isEmpty())
+    }
 }