From eaa48f0ffc12b010888d9f97536340a5ef32b97b Mon Sep 17 00:00:00 2001
From: kubel <jakubwitczak6@gmail.com>
Date: Tue, 10 Dec 2024 09:50:09 +0100
Subject: [PATCH 1/2] Bump sql cipher

---
 core/android/build.gradle.kts                             | 2 +-
 .../kotlin/com.reown.android/di/CoreStorageModule.kt      | 8 ++++----
 gradle/libs.versions.toml                                 | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/android/build.gradle.kts b/core/android/build.gradle.kts
index 9932d36ca..39dae150c 100644
--- a/core/android/build.gradle.kts
+++ b/core/android/build.gradle.kts
@@ -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)
diff --git a/core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt b/core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt
index 61cdd59bf..d92583e89 100644
--- a/core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt
+++ b/core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt
@@ -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
@@ -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) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ead72ccb4..b70abc575 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -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"
@@ -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" }

From 23cf48d70261f04656b72970ef5ef7d570a7757e Mon Sep 17 00:00:00 2001
From: kubel <jakubwitczak6@gmail.com>
Date: Tue, 10 Dec 2024 10:21:08 +0100
Subject: [PATCH 2/2] Increase timeout

---
 foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt b/foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt
index 4e2c9a894..0b35d395f 100644
--- a/foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt
+++ b/foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt
@@ -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)
             }