Migrate element-hiding to DatabaseProvider

element-hiding/element-hiding-impl/build.gradle

@@ -39,6 +39,7 @@ dependencies {
     implementation project(path: ':app-build-config-api')
     implementation project(path: ':element-hiding-store')
     implementation project(path: ':content-scope-scripts-api')
+    implementation project(path: ':data-store-api')
 
     implementation AndroidX.core.ktx
 

element-hiding/element-hiding-impl/src/main/java/com/duckduckgo/elementhiding/impl/di/ElementHidingModule.kt

@@ -16,11 +16,11 @@
 
 package com.duckduckgo.elementhiding.impl.di
 
-import android.content.Context
-import androidx.room.Room
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.di.IsMainProcess
 import com.duckduckgo.common.utils.DispatcherProvider
+import com.duckduckgo.data.store.api.DatabaseProvider
+import com.duckduckgo.data.store.api.RoomDatabaseConfig
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.elementhiding.store.ALL_MIGRATIONS
 import com.duckduckgo.elementhiding.store.ElementHidingDatabase
@@ -38,12 +38,16 @@ object ElementHidingModule {
 
     @SingleInstanceIn(AppScope::class)
     @Provides
-    fun provideElementHidingDatabase(context: Context): ElementHidingDatabase {
-        return Room.databaseBuilder(context, ElementHidingDatabase::class.java, "element_hiding.db")
-            .enableMultiInstanceInvalidation()
-            .fallbackToDestructiveMigration()
-            .addMigrations(*ALL_MIGRATIONS)
-            .build()
+    fun provideElementHidingDatabase(databaseProvider: DatabaseProvider): ElementHidingDatabase {
+        return databaseProvider.buildRoomDatabase(
+            ElementHidingDatabase::class.java,
+            "element_hiding.db",
+            config = RoomDatabaseConfig(
+                fallbackToDestructiveMigration = true,
+                enableMultiInstanceInvalidation = true,
+                migrations = ALL_MIGRATIONS,
+            ),
+        )
     }
 
     @SingleInstanceIn(AppScope::class)

element-hiding/element-hiding-store/src/main/java/com/duckduckgo/elementhiding/store/ElementHidingDatabase.kt

@@ -31,4 +31,4 @@ abstract class ElementHidingDatabase : RoomDatabase() {
     abstract fun elementHidingDao(): ElementHidingDao
 }
 
-val ALL_MIGRATIONS = emptyArray<Migration>()
+val ALL_MIGRATIONS = emptyList<Migration>()