Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-12 02:05:53 +00:00
Code Issues Projects Releases Wiki Activity

Wallet Template: bugfix in ui logic for encryption

Browse Source
This commit is contained in:
Mike Hearn 2014-07-21 16:08:20 +02:00
parent a5e4d046df
commit 8ce96e82e7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java
View File

@ -65,11 +65,9 @@ public class WalletSetPasswordController {
protected void onFinish(KeyParameter aesKey) {
// The actual encryption part doesn't take very long as most private keys are derived on demand.
Main.bitcoin.wallet().encrypt(scrypt, aesKey);
fadeIn(explanationLabel);
fadeIn(widgetGrid);
fadeIn(closeButton);
fadeOut(progressMeter);
fadeOut(padlockImage);
informationalAlert("Wallet encrypted",
"You can remove the password at any time from the settings screen.");
overlayUI.done();
}
};
progressMeter.progressProperty().bind(tasks.progress);

1
wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
View File

@ -173,6 +173,7 @@ public class WalletSettingsController {
Main.bitcoin.wallet().decrypt(aesKey);
informationalAlert("Wallet decrypted", "A password will no longer be required to send money or edit settings.");
passwordButton.setText("Set password");
aesKey = null;
}
}
}