lukechilds
/
cobo-vault-cold
mirror of https://github.com/lukechilds/cobo-vault-cold.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix utxo coins UI display, fix scan qrcode crash

V1.1.0-release
ZhangJun 5 years ago
parent
9f32732d68
commit
ff71031a3c
6 changed files with 24 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/com/cobo/cold/ui/fragment/main/QRCodeScanFragment.java
  2. 10
      app/src/main/java/com/cobo/cold/ui/fragment/main/TransactionItem.java
  3. 6
      app/src/main/java/com/cobo/cold/ui/fragment/main/TxConfirmFragment.java
  4. 6
      app/src/main/java/com/cobo/cold/ui/fragment/main/TxFragment.java
  5. 7
      app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxConfirmFragment.java
  6. 7
      app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxFragment.java

2
app/src/main/java/com/cobo/cold/ui/fragment/main/QRCodeScanFragment.java
View File

@ -210,7 +210,7 @@ public class QRCodeScanFragment extends BaseFragment<QrcodeScanFragmentBinding>
throw new XpubNotMatchException("xpub not match");
}
return tx;
} catch (ElectrumTx.SerializationException e) {
} catch (ElectrumTx.SerializationException | IllegalArgumentException e) {
e.printStackTrace();
}
return null;

10
app/src/main/java/com/cobo/cold/ui/fragment/main/TransactionItem.java
View File

@ -17,26 +17,26 @@
package com.cobo.cold.ui.fragment.main;
import com.cobo.coinlib.utils.Coins;
import java.text.NumberFormat;
public class TransactionItem {
final int id;
final String amount;
final String address;
private final String coinCode;
public TransactionItem(int id, long amount, String address) {
public TransactionItem(int id, long amount, String address, String coinCode) {
this.id = id;
this.coinCode = coinCode;
this.amount = formatSatoshi(amount);
this.address = address;
}
static String formatSatoshi(long satoshi) {
private String formatSatoshi(long satoshi) {
double value = satoshi / Math.pow(10, 8);
NumberFormat nf = NumberFormat.getInstance();
nf.setMaximumFractionDigits(20);
return nf.format(value) + " " + Coins.BTC.coinCode();
return nf.format(value) + " " + coinCode;
}
public int getId() {

6
app/src/main/java/com/cobo/cold/ui/fragment/main/TxConfirmFragment.java
View File

@ -225,7 +225,8 @@ public class TxConfirmFragment extends BaseFragment<TxConfirmFragmentBinding> {
}
items.add(new TransactionItem(i,
output.getLong("value"),
output.getString("address")
output.getString("address"),
txEntity.getCoinCode()
));
}
} catch (JSONException e) {
@ -248,7 +249,8 @@ public class TxConfirmFragment extends BaseFragment<TxConfirmFragmentBinding> {
for (int i = 0; i < inputs.length(); i++) {
items.add(new TransactionItem(i,
inputs.getJSONObject(i).getLong("value"),
inputs.getJSONObject(i).getString("address")
inputs.getJSONObject(i).getString("address"),
txEntity.getCoinCode()
));
}
String fromAddress = inputs.getJSONObject(0).getString("address");

6
app/src/main/java/com/cobo/cold/ui/fragment/main/TxFragment.java
View File

@ -137,7 +137,8 @@ public class TxFragment extends BaseFragment<TxBinding> {
}
items.add(new TransactionItem(i,
value,
output.getString("address")
output.getString("address"),
txEntity.getCoinCode()
));
}
} catch (JSONException e) {
@ -161,7 +162,8 @@ public class TxFragment extends BaseFragment<TxBinding> {
for (int i = 0; i < inputs.length(); i++) {
items.add(new TransactionItem(i,
inputs.getJSONObject(i).getLong("value"),
inputs.getJSONObject(i).getString("address")
inputs.getJSONObject(i).getString("address"),
txEntity.getCoinCode()
));
}
String fromAddress = inputs.getJSONObject(0).getString("address");

7
app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxConfirmFragment.java
View File

@ -32,6 +32,7 @@ import androidx.navigation.Navigation;
import com.cobo.coinlib.coins.BTC.Electrum.ElectrumTx;
import com.cobo.coinlib.utils.Base43;
import com.cobo.coinlib.utils.Coins;
import com.cobo.cold.R;
import com.cobo.cold.Utilities;
import com.cobo.cold.config.FeatureFlags;
@ -251,7 +252,8 @@ public class ElectrumTxConfirmFragment extends BaseFragment<ElectrumTxConfirmFra
for (int i = 0; i < outputs.length(); i++) {
items.add(new TransactionItem(i,
outputs.getJSONObject(i).getLong("value"),
outputs.getJSONObject(i).getString("address")
outputs.getJSONObject(i).getString("address"),
Coins.BTC.coinCode()
));
}
} catch (JSONException e) {
@ -275,7 +277,8 @@ public class ElectrumTxConfirmFragment extends BaseFragment<ElectrumTxConfirmFra
JSONObject out = inputs.getJSONObject(i);
items.add(new TransactionItem(i,
out.getLong("value"),
out.getString("address")));
out.getString("address"),
Coins.BTC.coinCode()));
}
} catch (JSONException e) {
return;

7
app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxFragment.java
View File

@ -27,6 +27,7 @@ import android.view.View;
import androidx.lifecycle.ViewModelProviders;
import com.cobo.coinlib.utils.Base43;
import com.cobo.coinlib.utils.Coins;
import com.cobo.cold.R;
import com.cobo.cold.databinding.ElectrumTxBinding;
import com.cobo.cold.db.entity.TxEntity;
@ -101,7 +102,8 @@ public class ElectrumTxFragment extends BaseFragment<ElectrumTxBinding> {
for (int i = 0; i < outputs.length(); i++) {
JSONObject out = outputs.getJSONObject(i);
items.add(new TransactionItem(i,
out.getLong("value"), out.getString("address")));
out.getLong("value"), out.getString("address"),
Coins.BTC.coinCode()));
}
} catch (JSONException e) {
return;
@ -128,7 +130,8 @@ public class ElectrumTxFragment extends BaseFragment<ElectrumTxBinding> {
for (int i = 0; i < outputs.length(); i++) {
items.add(new TransactionItem(i,
outputs.getJSONObject(i).getLong("value"),
outputs.getJSONObject(i).getString("address")
outputs.getJSONObject(i).getString("address"),
Coins.BTC.coinCode()
));
}
} catch (JSONException e) {

Write Preview
Loading…
Cancel
Save