From bd734f19607213fdbfff9b9f05c7a4aabe6dcca1 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 27 May 2020 11:23:09 +0200 Subject: [PATCH 1/2] preparing 1.5.5 --- main/buildkit/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/launcher/pom.xml | 2 +- main/pom.xml | 2 +- main/ui/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml index c86927d33..66fb43c8a 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.5 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 54e711559..d7ce3c1a2 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.5 commons Cryptomator Commons diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index fd2b26c3a..591a17b26 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.5 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index 21a8f910c..3ebcd5481 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.5 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 934d676f5..87cd12e56 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.5 pom Cryptomator diff --git a/main/ui/pom.xml b/main/ui/pom.xml index c27fbb1aa..ebf705eec 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.5 ui Cryptomator GUI From 11e3ee8d90d99f107180aa050c0d0f40819254fd Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 27 May 2020 12:43:18 +0200 Subject: [PATCH 2/2] formatted code [ci skip] --- .../org/cryptomator/ui/unlock/UnlockSuccessController.java | 2 +- .../main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java index bf0d2e3fb..f7952ad9f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java @@ -31,7 +31,7 @@ public class UnlockSuccessController implements FxController { private final VaultService vaultService; private final ObjectProperty revealButtonState; private final BooleanProperty revealButtonDisabled; - + public CheckBox rememberChoiceCheckbox; @Inject diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java index 08a5207b4..08b8adf71 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java @@ -95,7 +95,7 @@ public class UnlockWorkflow extends Task { wipePassword(savedPassword.orElse(null)); } } - + private boolean attemptUnlock() throws InterruptedException, IOException, Volume.VolumeException { boolean proceed = password.get() != null || askForPassword(false) == PasswordEntry.PASSWORD_ENTERED; while (proceed) { @@ -117,7 +117,9 @@ public class UnlockWorkflow extends Task { if (owner != null) { window.setX(owner.getX() + (owner.getWidth() - window.getWidth()) / 2); window.setY(owner.getY() + (owner.getHeight() - window.getHeight()) / 2); - } else window.centerOnScreen(); + } else { + window.centerOnScreen(); + } if (animateShake) { Animations.createShakeWindowAnimation(window).play(); }