mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 01:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simpler solution to 8aa3da1 and 1702c6a2

Browse Source
This commit is contained in:
Sebastian Stenzel
2020-04-28 21:17:41 +02:00
parent 8aa3da14a4
commit 461ec3ca43
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
View File

@@ -73,7 +73,7 @@ public class UnlockController implements FxController {
if (keychainAccess.isPresent()) {
loadStoredPassword();
} else {
savePassword.setDisable(true);
savePassword.setSelected(false);
}
unlockButtonDisabled.bind(vault.stateProperty().isNotEqualTo(VaultState.LOCKED).or(passwordField.textProperty().isEmpty()));
}
@@ -91,10 +91,8 @@ public class UnlockController implements FxController {
Task<Vault> task = vaultService.createUnlockTask(vault, password);
passwordField.setDisable(true);
savePassword.setDisable(true);
task.setOnSucceeded(event -> {
passwordField.setDisable(false);
savePassword.setDisable(!keychainAccess.isPresent());
if (keychainAccess.isPresent() && savePassword.isSelected()) {
try {
keychainAccess.get().storePassphrase(vault.getId(), password);
@@ -108,7 +106,6 @@ public class UnlockController implements FxController {
});
task.setOnFailed(event -> {
passwordField.setDisable(false);
savePassword.setDisable(!keychainAccess.isPresent());
if (task.getException() instanceof InvalidPassphraseException) {
Animations.createShakeWindowAnimation(window).play();
passwordField.selectAll();
@@ -190,4 +187,8 @@ public class UnlockController implements FxController {
public boolean isUnlockButtonDisabled() {
return unlockButtonDisabled.get();
}
public boolean isKeychainAccessAvailable() {
return keychainAccess.isPresent();
}
}

2
main/ui/src/main/resources/fxml/unlock.fxml
View File

@@ -22,7 +22,7 @@
<VBox spacing="6">
<FormattedLabel format="%unlock.passwordPrompt" arg1="${controller.vault.displayableName}" wrapText="true"/>
<NiceSecurePasswordField fx:id="passwordField"/>
<CheckBox fx:id="savePassword" text="%unlock.savePassword" onAction="#didClickSavePasswordCheckbox"/>
<CheckBox fx:id="savePassword" text="%unlock.savePassword" onAction="#didClickSavePasswordCheckbox" disable="${controller.vault.processing}" visible="${controller.keychainAccessAvailable}"/>
</VBox>
<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">