Skip to content

Migrate PIR to DatabaseProvider #7215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Migrate PIR to DatabaseProvider #7215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions ...mpl/src/main/java/com/duckduckgo/pir/impl/store/secure/PirSecureStorageDatabaseFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
package com.duckduckgo.pir.impl.store.secure

import android.content.Context
import androidx.room.Room
import com.duckduckgo.data.store.api.DatabaseProvider
import com.duckduckgo.data.store.api.RoomDatabaseConfig
import com.duckduckgo.di.scopes.AppScope
import com.duckduckgo.library.loader.LibraryLoader
import com.duckduckgo.pir.impl.store.PirDatabase
Expand All @@ -43,6 +44,7 @@ interface PirSecureStorageDatabaseFactory {
class RealPirSecureStorageDatabaseFactory @Inject constructor(
private val context: Context,
private val keyProvider: PirSecureStorageKeyProvider,
private val databaseProvider: DatabaseProvider,
) : PirSecureStorageDatabaseFactory {
private var _database: PirDatabase? = null

Expand Down Expand Up @@ -77,19 +79,17 @@ class RealPirSecureStorageDatabaseFactory @Inject constructor(
// If we can't access the keystore, it means that L1Key will be null. We don't want to encrypt the db with a null key.
if (keyProvider.canAccessKeyStore()) {
// At this point, we are guaranteed that if L1key is null, it's because it hasn't been generated yet. Else, we always use the one stored.
_database = Room.databaseBuilder(
context,
_database = databaseProvider.buildRoomDatabase(
PirDatabase::class.java,
"pir_encrypted.db",
)
.openHelperFactory(
SupportOpenHelperFactory(
RoomDatabaseConfig(
openHelperFactory = SupportOpenHelperFactory(
keyProvider.getl1Key(),
),
)
.enableMultiInstanceInvalidation()
.fallbackToDestructiveMigration()
.build()
enableMultiInstanceInvalidation = true,
fallbackToDestructiveMigration = true,
),
)
logcat { "PIR-DB: Ready to use!" }
_database
} else {
Expand Down
Loading