diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f2a76fa4e7..45b2362297 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 b18e4fc67c..ced2006090 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 27 - versionCode 40 + versionCode 41 versionName "0.85.5." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/tangem/data/network/task/loaded_wallet/UpdateWalletInfoTask.java b/app/src/main/java/com/tangem/data/network/task/loaded_wallet/UpdateWalletInfoTask.java index 4a2331aef4..11e4589380 100644 --- a/app/src/main/java/com/tangem/data/network/task/loaded_wallet/UpdateWalletInfoTask.java +++ b/app/src/main/java/com/tangem/data/network/task/loaded_wallet/UpdateWalletInfoTask.java @@ -1,7 +1,6 @@ package com.tangem.data.network.task.loaded_wallet; import android.os.AsyncTask; -import android.widget.Toast; import com.tangem.data.network.request.ElectrumRequest; import com.tangem.data.network.task.ElectrumTask; @@ -315,8 +314,6 @@ public class UpdateWalletInfoTask extends ElectrumTask { } catch (NullPointerException e) { e.printStackTrace(); - Toast.makeText(reference.get().getContext(), "NullPointerException", Toast.LENGTH_LONG).show(); - if (reference.get() != null) { reference.get().mSwipeRefreshLayout.setRefreshing(false); } 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 941b1cff92..a1f7592eb8 100644 --- a/app/src/main/java/com/tangem/domain/cardReader/NfcManager.java +++ b/app/src/main/java/com/tangem/domain/cardReader/NfcManager.java @@ -15,7 +15,6 @@ import android.os.Build; import android.os.Bundle; import android.support.v4.app.ActivityCompat; import android.util.Log; -import android.widget.Toast; import com.tangem.presentation.dialog.NFCEnableDialog; @@ -77,21 +76,19 @@ public class NfcManager { // } } - int errorCount=0; - public void notifyReadResult(boolean success) - { - if(success) - { - errorCount=0; - }else{ + int errorCount = 0; + + public void notifyReadResult(boolean success) { + if (success) { + errorCount = 0; + } else { errorCount++; } - if( errorCount>=3 ) - { + if (errorCount >= 3) { disableReaderMode(); - mNfcAdapter=null; - Toast.makeText(mActivity,"NFC restarted!",Toast.LENGTH_SHORT).show(); - mActivity.runOnUiThread(()->{ + mNfcAdapter = null; +// Toast.makeText(mActivity,"NFC restarted!",Toast.LENGTH_SHORT).show(); + mActivity.runOnUiThread(() -> { mNfcAdapter = NfcAdapter.getDefaultAdapter(mActivity); enableReaderMode(); });