Skip to content
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

feat: Update SQL Cipher #31

Merged
merged 2 commits into from
Dec 10, 2024
Merged

feat: Update SQL Cipher #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaa48f0
Bump sql cipher
jakubuid Dec 10, 2024
23cf48d
Increase timeout
jakubuid Dec 10, 2024
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
2 changes: 1 addition & 1 deletion core/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ dependencies {
implementation(libs.scarlet.android)
implementation(libs.bundles.sqlDelight)
//noinspection UseTomlInstead
api("net.zetetic:android-database-sqlcipher:4.5.4@aar")
api("net.zetetic:sqlcipher-android:4.6.1@aar")
implementation(libs.relinker)
api(libs.androidx.security)
api(libs.koin.android)
Expand Down
8 changes: 4 additions & 4 deletions core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import com.reown.android.sdk.core.AndroidCoreDatabase
import com.reown.foundation.util.Logger
import com.reown.util.randomBytes
import com.reown.utils.Empty
import net.sqlcipher.database.SQLiteDatabaseHook
import net.sqlcipher.database.SupportFactory
import net.zetetic.database.sqlcipher.SQLiteDatabaseHook
import net.zetetic.database.sqlcipher.SupportOpenHelperFactory
import org.koin.android.ext.koin.androidContext
import org.koin.core.qualifier.named
import org.koin.core.scope.Scope
Expand Down Expand Up @@ -159,9 +159,9 @@ fun getSupportFactory(
passphrase: ByteArray,
hook: SQLiteDatabaseHook?,
clearPassphrase: Boolean
): SupportFactory {
): SupportOpenHelperFactory {
loadSqlCipherLibrary(context)
return SupportFactory(passphrase, hook, clearPassphrase)
return SupportOpenHelperFactory(passphrase, hook, clearPassphrase)
}

private fun loadSqlCipherLibrary(context: Context) {
Expand Down
2 changes: 1 addition & 1 deletion foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class RelayTest {
runBlocking {
val start = System.currentTimeMillis()
// Await test finish or check if timeout occurred
while (testState.value is TestState.Idle && !didTimeout(start, 60000L)) {
while (testState.value is TestState.Idle && !didTimeout(start, 120000L)) {
delay(10)
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ koin = "3.5.6"
retrofit = "2.11.0"
okhttp = "4.12.0"
bouncyCastle = "1.78.1"
sqlCipher = "4.5.4"
sqlCipher = "4.6.1"
multibase = "1.1.1"
json = "20220924"
timber = "5.0.1"
Expand Down Expand Up @@ -148,7 +148,7 @@ firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx"
firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }

bouncyCastle = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncyCastle" }
sqlCipher = { module = "net.zetetic:android-database-sqlcipher", version.ref = "sqlCipher" }
sqlCipher = { module = "net.zetetic:sqlcipher-android", version.ref = "sqlCipher" }
relinker = { module = "com.getkeepsafe.relinker:relinker", version.ref = "relinker" }
mulitbase = { module = "com.github.multiformats:java-multibase", version.ref = "multibase" }
jerseyCommon = { module = "org.glassfish.jersey.core:jersey-common", version.ref = "jerseyCommon" }
Expand Down
Loading