sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-02 20:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

various minor improvements

Browse source
This commit is contained in:
Craig Raw 2023-07-05 09:48:48 +02:00
parent 795892f7c9
commit f980516462
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/package.yaml vendored
View file

@ -2,6 +2,9 @@ name: Package
on: workflow_dispatch on: workflow_dispatch
permissions:
contents: read
jobs: jobs:
build: build:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

2
src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
View file

@ -646,6 +646,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
reason += "\n\nSee https://sparrowwallet.com/docs/connect-node.html"; reason += "\n\nSee https://sparrowwallet.com/docs/connect-node.html";
} else if(reason != null && (reason.startsWith("Cannot connect to hidden service"))) { } else if(reason != null && (reason.startsWith("Cannot connect to hidden service"))) {
reason += " on the server. Check that the onion address and port are correct, and that both Tor and the Electrum server are running on the node. Usually SSL is not enabled, and the port is 50001."; reason += " on the server. Check that the onion address and port are correct, and that both Tor and the Electrum server are running on the node. Usually SSL is not enabled, and the port is 50001.";
} else if(reason != null && (reason.startsWith("Cannot find Bitcoin Core cookie file at"))) {
reason += "\n\nMake sure server=1 has been added to bitcoin.conf";
} }
testResults.setText("Could not connect:\n\n" + reason); testResults.setText("Could not connect:\n\n" + reason);

9
src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java
View file

@ -37,6 +37,7 @@ import tornadofx.control.Field;
import javax.smartcardio.CardException; import javax.smartcardio.CardException;
import java.net.URL; import java.net.URL;
import java.util.Base64; import java.util.Base64;
import java.util.Locale;
import java.util.Optional; import java.util.Optional;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -370,6 +371,14 @@ public class KeystoreController extends WalletFormController implements Initiali
selectSourcePane.setVisible(false); selectSourcePane.setVisible(false);
Keystore importedKeystore = result.get(); Keystore importedKeystore = result.get();
if(keystore.getSource() == KeystoreSource.SW_SEED && importedKeystore.getSource() != KeystoreSource.SW_SEED) {
Optional<ButtonType> optType = AppServices.showWarningDialog("Confirm Replacement",
"You are replacing a software wallet with a " + importedKeystore.getSource().getDisplayName().toLowerCase(Locale.ROOT) + ", which will remove the seed. Are you sure?",
ButtonType.NO, ButtonType.YES);
if(optType.isPresent() && optType.get() == ButtonType.NO) {
return;
}
}
walletForm.getWallet().makeLabelsUnique(importedKeystore); walletForm.getWallet().makeLabelsUnique(importedKeystore);
keystore.setSource(importedKeystore.getSource()); keystore.setSource(importedKeystore.getSource());
keystore.setWalletModel(importedKeystore.getWalletModel()); keystore.setWalletModel(importedKeystore.getWalletModel());