Merge pull request #7 from CoboVault/electrum

modify strings

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

@@ -69,6 +69,7 @@ import static com.cobo.cold.viewmodel.ElectrumViewModel.exportSuccess;
 import static com.cobo.cold.viewmodel.ElectrumViewModel.hasSdcard;
 import static com.cobo.cold.viewmodel.ElectrumViewModel.showNoSdcardModal;
 import static com.cobo.cold.viewmodel.ElectrumViewModel.writeToSdcard;
+import static com.cobo.cold.viewmodel.TxConfirmViewModel.STATE_NONE;
 
 public class ElectrumTxConfirmFragment extends BaseFragment<ElectrumTxConfirmFragmentBinding> {
 
@@ -302,6 +303,7 @@ public class ElectrumTxConfirmFragment extends BaseFragment<ElectrumTxConfirmFra
                     }
                     signingDialog = null;
                     onSignSuccess();
+                    viewModel.getSignState().setValue(STATE_NONE);
                 }, 500);
             } else if (TxConfirmViewModel.STATE_SIGN_FAIL.equals(s)) {
                 if (signingDialog == null) {
@@ -315,6 +317,7 @@ public class ElectrumTxConfirmFragment extends BaseFragment<ElectrumTxConfirmFra
                     }
                     signingDialog = null;
                     viewModel.getSignState().removeObservers(this);
+                    viewModel.getSignState().setValue(STATE_NONE);
                 }, 2000);
             }
         });

app/src/main/java/com/cobo/cold/viewmodel/TxConfirmViewModel.java

@@ -80,6 +80,7 @@ import static com.cobo.cold.viewmodel.ElectrumViewModel.adapt;
 
 public class TxConfirmViewModel extends AndroidViewModel {
 
+    public static final String STATE_NONE = "";
     public static final String STATE_SIGNING = "signing";
     public static final String STATE_SIGN_FAIL = "signing_fail";
     public static final String STATE_SIGN_SUCCESS = "signing_success";

app/src/main/res/values-zh-rCN/strings.xml

@@ -275,7 +275,7 @@
     <string name="export_success">导出成功</string>
     <string name="read_sdcard">读取TF卡</string>
     <string name="no_sdcard">未检测到TF卡</string>
-    <string name="no_sdcard_hint">请先插入TF卡（仅支持FAT32格式，容量不能超过32GB）</string>
+    <string name="no_sdcard_hint">请先插入TF卡（仅支持FAT32格式，容量不能超过32GB），再前往签名记录里导出文件。</string>
     <string name="no_unsigned_txn">未检测到待签文件</string>
     <string name="no_unsigned_txn_hint">请检查TF卡中是否存有待签文件</string>
     <string name="electrum_broadcast_guide">Electrum 广播指引</string>
@@ -286,7 +286,7 @@
     <string name="error_txn_file">请重新导出，导出时请不要更改文件内容或格式。</string>
     <string name="export_signed_txn">导出文件进行广播</string>
     <string name="electrum_import_signed_txn">导出后，前往【electrum--工具--加载交易--从文件】，打开该文件。</string>
-    <string name="insert_sdcard_hint">请先插入TF卡（仅支持FAT32格式，容量不能超过32G），再前往签名记录里导出文件。</string>
+    <string name="insert_sdcard_hint">请先插入TF卡（仅支持FAT32格式，容量不能超过32G）</string>
     <string name="electrum_import_xpub_action">在 Electrum 输入主公钥页面打开该文件</string>
     <string name="transaction_source_label">热端钱包</string>
     <string name="use_electrum_to_broadcast">请用 Electrum 扫描二维码进行广播</string>

app/src/main/res/values/strings.xml

@@ -299,7 +299,7 @@
     <string name="export_success">Export Successful</string>
     <string name="read_sdcard">MicroSD card</string>
     <string name="no_sdcard">MicroSD Card Not Found</string>
-    <string name="no_sdcard_hint">Please make sure you have inserted a FAT32 format microSD card with capacity 32GB or less.</string>
+    <string name="no_sdcard_hint">Please make sure you have inserted a FAT32 format microSD card with capacity 32GB or less, and that the signed transaction information has been uploaded to it.</string>
     <string name="no_unsigned_txn">File Not Found</string>
     <string name="no_unsigned_txn_hint">Please make sure the file you wish to sign was successfully saved to your microSD card.</string>
     <string name="electrum_broadcast_guide">How to Broadcast</string>
@@ -310,7 +310,7 @@
     <string name="error_txn_file">Unable to parse file, please try exporting again.</string>
     <string name="export_signed_txn">Export File to Broadcast</string>
     <string name="electrum_import_signed_txn">In Electrum, go to Tools > Load Transaction > From File to open the file. </string>
-    <string name="insert_sdcard_hint">Please make sure you have inserted a FAT32 format microSD card with capacity 32GB or less, and that the signed transaction information has been uploaded to it.</string>
+    <string name="insert_sdcard_hint">Please make sure you have inserted a FAT32 format microSD card with capacity 32GB or less.</string>
     <string name="electrum_import_xpub_action">Open when inputting your master public key on Electrum.</string>
     <string name="transaction_source_label">Wallet</string>
     <string name="use_electrum_to_broadcast">Scan the QR code with Electrum to broadcast</string>