From 3da5e389731754d9085ad4946724956de28253c5 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 10 Jan 2019 16:46:15 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../java/com/tangem/data/network/model/InsightResponse.kt | 2 +- .../java/com/tangem/domain/wallet/bch/BtcCashEngine.java | 5 +---- app/src/main/java/com/tangem/domain/wallet/btc/BtcData.java | 6 +++--- .../main/java/com/tangem/domain/wallet/btc/BtcEngine.java | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/tangem/data/network/model/InsightResponse.kt b/app/src/main/java/com/tangem/data/network/model/InsightResponse.kt index f9b86479b8..4910b36695 100644 --- a/app/src/main/java/com/tangem/data/network/model/InsightResponse.kt +++ b/app/src/main/java/com/tangem/data/network/model/InsightResponse.kt @@ -16,7 +16,7 @@ data class InsightResponse( var txid: String = "", @SerializedName("satoshis") - var satoshis: Int? = null, + var satoshis: Long? = null, @SerializedName("height") var height: Int? = null, diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java index 61c55ba38f..bca4b4cb3d 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java @@ -5,13 +5,11 @@ import android.text.InputFilter; import android.util.Log; import com.tangem.data.network.ElectrumRequest; -import com.tangem.data.network.ServerApiCommon; import com.tangem.data.network.ServerApiElectrum; import com.tangem.domain.wallet.BCHUtils; import com.tangem.domain.wallet.BTCUtils; import com.tangem.tangemcard.reader.CardProtocol; import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.data.Blockchain; import com.tangem.domain.wallet.btc.BtcData; import com.tangem.domain.wallet.CoinData; import com.tangem.domain.wallet.CoinEngine; @@ -24,7 +22,6 @@ import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; import com.tangem.tangemcard.util.Util; -import com.tangem.util.FormatUtil; import com.tangem.wallet.R; import org.json.JSONArray; @@ -594,7 +591,7 @@ public class BtcCashEngine extends CoinEngine { JSONObject jsUnspent = jsUnspentArray.getJSONObject(i); BtcData.UnspentTransaction trUnspent = new BtcData.UnspentTransaction(); trUnspent.txID = jsUnspent.getString("tx_hash"); - trUnspent.Amount = jsUnspent.getInt("value"); + trUnspent.Amount = jsUnspent.getLong("value"); trUnspent.Height = jsUnspent.getInt("height"); coinData.getUnspentTransactions().add(trUnspent); } diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BtcData.java b/app/src/main/java/com/tangem/domain/wallet/btc/BtcData.java index f036a85aa0..5a40f1ae6a 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BtcData.java +++ b/app/src/main/java/com/tangem/domain/wallet/btc/BtcData.java @@ -35,14 +35,14 @@ public class BtcData extends CoinData { public static class UnspentTransaction { public String txID; - public Integer Amount; + public Long Amount; public Integer Height; public String Raw = ""; public Bundle getAsBundle() { Bundle B = new Bundle(); B.putString("txID", txID); - B.putInt("Amount", Amount); + B.putLong("Amount", Amount); B.putInt("Height", Height); B.putString("Raw", Raw); return B; @@ -50,7 +50,7 @@ public class BtcData extends CoinData { public void loadFromBundle(Bundle B) { txID = B.getString("txID"); - Amount = B.getInt("Amount"); + Amount = B.getLong("Amount"); Height = B.getInt("Height"); Raw = B.getString("Raw"); } diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java index 80f0e11d56..42b0073218 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java @@ -561,7 +561,7 @@ public class BtcEngine extends CoinEngine { JSONObject jsUnspent = jsUnspentArray.getJSONObject(i); BtcData.UnspentTransaction trUnspent = new BtcData.UnspentTransaction(); trUnspent.txID = jsUnspent.getString("tx_hash"); - trUnspent.Amount = jsUnspent.getInt("value"); + trUnspent.Amount = jsUnspent.getLong("value"); trUnspent.Height = jsUnspent.getInt("height"); coinData.getUnspentTransactions().add(trUnspent); }