diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 31a6251038..05a32f4545 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,8 +24,8 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> diff --git a/app/src/main/java/com/tangem/LogFileProvider.java b/app/src/main/java/com/tangem/data/LogFileProvider.java similarity index 99% rename from app/src/main/java/com/tangem/LogFileProvider.java rename to app/src/main/java/com/tangem/data/LogFileProvider.java index 27ca312499..34f18df969 100644 --- a/app/src/main/java/com/tangem/LogFileProvider.java +++ b/app/src/main/java/com/tangem/data/LogFileProvider.java @@ -1,4 +1,4 @@ -package com.tangem; +package com.tangem.data; import android.content.ContentProvider; import android.content.ContentValues; 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 2588f80f28..2f3cb225e0 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java @@ -464,16 +464,26 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap //String mWalletAddress = request.getParams().getString(0); if ((request.getResult().getInt("confirmed") + request.getResult().getInt("unconfirmed")) / mCard.getBlockchain().getMultiplier() * 1000000.0 < Float.parseFloat(etAmount.getText().toString())) { etFee.setError("Not enough funds"); - balanceRequestSuccess = false; - btnSend.setVisibility(View.INVISIBLE); - dtVerifyed = null; - nodeCheck = false; + if (sharedCounter == null) { + balanceRequestSuccess = false; + btnSend.setVisibility(View.INVISIBLE); + dtVerifyed = null; + nodeCheck = false; + } else { + int errCounter = sharedCounter.errorRequest.incrementAndGet(); + if (errCounter >= sharedCounter.allRequest) { + balanceRequestSuccess = false; + btnSend.setVisibility(View.INVISIBLE); + dtVerifyed = null; + nodeCheck = false; + } + } + } else { etFee.setError(null); balanceRequestSuccess = true; if (feeRequestSuccess && balanceRequestSuccess) { btnSend.setVisibility(View.VISIBLE); - } dtVerifyed = new Date(); nodeCheck = true; diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java index 92d04e431c..86f9b38d0b 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java @@ -30,13 +30,13 @@ import android.widget.TextView; import com.scottyab.rootbeer.RootBeer; import com.skyfishjy.library.RippleBackground; -import com.tangem.LogFileProvider; +import com.tangem.data.LogFileProvider; import com.tangem.domain.wallet.DeviceNFCAntennaLocation; import com.tangem.domain.wallet.LastSignStorage; import com.tangem.domain.wallet.Logger; import com.tangem.domain.wallet.PINStorage; -import com.tangem.util.PhoneUtility; import com.tangem.presentation.fragment.MainFragment; +import com.tangem.util.PhoneUtility; import com.tangem.wallet.BuildConfig; import com.tangem.wallet.R;