GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2018-07-03 13:25:44 +03:00
parent 4750e3a02d
commit b6517aeac0
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View file

Binary file not shown.

2
app/build.gradle
View file

@ -15,7 +15,7 @@ android {
applicationId "com.tangem.wallet"
minSdkVersion 21
targetSdkVersion 27
versionCode 30
versionCode 31
versionName "0.85.5." + generateVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

12
app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java
View file

@ -61,7 +61,7 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
private boolean feeRequestSuccess = false;
private boolean balanceRequestSuccess = false;
private EditText etWallet;
// private TextView tvAmountEquivalent;
// private TextView tvAmountEquivalent;
// private TextView tvFeeEquivalent;
private EditText etAmount;
private EditText etFee;
@ -569,10 +569,12 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_CODE_SIGN_PAYMENT) {
if (data != null && data.getExtras().containsKey("UID") && data.getExtras().containsKey("Card")) {
TangemCard updatedCard = new TangemCard(data.getStringExtra("UID"));
updatedCard.LoadFromBundle(data.getBundleExtra("Card"));
mCard = updatedCard;
if (data != null && data.getExtras() != null) {
if (data.getExtras().containsKey("UID") && data.getExtras().containsKey("Card")) {
TangemCard updatedCard = new TangemCard(data.getStringExtra("UID"));
updatedCard.LoadFromBundle(data.getBundleExtra("Card"));
mCard = updatedCard;
}
}
if (resultCode == SignPaymentActivity.RESULT_INVALID_PIN && requestPIN2Count < 2) {
requestPIN2Count++;

5
app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java
View file

@ -873,13 +873,13 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
break;
case REQUEST_CODE_SEND_PAYMENT:
if (resultCode == Activity.RESULT_OK) {
// mSwipeRefreshLayout.postDelayed(this::onRefresh, 10000);
mSwipeRefreshLayout.postDelayed(this::onRefresh, 10000);
mSwipeRefreshLayout.setRefreshing(true);
mCard.clearInfo();
updateViews();
}
if (data != null) {
if (data != null && data.getExtras() != null) {
if (data.getExtras().containsKey("UID") && data.getExtras().containsKey("Card")) {
TangemCard updatedCard = new TangemCard(data.getStringExtra("UID"));
updatedCard.LoadFromBundle(data.getBundleExtra("Card"));
@ -894,7 +894,6 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
}
updateViews();
}
break;
}
}