Updated on 2026-08-14

This commit is contained in:
Tangem 2018-10-28 19:49:25 +03:00
parent 96c04894eb
commit ff11e602b5
2 changed files with 8 additions and 8 deletions

View file

@ -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'

View file

@ -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()