From ff11e602b543c4f8a05067a09a64d2b5967aaabd Mon Sep 17 00:00:00 2001 From: Tangem Date: Sun, 28 Oct 2018 19:49:25 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 14 +++++++------- .../presentation/activity/SignPaymentActivity.kt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c16fb9fd1e..fd38f4af22 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,11 +10,11 @@ static def generateVersionName() { } android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.tangem.wallet" minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 94 versionName "0.810.1." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -44,11 +44,11 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:support-compat:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:support-compat:28.0.0' + implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'com.android.support:support-v4:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.google.zxing:core:3.3.3' implementation 'com.google.code.gson:gson:2.8.5' diff --git a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt index f29b6063b6..98fc832e51 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt @@ -91,7 +91,7 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card super.onStop() } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) { + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (requestCode == REQUEST_CODE_SEND_PAYMENT) { setResult(resultCode, data) finish()