diff --git a/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java index 2acdefb4bc..f5614c7d03 100644 --- a/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java @@ -275,11 +275,11 @@ public class BtcCashEngine extends CoinEngine { // return; // } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && coinData.getBalanceInInternalUnits().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); +// } // if(card.getFailedBalanceRequestCounter()!=0) { // score -= 5 * card.getFailedBalanceRequestCounter(); diff --git a/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java b/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java index 9d4a9be074..48ae73ef42 100644 --- a/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java +++ b/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java @@ -247,11 +247,11 @@ public class BinanceEngine extends CoinEngine { } } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && coinData.getBalance().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); +// } return true; } catch (Exception e) { diff --git a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java index fd49ed7ec4..49da3cd0a5 100644 --- a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java @@ -310,11 +310,11 @@ public class BtcEngine extends CoinEngine { // return; // } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && coinData.getBalanceInInternalUnits().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); +// } // if(card.getFailedBalanceRequestCounter()!=0) { // score -= 5 * card.getFailedBalanceRequestCounter(); diff --git a/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java index 3b7792df59..e51226a99b 100644 --- a/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java +++ b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java @@ -251,11 +251,11 @@ public class CardanoEngine extends CoinEngine { } } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && coinData.getBalanceInInternalUnits().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); +// } return true; } catch (Exception e) { diff --git a/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java index 17e8b9789c..f79127ae7f 100644 --- a/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java +++ b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java @@ -263,11 +263,11 @@ public class DucatusEngine extends BtcEngine { // return; // } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && coinData.getBalanceInInternalUnits().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); +// } // if(card.getFailedBalanceRequestCounter()!=0) { // score -= 5 * card.getFailedBalanceRequestCounter(); diff --git a/app/src/main/java/com/tangem/wallet/eos/EosEngine.java b/app/src/main/java/com/tangem/wallet/eos/EosEngine.java index 47ee91442f..f667cfd0ef 100644 --- a/app/src/main/java/com/tangem/wallet/eos/EosEngine.java +++ b/app/src/main/java/com/tangem/wallet/eos/EosEngine.java @@ -293,11 +293,11 @@ public class EosEngine extends CoinEngine { } } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && getBalance().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_verify_online); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_verify_online); +// } return true; diff --git a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java index 839d066aa1..76e23e4771 100644 --- a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java +++ b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java @@ -334,11 +334,11 @@ public class EthEngine extends CoinEngine { } } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && getBalance().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_verify_online); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_verify_online); +// } return true; diff --git a/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java index 7402e658d9..45e9749077 100644 --- a/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java @@ -275,11 +275,11 @@ public class LtcEngine extends BtcEngine { // return; // } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && coinData.getBalanceInInternalUnits().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_verify_online); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_verify_online); +// } // if(card.getFailedBalanceRequestCounter()!=0) { // score -= 5 * card.getFailedBalanceRequestCounter(); diff --git a/app/src/main/java/com/tangem/wallet/tezos/TezosEngine.kt b/app/src/main/java/com/tangem/wallet/tezos/TezosEngine.kt index 5ad3c85cf2..2160bd4b86 100644 --- a/app/src/main/java/com/tangem/wallet/tezos/TezosEngine.kt +++ b/app/src/main/java/com/tangem/wallet/tezos/TezosEngine.kt @@ -161,18 +161,17 @@ class TezosEngine : CoinEngine { balanceValidator.setSecondLine(R.string.empty_string) } } - if (ctx.card.offlineBalance != null && - !coinData!!.isBalanceReceived && - ctx.card.remainingSignatures == - ctx.card.maxSignatures && - balance!!.notZero() - ) { - balanceValidator.setScore(80) - balanceValidator.firstLine = R.string.balance_validator_first_line_verified_offline - balanceValidator.setSecondLine( - R.string.balance_validator_second_line_internet_to_get_balance - ) - } +// if (ctx.card.offlineBalance != null && +// !coinData!!.isBalanceReceived && +// ctx.card.remainingSignatures == +// ctx.card.maxSignatures +// ) { +// balanceValidator.setScore(80) +// balanceValidator.firstLine = R.string.balance_validator_first_line_verified_offline +// balanceValidator.setSecondLine( +// R.string.balance_validator_second_line_internet_to_get_balance +// ) +// } return true } catch (e: java.lang.Exception) { e.printStackTrace() diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java index 626b41ff00..394806cda9 100644 --- a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java +++ b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java @@ -275,11 +275,11 @@ public class XlmAssetEngine extends CoinEngine { // return; // } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && coinData.getXlmBalance().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); +// } // if(card.getFailedBalanceRequestCounter()!=0) { // score -= 5 * card.getFailedBalanceRequestCounter(); diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java index 297991bd3f..3e2f6c8f77 100644 --- a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java +++ b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java @@ -76,7 +76,7 @@ public class XlmEngine extends CoinEngine { public String getBalanceHTML() { Amount balance = getBalance(); if (balance != null) { - return " " + balance.toDescriptionString(getDecimals()) + "
+ " + coinData.getReserve().toDescriptionString(getDecimals()) + " reserve1"; + return " " + balance.toDescriptionString(getDecimals()) + "
+ " + coinData.getReserve().toDescriptionString(getDecimals()) + " reserve"; } else { return ""; } @@ -243,11 +243,11 @@ public class XlmEngine extends CoinEngine { // return; // } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures())) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); +// } // if(card.getFailedBalanceRequestCounter()!=0) { // score -= 5 * card.getFailedBalanceRequestCounter(); diff --git a/app/src/main/java/com/tangem/wallet/xlmTag/XlmTagEngine.kt b/app/src/main/java/com/tangem/wallet/xlmTag/XlmTagEngine.kt index 3a4548442d..a21f69f934 100644 --- a/app/src/main/java/com/tangem/wallet/xlmTag/XlmTagEngine.kt +++ b/app/src/main/java/com/tangem/wallet/xlmTag/XlmTagEngine.kt @@ -159,7 +159,6 @@ class XlmTagEngine : CoinEngine { } } - override fun getBalance(): Amount? { return if (!hasBalanceInfo()) null else coinData!!.getBalance()!! } diff --git a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java index 9ae763d5fa..73db5449a5 100644 --- a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java @@ -228,11 +228,11 @@ public class XrpEngine extends CoinEngine { } } - if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && (ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) && coinData.getBalanceInInternalUnits().notZero()) { - balanceValidator.setScore(80); - balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); - balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); - } +// if ((ctx.getCard().getOfflineBalance() != null) && !coinData.isBalanceReceived() && ctx.getCard().getRemainingSignatures() == ctx.getCard().getMaxSignatures()) { +// balanceValidator.setScore(80); +// balanceValidator.setFirstLine(R.string.balance_validator_first_line_verified_offline); +// balanceValidator.setSecondLine(R.string.balance_validator_second_line_internet_to_get_balance); +// } return true; } catch (Exception e) {