Merge pull request #74 from TinkoffCreditSystems/2.5.4

Fixed crash during 3DS Method v2.x when `threeDsMethodUrl` is absent
tinkoff-mobile-tech · Dec 13, 2021 · 573da55 · 573da55
2 parents b6cd0c0 + a86ca6b
commit 573da55
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,10 @@
+## 2.5.4
+
+#### Fixed
+Fixed crash during 3DS Method v2.x when `threeDsMethodUrl` is absent
+#### Changes
+#### Additions
+
 ## 2.5.3
 
 #### Fixed

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.5.3
+VERSION_NAME=2.5.4
 VERSION_CODE=15
 GROUP=ru.tinkoff.acquiring
 

diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/AsdkState.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/AsdkState.kt
@@ -58,7 +58,7 @@ class ThreeDsState(val data: ThreeDsData) : AsdkState()
 /**
  * Состояние, когда необходимо собрать информацию об устройстве для прохождения 3DS
  */
-class CollectDataState(val response: Check3dsVersionResponse?) : AsdkState() {
+class CollectDataState(val response: Check3dsVersionResponse) : AsdkState() {
     var data: MutableMap<String, String> = mutableMapOf()
 }
 

diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/ViewState.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/ViewState.kt
@@ -34,7 +34,7 @@ internal object FpsScreenState: Screen()
 internal class BrowseFpsBankScreenState(val paymentId: Long, val deepLink: String, val banks: Set<Any?>?) : Screen()
 internal class RejectedCardScreenState(val cardId: String, val rejectedPaymentId: Long) : Screen()
 internal class ThreeDsScreenState(val data: ThreeDsData) : Screen()
-internal class ThreeDsDataCollectScreenState(val response: Check3dsVersionResponse?) : Screen()
+internal class ThreeDsDataCollectScreenState(val response: Check3dsVersionResponse) : Screen()
 internal class LoopConfirmationScreenState(val requestKey: String) : Screen()
 
 internal sealed class LoadState : ScreenState()

diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/ThreeDsActivity.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/ThreeDsActivity.kt
@@ -83,9 +83,9 @@ internal class ThreeDsActivity : BaseAcquiringActivity() {
             return intent
         }
 
-        fun collectData(context: Context, response: Check3dsVersionResponse?): MutableMap<String, String> {
+        fun collectData(context: Context, response: Check3dsVersionResponse): MutableMap<String, String> {
             var threeDSCompInd = THREE_DS_NOT_CALLED_FLAG
-            if (response != null) {
+            if (response.threeDsMethodUrl != null) {
                 val hiddenWebView = WebView(context)
 
                 val threeDsMethodData = JSONObject().apply {