Merge pull request #32 from reown-com/develop

BOM_1.0.4
reown-com · Dec 10, 2024 · 947b366 · 947b366
2 parents 92bc597 + d4296ca
commit 947b366
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -5,14 +5,14 @@ const val KEY_PUBLISH_ARTIFACT_ID = "PUBLISH_ARTIFACT_ID"
 const val KEY_SDK_NAME = "SDK_NAME"
 
 //Latest versions
-const val BOM_VERSION = "1.0.3"
-const val FOUNDATION_VERSION = "1.0.3"
-const val CORE_VERSION = "1.0.3"
-const val SIGN_VERSION = "1.0.3"
-const val NOTIFY_VERSION = "1.0.3"
-const val WALLETKIT_VERSION = "1.0.3"
-const val APPKIT_VERSION = "1.0.3"
-const val MODAL_CORE_VERSION = "1.0.3"
+const val BOM_VERSION = "1.0.4"
+const val FOUNDATION_VERSION = "1.0.4"
+const val CORE_VERSION = "1.0.4"
+const val SIGN_VERSION = "1.0.4"
+const val NOTIFY_VERSION = "1.0.4"
+const val WALLETKIT_VERSION = "1.0.4"
+const val APPKIT_VERSION = "1.0.4"
+const val MODAL_CORE_VERSION = "1.0.4"
 
 //Artifact ids
 const val ANDROID_BOM = "android-bom"

diff --git 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
@@ -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/foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt b/foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt
@@ -95,11 +95,23 @@ class RelayTest {
             }
         }.launchIn(testScope)
 
+        clientB.eventsFlow.onEach { event ->
+            when (event) {
+                is Relay.Model.Event.OnConnectionFailed -> {
+                    if (event.throwable.message?.contains("403") == true) {
+                        testState.compareAndSet(expect = TestState.Idle, update = TestState.Success)
+                    }
+                }
+
+                else -> {}
+            }
+        }.launchIn(testScope)
+
         //Lock until is finished or timed out
         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)
             }
 

diff --git 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" }