use master wallet passphrase for child wallets when loading
@@ -872,9 +872,13 @@ public class AppController implements Initializable {
if(wallet.containsPrivateKeys()) {
//Derive xpub and master fingerprint from seed, potentially with passphrase
Wallet copy = wallet.copy();
- for(Keystore copyKeystore : copy.getKeystores()) {
+ for(int i = 0; i < copy.getKeystores().size(); i++) {
+ Keystore copyKeystore = copy.getKeystores().get(i);
if(copyKeystore.hasSeed()) {
if(copyKeystore.getSeed().needsPassphrase()) {
+ if(!wallet.isMasterWallet() && wallet.getMasterWallet().getKeystores().size() == copy.getKeystores().size() && wallet.getMasterWallet().getKeystores().get(i).hasSeed()) {
+ copyKeystore.getSeed().setPassphrase(wallet.getMasterWallet().getKeystores().get(i).getSeed().getPassphrase());
+ } else {
KeystorePassphraseDialog passphraseDialog = new KeystorePassphraseDialog(wallet.getFullName(), copyKeystore);
Optional<String> optionalPassphrase = passphraseDialog.showAndWait();
if(optionalPassphrase.isPresent()) {
@@ -882,6 +886,7 @@ public class AppController implements Initializable {
} else {
return;
}
+ }
} else {
copyKeystore.getSeed().setPassphrase("");
}
