diff --git a/app/src/main/java/com/cobo/cold/ui/fragment/PassphraseFragment.java b/app/src/main/java/com/cobo/cold/ui/fragment/PassphraseFragment.java index fe3e7b5..d6199ed 100644 --- a/app/src/main/java/com/cobo/cold/ui/fragment/PassphraseFragment.java +++ b/app/src/main/java/com/cobo/cold/ui/fragment/PassphraseFragment.java @@ -93,7 +93,7 @@ public class PassphraseFragment extends SetupVaultBaseFragment throw new XpubNotMatchException("xpub not match"); } return tx; - } catch (ElectrumTx.SerializationException e) { + } catch (ElectrumTx.SerializationException | IllegalArgumentException e) { e.printStackTrace(); } return null; diff --git a/app/src/main/java/com/cobo/cold/ui/fragment/main/TransactionItem.java b/app/src/main/java/com/cobo/cold/ui/fragment/main/TransactionItem.java index c162b58..b887117 100644 --- a/app/src/main/java/com/cobo/cold/ui/fragment/main/TransactionItem.java +++ b/app/src/main/java/com/cobo/cold/ui/fragment/main/TransactionItem.java @@ -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() { diff --git a/app/src/main/java/com/cobo/cold/ui/fragment/main/TxConfirmFragment.java b/app/src/main/java/com/cobo/cold/ui/fragment/main/TxConfirmFragment.java index 97ff745..ecb9f45 100644 --- a/app/src/main/java/com/cobo/cold/ui/fragment/main/TxConfirmFragment.java +++ b/app/src/main/java/com/cobo/cold/ui/fragment/main/TxConfirmFragment.java @@ -225,7 +225,8 @@ public class TxConfirmFragment extends BaseFragment { } 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 { 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"); diff --git a/app/src/main/java/com/cobo/cold/ui/fragment/main/TxFragment.java b/app/src/main/java/com/cobo/cold/ui/fragment/main/TxFragment.java index 807fdba..149efb9 100644 --- a/app/src/main/java/com/cobo/cold/ui/fragment/main/TxFragment.java +++ b/app/src/main/java/com/cobo/cold/ui/fragment/main/TxFragment.java @@ -137,7 +137,8 @@ public class TxFragment extends BaseFragment { } 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 { 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"); diff --git a/app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxConfirmFragment.java b/app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxConfirmFragment.java index 8c77669..b71dbbc 100644 --- a/app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxConfirmFragment.java +++ b/app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxConfirmFragment.java @@ -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 { 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 { 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) { diff --git a/app/src/main/java/com/cobo/cold/update/utils/FileUtils.java b/app/src/main/java/com/cobo/cold/update/utils/FileUtils.java index 8485d0b..eb1acf3 100644 --- a/app/src/main/java/com/cobo/cold/update/utils/FileUtils.java +++ b/app/src/main/java/com/cobo/cold/update/utils/FileUtils.java @@ -52,6 +52,9 @@ public class FileUtils { public static boolean writeString(@NonNull File file, String content) { try(FileOutputStream fos = new FileOutputStream(file)) { fos.write(content.getBytes()); + fos.getFD().sync(); + fos.flush(); + fos.close(); return true; } catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/res/layout/passphrase.xml b/app/src/main/res/layout/passphrase.xml index 3668059..f600cca 100644 --- a/app/src/main/res/layout/passphrase.xml +++ b/app/src/main/res/layout/passphrase.xml @@ -92,7 +92,7 @@ android:layout_height="wrap_content" android:background="@null" android:focusable="true" - android:paddingVertical="5dp" + android:paddingVertical="10dp" android:focusableInTouchMode="true" android:hint="@string/passphrase_hint2" android:imeOptions="actionNext" @@ -113,10 +113,11 @@