diff --git a/voice-search/voice-search-impl/build.gradle b/voice-search/voice-search-impl/build.gradle index bd70e04ef3d1..869389bb74dc 100644 --- a/voice-search/voice-search-impl/build.gradle +++ b/voice-search/voice-search-impl/build.gradle @@ -32,6 +32,7 @@ android { dependencies { implementation project(path: ':app-build-config-api') implementation project(path: ':common-utils') + implementation project(path: ':data-store-api') implementation project(path: ':design-system') implementation project(path: ':di') implementation project(path: ':duckchat-api') diff --git a/voice-search/voice-search-impl/src/main/java/com/duckduckgo/voice/impl/di/VoiceSearchModule.kt b/voice-search/voice-search-impl/src/main/java/com/duckduckgo/voice/impl/di/VoiceSearchModule.kt index 5f16ad170f1c..dbee51c8274f 100644 --- a/voice-search/voice-search-impl/src/main/java/com/duckduckgo/voice/impl/di/VoiceSearchModule.kt +++ b/voice-search/voice-search-impl/src/main/java/com/duckduckgo/voice/impl/di/VoiceSearchModule.kt @@ -17,10 +17,11 @@ package com.duckduckgo.voice.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.voice.api.VoiceSearchStatusListener import com.duckduckgo.voice.impl.remoteconfig.RealVoiceSearchFeatureRepository @@ -54,11 +55,15 @@ object VoiceSearchModule { @SingleInstanceIn(AppScope::class) @Provides - fun provideDatabase(context: Context): VoiceSearchDatabase { - return Room.databaseBuilder(context, VoiceSearchDatabase::class.java, "voicesearch.db") - .fallbackToDestructiveMigration() - .addMigrations(*ALL_MIGRATIONS) - .build() + fun provideVoiceSearchDatabase(databaseProvider: DatabaseProvider): VoiceSearchDatabase { + return databaseProvider.buildRoomDatabase( + VoiceSearchDatabase::class.java, + "voice_search.db", + config = RoomDatabaseConfig( + fallbackToDestructiveMigration = true, + migrations = ALL_MIGRATIONS, + ), + ) } @SingleInstanceIn(AppScope::class) diff --git a/voice-search/voice-search-store/src/main/java/com/duckduckgo/voice/store/VoiceSearchDatabase.kt b/voice-search/voice-search-store/src/main/java/com/duckduckgo/voice/store/VoiceSearchDatabase.kt index 8f1c800dd6cd..2376e838ef47 100644 --- a/voice-search/voice-search-store/src/main/java/com/duckduckgo/voice/store/VoiceSearchDatabase.kt +++ b/voice-search/voice-search-store/src/main/java/com/duckduckgo/voice/store/VoiceSearchDatabase.kt @@ -33,4 +33,4 @@ abstract class VoiceSearchDatabase : RoomDatabase() { abstract fun voiceSearchDao(): VoiceSearchDao } -val ALL_MIGRATIONS = emptyArray() +val ALL_MIGRATIONS = emptyList()