diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 55f9bc1ade..e166ede697 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 8e6dd8de35..712d418e90 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ android { minSdkVersion 21 targetSdkVersion 27 versionCode 43 - versionName "0.85.5." + generateVersionName() + versionName "0.87.1." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/com/tangem/domain/cardReader/NfcManager.java b/app/src/main/java/com/tangem/domain/cardReader/NfcManager.java index a1f7592eb8..e9f43fa02e 100644 --- a/app/src/main/java/com/tangem/domain/cardReader/NfcManager.java +++ b/app/src/main/java/com/tangem/domain/cardReader/NfcManager.java @@ -79,20 +79,20 @@ public class NfcManager { int errorCount = 0; public void notifyReadResult(boolean success) { - if (success) { - errorCount = 0; - } else { - errorCount++; - } - if (errorCount >= 3) { - disableReaderMode(); - mNfcAdapter = null; -// Toast.makeText(mActivity,"NFC restarted!",Toast.LENGTH_SHORT).show(); - mActivity.runOnUiThread(() -> { - mNfcAdapter = NfcAdapter.getDefaultAdapter(mActivity); - enableReaderMode(); - }); - } +// if (success) { +// errorCount = 0; +// } else { +// errorCount++; +// } +// if (errorCount >= 3) { +// disableReaderMode(); +// mNfcAdapter = null; +//// Toast.makeText(mActivity,"NFC restarted!",Toast.LENGTH_SHORT).show(); +// mActivity.runOnUiThread(() -> { +// mNfcAdapter = NfcAdapter.getDefaultAdapter(mActivity); +// enableReaderMode(); +// }); +// } } private void showNFCEnableDialog() { diff --git a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java b/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java index 5a5c01e28c..8cafd3c5a7 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java +++ b/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java @@ -67,12 +67,12 @@ public class BalanceValidator { } } - if(card.getFailedBalanceRequestCounter()!=0) { - score -= 5 * card.getFailedBalanceRequestCounter(); - secondLine += "Not all nodes have returned balance. Swipe down or tap again. "; - if(score <= 0) - return; - } +// if(card.getFailedBalanceRequestCounter()!=0) { +// score -= 5 * card.getFailedBalanceRequestCounter(); +// secondLine += "Not all nodes have returned balance. Swipe down or tap again. "; +// if(score <= 0) +// return; +// } // // if(card.isBalanceRecieved() && !card.isBalanceEqual()) { @@ -116,7 +116,7 @@ public class BalanceValidator { { score -= 50; firstLine = "Unguaranteed balance"; - secondLine += "Potential unsent transaction at the moment. Try to tap and check this banknote later. "; + secondLine += "Potential unsent transaction at the moment. Check this banknote later. "; if(score <= 0) return; }