diff --git a/app/build.gradle.kts b/app/build.gradle.kts index efb9091555..2de49eab54 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,6 +28,7 @@ android { packaging { jniLibs { useLegacyPackaging = true + excludes.add("lib/x86_64/libargon2.so") } resources.excludes.add("META-INF/LICENSE.md") resources.excludes.add("META-INF/NOTICE.md") @@ -96,6 +97,9 @@ configurations.all { force( "org.bouncycastle:bcpkix-jdk15on:1.70", + deps.kotlin.coroutines, + deps.kotlin.coroutines.jvm, + deps.kotlin.coroutines.android, ) } } diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt index b67450f4cc..650803d430 100644 --- a/app/src/main/java/com/tangem/tap/MainActivity.kt +++ b/app/src/main/java/com/tangem/tap/MainActivity.kt @@ -367,17 +367,15 @@ class MainActivity : AppCompatActivity(), ActivityResultCallbackHolder { } } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) - val isFromPush = intent?.extras?.containsKey(OPENED_FROM_GCM_PUSH) == true + val isFromPush = intent.extras?.containsKey(OPENED_FROM_GCM_PUSH) == true if (isFromPush) { analyticsEventsHandler.send(Push.PushNotificationOpened) } - if (intent != null) { - handleDeepLink(intent = intent, isFromOnNewIntent = true) - } + handleDeepLink(intent = intent, isFromOnNewIntent = true) } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 6246ba9464..34e16dd458 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -51,7 +51,7 @@ amplitude = "2.36.1" armadillo = "0.9.0" coil = "2.1.0" compose-shimmer = "1.0.3" -coroutine = "1.7.2" # 1.8+ is not compatible with tangem-sdk +coroutine = "1.8.1" # 1.9+ is not compatible with tangem-sdk desugarJdkLibs = "1.1.5" firebase = "33.10.0" googleMaterialComponent = "1.6.1" @@ -80,8 +80,8 @@ zxingQrCode = "3.5.1" kotlinSerialization = "1.8.0" kotlinDatetime = "0.6.2" arrow = "1.2.4" # 2.0.1 breaks the build -reownCore = "1.4.9" -reownWeb3 = "1.4.9" +reownCore = "1.4.11" +reownWeb3 = "1.4.11" prettyLogger = "2.2.0" okHttp-prettyLogging = "3.1.0" chucker = "4.0.0" @@ -96,7 +96,7 @@ room = "2.6.1" markdown = "0.7.2" markdownComposeView = "0.5.4" usedesk = "4.4.0" -sumsub = "1.35.1" +sumsub = "1.37.1" # endregion Other libraries # region Tools @@ -241,6 +241,7 @@ coil = { module = "io.coil-kt:coil", version.ref = "coil" } coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" } coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coil" } kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutine" } +kotlin-coroutines-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "coroutine" } kotlin-coroutines-rx2 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-rx2", version.ref = "coroutine" } kotlin-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutine" } kotlin-immutable-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlin-immutable-collections" }