diff --git a/app/src/main/java/com/cobo/cold/selfcheck/SecurityCheck.java b/app/src/main/java/com/cobo/cold/selfcheck/SecurityCheck.java index 8f92f43..434451f 100644 --- a/app/src/main/java/com/cobo/cold/selfcheck/SecurityCheck.java +++ b/app/src/main/java/com/cobo/cold/selfcheck/SecurityCheck.java @@ -106,7 +106,10 @@ public class SecurityCheck { Log.i(TAG, "check firmware status"); try { final Callable callable = new BlockingCallable( - new Packet.Builder(CONSTANTS.METHODS.GET_FIRMWARE_STATUS).setRetryTimes(2).build()); + new Packet.Builder(CONSTANTS.METHODS.GET_FIRMWARE_STATUS) + .setRetryTimes(5) + .setTimeout(5) + .build()); final Packet result = callable.call(); final Payload payload = result.getPayload(CONSTANTS.TAGS.FIRMWARE_STATUS); @@ -143,7 +146,9 @@ public class SecurityCheck { Log.i(TAG, "check firmware status"); try { final Callable callable = new BlockingCallable( - new Packet.Builder(CONSTANTS.METHODS.GET_FIRMWARE_STATUS).setRetryTimes(2).build()); + new Packet.Builder(CONSTANTS.METHODS.GET_FIRMWARE_STATUS) + .setTimeout(5) + .setRetryTimes(5).build()); final Packet result = callable.call(); final Payload payload = result.getPayload(CONSTANTS.TAGS.FIRMWARE_STATUS); diff --git a/app/src/main/java/com/cobo/cold/ui/fragment/setting/ChooseWatchWalletFragment.java b/app/src/main/java/com/cobo/cold/ui/fragment/setting/ChooseWatchWalletFragment.java index 60adc96..1fc1262 100644 --- a/app/src/main/java/com/cobo/cold/ui/fragment/setting/ChooseWatchWalletFragment.java +++ b/app/src/main/java/com/cobo/cold/ui/fragment/setting/ChooseWatchWalletFragment.java @@ -100,7 +100,7 @@ public class ChooseWatchWalletFragment extends ListPreferenceFragment { @Override protected String defaultValue() { - return WatchWallet.ELECTRUM.getWalletId(); + return WatchWallet.COBO.getWalletId(); } @Override diff --git a/app/src/main/java/com/cobo/cold/viewmodel/WatchWallet.java b/app/src/main/java/com/cobo/cold/viewmodel/WatchWallet.java index f498b24..f179c9b 100644 --- a/app/src/main/java/com/cobo/cold/viewmodel/WatchWallet.java +++ b/app/src/main/java/com/cobo/cold/viewmodel/WatchWallet.java @@ -47,8 +47,8 @@ public enum WatchWallet { public static WatchWallet getWatchWallet(Context context) { String wallet = Utilities.getPrefs(context) - .getString(SETTING_CHOOSE_WATCH_WALLET, ELECTRUM.getWalletId()); - WatchWallet selectWatchWallet = ELECTRUM; + .getString(SETTING_CHOOSE_WATCH_WALLET, COBO.getWalletId()); + WatchWallet selectWatchWallet = COBO; for (WatchWallet watchWallet: WatchWallet.values()) { if (watchWallet.getWalletId().equals(wallet)) { selectWatchWallet = watchWallet; diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 898258f..52adbb9 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -379,6 +379,7 @@ 交易ID 已导出 / 暂不导出 选择观察钱包 + 观察钱包 切换观察钱包可前往【菜单--设置--选择观察钱包】 钱包信息 钱包: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bde7fb2..6f1c9b0 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -439,6 +439,7 @@ TxID Exported / Export Later Select a watch-only wallet + Watch-only Wallet Go to Menu > Settings > Select Watch-Only Wallet Wallet Info Key Fingerprint: diff --git a/app/src/main/res/xml/main_preference.xml b/app/src/main/res/xml/main_preference.xml index 74f7220..059bf9b 100644 --- a/app/src/main/res/xml/main_preference.xml +++ b/app/src/main/res/xml/main_preference.xml @@ -20,7 +20,7 @@ + android:title="@string/watch_only_wallet" />