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

prevent setting separate passwords on child wallets

Browse source
This commit is contained in:
Craig Raw 2021-09-27 13:24:29 +02:00
parent 56e3a54ae0
commit 429b733140
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -588,14 +588,15 @@ public class SettingsController extends WalletFormController implements Initiali
key = new Key(encryptionFullKey.getPrivKeyBytes(), walletForm.getStorage().getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2); key = new Key(encryptionFullKey.getPrivKeyBytes(), walletForm.getStorage().getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
Wallet masterWallet = walletForm.getWallet().isMasterWallet() ? walletForm.getWallet() : walletForm.getWallet().getMasterWallet();
if(dlg.isChangePassword()) { if(dlg.isChangePassword()) {
if(dlg.isDeleteBackups()) { if(dlg.isDeleteBackups()) {
walletForm.deleteBackups(); walletForm.deleteBackups();
} }
walletForm.getStorage().setEncryptionPubKey(null); walletForm.getStorage().setEncryptionPubKey(null);
walletForm.getWallet().decrypt(key); masterWallet.decrypt(key);
for(Wallet childWallet : walletForm.getWallet().getChildWallets()) { for(Wallet childWallet : masterWallet.getChildWallets()) {
childWallet.decrypt(key); childWallet.decrypt(key);
} }
saveWallet(true, false); saveWallet(true, false);
@ -606,8 +607,8 @@ public class SettingsController extends WalletFormController implements Initiali
walletForm.deleteBackups(); walletForm.deleteBackups();
} }
walletForm.getWallet().encrypt(key); masterWallet.encrypt(key);
for(Wallet childWallet : walletForm.getWallet().getChildWallets()) { for(Wallet childWallet : masterWallet.getChildWallets()) {
childWallet.encrypt(key); childWallet.encrypt(key);
} }
walletForm.getStorage().setEncryptionPubKey(encryptionPubKey); walletForm.getStorage().setEncryptionPubKey(encryptionPubKey);