Merge pull request #71 from TinkoffCreditSystems/2.5.2

Send "connection_type" and "sdk_version" in Init request
tinkoff-mobile-tech · Dec 1, 2021 · bf40254 · bf40254
2 parents bd0f2da + 1999d30
commit bf40254
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,10 @@
+## 2.5.2
+
+#### Fixed
+#### Changes
+#### Additions
+Send "connection_type" and "sdk_version" in Init request
+
 ## 2.5.1
 
 #### Fixed

diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/AcquiringRequest.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/AcquiringRequest.kt
@@ -115,5 +115,7 @@ abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: S
         const val DATA_TYPE = "DataType"
         const val REDIRECT_DUE_DATE = "RedirectDueDate"
         const val IP = "IP"
+        const val CONNECTION_TYPE = "connection_type"
+        const val SDK_VERSION = "sdk_version"
     }
 }
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/InitRequest.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/InitRequest.kt
@@ -119,6 +119,8 @@ class InitRequest : AcquiringRequest<InitResponse>(INIT_METHOD) {
             }
         }
 
+    var sdkVersion: String? = null
+
     private var redirectDueDateFormat: String? = null
     private val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault())
 
@@ -166,10 +168,13 @@ class InitRequest : AcquiringRequest<InitResponse>(INIT_METHOD) {
         }
 
         dataMap[CHARGE_FLAG] = chargeFlag.toString()
+        dataMap[CONNECTION_TYPE] = CONNECTION_TYPE_MOBILE_SDK
+        sdkVersion?.let { dataMap[SDK_VERSION] = it }
         this[DATA] = dataMap
     }
 
     companion object {
         private const val RECURRENT_FLAG_Y = "Y"
+        private const val CONNECTION_TYPE_MOBILE_SDK = "mobile_sdk"
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.5.1
+VERSION_NAME=2.5.2
 VERSION_CODE=15
 GROUP=ru.tinkoff.acquiring
 

diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentProcess.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentProcess.kt
@@ -17,6 +17,7 @@
 package ru.tinkoff.acquiring.sdk.payment
 
 import ru.tinkoff.acquiring.sdk.AcquiringSdk
+import ru.tinkoff.acquiring.sdk.BuildConfig
 import ru.tinkoff.acquiring.sdk.exceptions.AcquiringApiException
 import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization
 import ru.tinkoff.acquiring.sdk.models.AsdkState
@@ -364,6 +365,7 @@ class PaymentProcess internal constructor(private val sdk: AcquiringSdk) {
             data = order.additionalData
             customerKey = paymentOptions.customer.customerKey
             language = AsdkLocalization.language.name
+            sdkVersion = BuildConfig.VERSION_NAME
         }
     }
 

diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/QrViewModel.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/QrViewModel.kt
@@ -19,6 +19,7 @@ package ru.tinkoff.acquiring.sdk.viewmodel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import ru.tinkoff.acquiring.sdk.AcquiringSdk
+import ru.tinkoff.acquiring.sdk.BuildConfig
 import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization
 import ru.tinkoff.acquiring.sdk.models.DefaultScreenState
 import ru.tinkoff.acquiring.sdk.models.LoadedState
@@ -134,6 +135,7 @@ internal class QrViewModel(handleErrorsInSdk: Boolean, sdk: AcquiringSdk) : Base
             data = order.additionalData
             customerKey = paymentOptions.customer.customerKey
             language = AsdkLocalization.language.name
+            sdkVersion = BuildConfig.VERSION_NAME
         }
     }
 }