From b6517aeac055c2901846f5829920fca59f110df8 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 3 Jul 2018 13:25:44 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .idea/caches/build_file_checksums.ser | Bin 536 -> 536 bytes app/build.gradle | 2 +- .../activity/ConfirmPaymentActivity.java | 12 +++++++----- .../presentation/fragment/LoadedWallet.java | 5 ++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a3726af32f83e0df6446ca7d08802eb67401c610..bbfd3f9a72ecb6e5dd92478172a0a797fc6e8e2b 100644 GIT binary patch delta 33 rcmV++0N($Y1egSnm;_talZ&yOYXK25cpTS00g{}dmo|&=j?Q6t=kgAw delta 33 pcmbQiGJ|Ep3>LS;P3{}#WHSoRXb-e}Jx926Q8tt0tMje)6#(L(4e9^@ diff --git a/app/build.gradle b/app/build.gradle index 98e0e77a85..625d07fe40 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" } diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java index fca13d0111..27a06193a5 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java @@ -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++; diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java index 8311f8cd2a..ad8aadd1a7 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java @@ -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; } }