Release 6.4.1

Author: jenkins-mobile

.version

@@ -1 +1 @@
-6.4.0
+6.4.1

.version_code

@@ -1 +1 @@
-6040000
+6040100

CHANGELOG.md

@@ -5,6 +5,12 @@
 ### NEXT_VERSION_DESCRIPTION_BEGIN
 ### NEXT_VERSION_DESCRIPTION_END
 
+## [6.4.1] (12-10-2021)
+
+- Fixed proguard rules for packages
+- Updated auth-sdk library
+- Replaced <fragment> FragmentContainerView
+
 ## [6.4.0] (29-09-2021)
 
 - Added getting static data in the config

build.gradle

@@ -28,13 +28,13 @@ allprojects {
 applyFromFileIfExists('buildInternal.gradle')
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.32'
     ext.dokka_version = '0.9.17'
     ext.okhttp_version = '4.3.1'
     ext.mockito_version = '2.19.0'
     ext.espresso_version = '3.0.1'
     ext.gson_version = '2.8.6'
-    ext.yoo_sdk_auth_version = '1.3.12'
+    ext.yoo_sdk_auth_version = '1.3.23'
     ext.ui_lib_version = '1.27.0'
     ext.march_lib_version = "1.0.4"
     ext.junit = '4.13'
@@ -47,7 +47,7 @@ buildscript {
     ext.espresso_web = '3.3.0'
     ext.androidx_junit = '1.1.2'
 
-    ext.target_sdk_version = 29
+    ext.target_sdk_version = 30
 
     repositories {
         google()
@@ -60,7 +60,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6'

gradle/wrapper/gradle-wrapper.properties

@@ -19,9 +19,9 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #
 
-#Thu Jul 01 18:28:53 MSK 2021
+#Mon Oct 04 15:46:42 MSK 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

library/build.gradle

@@ -32,7 +32,7 @@ ext {
 
 android {
     compileSdkVersion target_sdk_version
-    buildToolsVersion "30.0.3"
+    buildToolsVersion "30.0.2"
 
     resourcePrefix 'ym_'
 

library/proguard-rules.pro

@@ -34,6 +34,9 @@
 -keep class ru.yoomoney.sdk.kassa.payments.ui.** { *; }
 -keep class androidx.lifecycle.ViewModelKeyedFactory { *; }
 
+-keeppackagenames ru.yoomoney.sdk.kassa.payments.**
+-keeppackagenames ru.yoomoney.sdk.kassa.payments
+
 -dontwarn javax.annotation.Nullable
 -dontwarn org.conscrypt.OpenSSLProvider
 -dontwarn org.conscrypt.Conscrypt

library/src/main/AndroidManifest.xml

@@ -25,6 +25,10 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <queries>
+        <package android:name="ru.sberbankmobile" />
+    </queries>
+
     <application>
         <activity
             android:name="ru.yoomoney.sdk.kassa.payments.utils.WebViewActivity"

library/src/main/java/ru/yoomoney/sdk/kassa/payments/contract/di/ContractModule.kt

@@ -34,7 +34,6 @@ import ru.yoomoney.sdk.kassa.payments.checkoutParameters.PaymentParameters
 import ru.yoomoney.sdk.kassa.payments.checkoutParameters.TestParameters
 import ru.yoomoney.sdk.kassa.payments.di.TokenStorageModule
 import ru.yoomoney.sdk.kassa.payments.di.ViewModelKey
-import ru.yoomoney.sdk.kassa.payments.tmx.ProfilingTool
 import ru.yoomoney.sdk.kassa.payments.tmx.TmxSessionIdStorage
 import ru.yoomoney.sdk.kassa.payments.secure.TokensStorage
 import ru.yoomoney.sdk.kassa.payments.contract.Contract
@@ -72,6 +71,7 @@ import ru.yoomoney.sdk.kassa.payments.model.GetConfirmation
 import ru.yoomoney.sdk.kassa.payments.paymentOptionList.ConfigUseCase
 import ru.yoomoney.sdk.kassa.payments.paymentOptionList.ShopPropertiesRepository
 import ru.yoomoney.sdk.kassa.payments.utils.getSberbankPackage
+import ru.yoomoney.sdk.tmx.TmxProfiler
 
 @Module
 internal class ContractModule {
@@ -83,7 +83,7 @@ internal class ContractModule {
         httpClient: CheckoutOkHttpClient,
         tokensStorage: TokensStorage,
         paymentParameters: PaymentParameters,
-        profilingTool: ProfilingTool,
+        profiler: TmxProfiler,
         tmxSessionIdStorage: TmxSessionIdStorage,
         configUseCase: ConfigUseCase
     ): TokenizeRepository {
@@ -96,7 +96,7 @@ internal class ContractModule {
                 httpClient = lazy { httpClient },
                 shopToken = paymentParameters.clientApplicationKey,
                 paymentAuthTokenRepository = tokensStorage,
-                profilingTool = profilingTool,
+                profiler = profiler,
                 tmxSessionIdStorage = tmxSessionIdStorage,
                 configUseCase = configUseCase,
                 merchantCustomerId = paymentParameters.customerId

library/src/main/java/ru/yoomoney/sdk/kassa/payments/di/CoreModule.kt

@@ -31,8 +31,6 @@ import ru.yoomoney.sdk.kassa.payments.checkoutParameters.PaymentParameters
 import ru.yoomoney.sdk.kassa.payments.checkoutParameters.TestParameters
 import ru.yoomoney.sdk.kassa.payments.payment.PaymentMethodRepository
 import ru.yoomoney.sdk.kassa.payments.payment.PaymentMethodRepositoryImpl
-import ru.yoomoney.sdk.kassa.payments.tmx.ProfilingTool
-import ru.yoomoney.sdk.kassa.payments.tmx.ThreatMetrixProfilingTool
 import ru.yoomoney.sdk.kassa.payments.tmx.TmxSessionIdStorage
 import ru.yoomoney.sdk.kassa.payments.navigation.AppRouter
 import ru.yoomoney.sdk.kassa.payments.navigation.Router
@@ -45,6 +43,7 @@ import ru.yoomoney.sdk.kassa.payments.model.GetConfirmation
 import ru.yoomoney.sdk.kassa.payments.model.PaymentOption
 import ru.yoomoney.sdk.kassa.payments.utils.DEFAULT_REDIRECT_URL
 import ru.yoomoney.sdk.kassa.payments.utils.getSberbankPackage
+import ru.yoomoney.sdk.tmx.TmxProfiler
 import javax.inject.Singleton
 
 @Module
@@ -89,10 +88,8 @@ internal class CoreModule {
 
     @Provides
     @Singleton
-    fun profilingTool(context: Context): ProfilingTool {
-        return ThreatMetrixProfilingTool().apply {
-            init(context.applicationContext)
-        }
+    fun tmxProfiler(context: Context): TmxProfiler {
+        return TmxProfiler.create(context)
     }
 
     @Provides

library/src/main/java/ru/yoomoney/sdk/kassa/payments/payment/tokenize/ApiV3TokenizeRepository.kt

@@ -33,34 +33,20 @@ import ru.yoomoney.sdk.kassa.payments.model.PaymentOption
 import ru.yoomoney.sdk.kassa.payments.model.PaymentOptionInfo
 import ru.yoomoney.sdk.kassa.payments.model.Result
 import ru.yoomoney.sdk.kassa.payments.paymentAuth.PaymentAuthTokenRepository
-import ru.yoomoney.sdk.kassa.payments.tmx.ProfilingTool
 import ru.yoomoney.sdk.kassa.payments.tmx.TmxSessionIdStorage
 import ru.yoomoney.sdk.kassa.payments.paymentOptionList.ConfigUseCase
-import java.util.concurrent.Semaphore
+import ru.yoomoney.sdk.tmx.TmxProfiler
 
 internal class ApiV3TokenizeRepository(
     private val hostProvider: HostProvider,
     private val httpClient: Lazy<CheckoutOkHttpClient>,
     private val shopToken: String,
     private val paymentAuthTokenRepository: PaymentAuthTokenRepository,
     private val tmxSessionIdStorage: TmxSessionIdStorage,
-    private val profilingTool: ProfilingTool,
+    private val profiler: TmxProfiler,
     private val configUseCase: ConfigUseCase,
     private val merchantCustomerId: String?
-) : TokenizeRepository, ProfilingTool.SessionIdListener {
-
-    private var tmxSessionId: String? = null
-    private val semaphore = Semaphore(0)
-
-    override fun onProfilingSessionId(sessionId: String) {
-        tmxSessionId = sessionId
-        semaphore.release()
-    }
-
-    override fun onProfilingError(status: String) {
-        tmxSessionId = status
-        semaphore.release()
-    }
+) : TokenizeRepository {
 
     override fun getToken(
         paymentOption: PaymentOption,
@@ -83,9 +69,7 @@ internal class ApiV3TokenizeRepository(
             savePaymentInstrument = savePaymentInstrument,
             merchantCustomerId = merchantCustomerId
         )
-        tmxSessionId = null
         tmxSessionIdStorage.tmxSessionId = null
-
         return httpClient.value.execute(tokenRequest)
     }
 
@@ -113,10 +97,12 @@ internal class ApiV3TokenizeRepository(
     }
 
     private fun acquireTmxSessionId(): String? {
-        tmxSessionId = tmxSessionIdStorage.tmxSessionId
+        val tmxSessionId = tmxSessionIdStorage.tmxSessionId
         if (tmxSessionId.isNullOrEmpty()) {
-            profilingTool.requestSessionId(this)
-            semaphore.acquire()
+            return when (val result = profiler.profile()) {
+                is TmxProfiler.Result.Success -> result.sessionId
+                is TmxProfiler.Result.Fail -> result.description
+            }
         }
         return tmxSessionId
     }

library/src/main/java/ru/yoomoney/sdk/kassa/payments/paymentAuth/ApiV3PaymentAuthRepository.kt

@@ -25,7 +25,6 @@ import android.os.Build
 import ru.yoomoney.sdk.kassa.payments.checkoutParameters.Amount
 import ru.yoomoney.sdk.kassa.payments.extensions.CheckoutOkHttpClient
 import ru.yoomoney.sdk.kassa.payments.model.AuthCheckApiMethodException
-import ru.yoomoney.sdk.kassa.payments.tmx.ProfilingTool
 import ru.yoomoney.sdk.kassa.payments.tmx.TmxSessionIdStorage
 import ru.yoomoney.sdk.kassa.payments.secure.TokensStorage
 import ru.yoomoney.sdk.kassa.payments.extensions.execute
@@ -42,25 +41,22 @@ import ru.yoomoney.sdk.kassa.payments.model.CurrentUser
 import ru.yoomoney.sdk.kassa.payments.model.ErrorCode
 import ru.yoomoney.sdk.kassa.payments.model.Result
 import ru.yoomoney.sdk.kassa.payments.model.map
+import ru.yoomoney.sdk.tmx.TmxProfiler
 import java.lang.IllegalStateException
-import java.util.concurrent.Semaphore
 
 internal class ApiV3PaymentAuthRepository(
     private val hostProvider: HostProvider,
     private val httpClient: Lazy<CheckoutOkHttpClient>,
     private val tokensStorage: TokensStorage,
     private val shopToken: String,
     private val tmxSessionIdStorage: TmxSessionIdStorage,
-    private val profilingTool: ProfilingTool,
+    private val profiler: TmxProfiler,
     private val selectAppropriateAuthType: (AuthType, Array<AuthTypeState>) -> AuthTypeState
-) : PaymentAuthTypeRepository, ProcessPaymentAuthRepository, ProfilingTool.SessionIdListener,
-    SmsSessionRetryRepository {
+) : PaymentAuthTypeRepository, ProcessPaymentAuthRepository, SmsSessionRetryRepository {
 
     private var processId: String? = null
     private var authContextId: String? = null
     private var authType: AuthType = AuthType.UNKNOWN
-    private var tmxSessionId: String? = null
-    private val tmxSessionIdSemaphore = Semaphore(0)
 
     override fun getPaymentAuthToken(
         currentUser: CurrentUser,
@@ -164,15 +160,15 @@ internal class ApiV3PaymentAuthRepository(
         amount: Amount,
         multipleUsage: Boolean
     ): Result<CheckoutTokenIssueInitResponse> {
-        tmxSessionId = tmxSessionIdStorage.tmxSessionId
+        var tmxSessionId = tmxSessionIdStorage.tmxSessionId
 
         if (tmxSessionId.isNullOrEmpty()) {
-            profilingTool.requestSessionId(this)
-            tmxSessionIdSemaphore.acquire()
+            tmxSessionId = when(val result = profiler.profile()) {
+                is TmxProfiler.Result.Success -> result.sessionId
+                is TmxProfiler.Result.Fail -> result.description
+            }
         }
 
-        tmxSessionId ?: return Result.Fail(IllegalStateException())
-
         val request = CheckoutTokenIssueInitRequest(
             instanceName = Build.MANUFACTURER + ", " + Build.MODEL,
             singleAmountMax = amount,
@@ -209,14 +205,4 @@ internal class ApiV3PaymentAuthRepository(
         val userAuthToken: String = tokensStorage.userAuthToken ?: return Result.Fail(IllegalStateException())
         return authSessionGenerate(userAuthToken)
     }
-
-    override fun onProfilingSessionId(sessionId: String) {
-        tmxSessionId = sessionId
-        tmxSessionIdSemaphore.release()
-    }
-
-    override fun onProfilingError(status: String) {
-        tmxSessionId = status
-        tmxSessionIdSemaphore.release()
-    }
 }

library/src/main/java/ru/yoomoney/sdk/kassa/payments/paymentAuth/di/PaymentAuthModule.kt

@@ -31,7 +31,6 @@ import ru.yoomoney.sdk.kassa.payments.di.ViewModelKey
 import ru.yoomoney.sdk.kassa.payments.extensions.CheckoutOkHttpClient
 import ru.yoomoney.sdk.kassa.payments.http.HostProvider
 import ru.yoomoney.sdk.kassa.payments.metrics.ErrorReporter
-import ru.yoomoney.sdk.kassa.payments.tmx.ProfilingTool
 import ru.yoomoney.sdk.kassa.payments.tmx.TmxSessionIdStorage
 import ru.yoomoney.sdk.kassa.payments.secure.TokensStorage
 import ru.yoomoney.sdk.kassa.payments.metrics.Reporter
@@ -55,6 +54,7 @@ import ru.yoomoney.sdk.kassa.payments.paymentAuth.SmsSessionRetryRepository
 import ru.yoomoney.sdk.march.Out
 import ru.yoomoney.sdk.march.RuntimeViewModel
 import ru.yoomoney.sdk.march.input
+import ru.yoomoney.sdk.tmx.TmxProfiler
 import javax.inject.Singleton
 
 @Module
@@ -67,15 +67,15 @@ internal class PaymentAuthModule {
         hostProvider: HostProvider,
         tokensStorage: TokensStorage,
         paymentParameters: PaymentParameters,
-        profilingTool: ProfilingTool,
+        profiler: TmxProfiler,
         tmxSessionIdStorage: TmxSessionIdStorage
     ): ApiV3PaymentAuthRepository {
         return ApiV3PaymentAuthRepository(
             httpClient = lazy { httpClient },
             tokensStorage = tokensStorage,
             shopToken = paymentParameters.clientApplicationKey,
             tmxSessionIdStorage = tmxSessionIdStorage,
-            profilingTool = profilingTool,
+            profiler = profiler,
             selectAppropriateAuthType = SelectAppropriateAuthType(),
             hostProvider = hostProvider
         )