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

Merge branch 'develop' into hotfix/1.5.10

Browse Source
This commit is contained in:
Sebastian Stenzel
2020-11-18 15:02:33 +01:00
parent 17c580267f 490d1b8f87
commit 9b653f488b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import javafx.scene.image.ImageView;
import javafx.scene.transform.Rotate;
import javafx.scene.transform.Translate;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import javafx.util.Duration;
import java.util.Arrays;
import java.util.Optional;
@@ -78,7 +79,7 @@ public class UnlockController implements FxController {
this.userInteractionDisabled = passwordEntryLock.awaitingInteraction().not();
this.unlockButtonDisabled = new SimpleBooleanProperty();
this.vaultName = WeakBindings.bindString(vault.displayNameProperty());
this.window.setOnCloseRequest(windowEvent -> cancel());
this.window.setOnHiding(this::windowClosed);
}
@FXML
@@ -128,14 +129,18 @@ public class UnlockController implements FxController {
passwordEntryLock.awaitingInteraction().addListener(observable -> stopUnlockAnimation());
}
@FXML
public void cancel() {
LOG.debug("Unlock canceled by user.");
window.close();
passwordEntryLock.interacted(UnlockModule.PasswordEntry.CANCELED);
}
private void windowClosed(WindowEvent windowEvent) {
// if not already interacted, mark this workflow as cancelled:
if (passwordEntryLock.awaitingInteraction().get()) {
LOG.debug("Unlock canceled by user.");
passwordEntryLock.interacted(UnlockModule.PasswordEntry.CANCELED);
}
}
@FXML
public void unlock() {