Skip to content

Load sqlcipher library asynchronously #6733

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Load sqlcipher library asynchronously #6733

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
29 changes: 20 additions & 9 deletions .../src/main/java/com/duckduckgo/autofill/impl/securestorage/SecureStorageDatabaseFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,41 @@ class RealSecureStorageDatabaseFactory @Inject constructor(
private val context: Context,
private val keyProvider: SecureStorageKeyProvider,
private val autofillFeature: AutofillFeature,
) : SecureStorageDatabaseFactory {
) : SecureStorageDatabaseFactory, LibraryLoader.LibraryLoaderListener {
private var _database: SecureStorageDatabase? = null

private val mutex = Mutex()

init {
logcat { "Loading the sqlcipher native library" }
try {
LibraryLoader.loadLibrary(context, "sqlcipher")
logcat { "sqlcipher native library loaded ok" }
LibraryLoader.loadLibrary(context, "sqlcipher", this)
} catch (t: Throwable) {
// error loading the library
logcat(ERROR) { "Error loading sqlcipher library: ${t.asLog()}" }
logcat(ERROR) { "Error when calling LibraryLoader.loadLibrary for sqlcipher: ${t.asLog()}" }
}
}

override suspend fun getDatabase(): SecureStorageDatabase? {
return if (autofillFeature.createAsyncPreferences().isEnabled()) {
getAsyncDatabase()
} else {
getDatabaseSynchronized()
return try {
if (autofillFeature.createAsyncPreferences().isEnabled()) {
getAsyncDatabase()
} else {
getDatabaseSynchronized()
}
} catch (e: Exception) {
logcat(ERROR) { "Error getting secure storage database instance: ${e.asLog()}" }
null
}
}

override fun success() {
logcat { "sqlcipher native library loaded ok" }
}

override fun failure(throwable: Throwable) {
logcat(ERROR) { "Error loading sqlcipher library: ${throwable.asLog()}" }
}

@Synchronized
private fun getDatabaseSynchronized(): SecureStorageDatabase? {
return runBlocking {
Expand Down
Loading