From f0d364a6c51f58ed65b9393f2a8bb824f119f6ba Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sat, 1 Jul 2017 14:49:49 +0200 Subject: [PATCH 1/4] formatting [ci skip] --- main/commons/pom.xml | 7 +++---- main/jacoco-report/pom.xml | 2 +- main/keychain/pom.xml | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 0817bc5fb..80d96e00c 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.cryptomator @@ -29,13 +28,13 @@ org.fxmisc.easybind easybind - + com.google.dagger dagger - + org.slf4j diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index f27b9eb88..e9be46b10 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -35,7 +35,7 @@ - + com.codacy diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index f8273dbd9..1d2ae0e0a 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 From 7900f0ea8cf87b80656d58344e3fcde8b0ef903d Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 4 Jul 2017 13:03:13 +0200 Subject: [PATCH 2/4] fixes #536 --- main/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pom.xml b/main/pom.xml index 039a2d467..ef45bb5f6 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -25,7 +25,7 @@ 1.1.5 - 1.4.0 + 1.4.1 0.6.2 1.0.2 From 10867e87c99688601bdc5b7e055afde810268992 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 4 Jul 2017 13:20:03 +0200 Subject: [PATCH 3/4] Preparing release 1.3.1 --- main/ant-kit/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/launcher/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 67bfd99d4..f269efdaf 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.0-SNAPSHOT + 1.3.1 ant-kit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 80d96e00c..85b2d0333 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.0-SNAPSHOT + 1.3.1 commons Cryptomator Commons diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index e9be46b10..26a7d39ac 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.0-SNAPSHOT + 1.3.1 jacoco-report Cryptomator Code Coverage Report diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 1d2ae0e0a..b07ee5788 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.0-SNAPSHOT + 1.3.1 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index bb55d145b..59e578075 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.0-SNAPSHOT + 1.3.1 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index ef45bb5f6..1a7d5d575 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.4.0-SNAPSHOT + 1.3.1 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index e0fb9e634..1bc18341f 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.0-SNAPSHOT + 1.3.1 uber-jar Single über jar with all dependencies diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 4e26f7590..0692c6732 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.0-SNAPSHOT + 1.3.1 ui Cryptomator GUI From 0a7d1029818704f3ee4d3a4705bc50304bea76d3 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 4 Jul 2017 15:41:03 +0200 Subject: [PATCH 4/4] Some controllers no longer singleton, preventing reuse of internal states. Fixes #537 --- .../ui/controllers/ChangePasswordController.java | 5 ----- .../ui/controllers/InitializeController.java | 10 +++------- .../cryptomator/ui/controllers/UnlockController.java | 1 - 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java index 11a1742c1..3c4f03dd8 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java @@ -15,7 +15,6 @@ import java.util.Objects; import java.util.Optional; import javax.inject.Inject; -import javax.inject.Singleton; import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException; @@ -42,7 +41,6 @@ import javafx.scene.layout.GridPane; import javafx.scene.layout.Region; import javafx.scene.text.Text; -@Singleton public class ChangePasswordController implements ViewController { private static final Logger LOG = LoggerFactory.getLogger(ChangePasswordController.class); @@ -123,9 +121,6 @@ public class ChangePasswordController implements ViewController { void setVault(Vault vault) { this.vault = Objects.requireNonNull(vault); - oldPasswordField.swipe(); - newPasswordField.swipe(); - retypePasswordField.swipe(); // trigger "default" change to refresh key bindings: changePasswordButton.setDefaultButton(false); changePasswordButton.setDefaultButton(true); diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java index c8d5afb80..a718cd4eb 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java @@ -16,7 +16,6 @@ import java.util.Objects; import java.util.Optional; import javax.inject.Inject; -import javax.inject.Singleton; import org.cryptomator.ui.controls.SecPasswordField; import org.cryptomator.ui.l10n.Localization; @@ -28,8 +27,8 @@ import org.slf4j.LoggerFactory; import javafx.application.Platform; import javafx.beans.binding.BooleanBinding; -import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.value.ObservableValue; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.Parent; @@ -38,14 +37,13 @@ import javafx.scene.control.Label; import javafx.scene.layout.GridPane; import javafx.scene.layout.Region; -@Singleton public class InitializeController implements ViewController { private static final Logger LOG = LoggerFactory.getLogger(InitializeController.class); private final Localization localization; private final PasswordStrengthUtil strengthRater; - private final IntegerProperty passwordStrength = new SimpleIntegerProperty(); // 0-4 + private ObservableValue passwordStrength; // 0-4 private Optional listener = Optional.empty(); private Vault vault; @@ -93,7 +91,7 @@ public class InitializeController implements ViewController { BooleanBinding passwordIsEmpty = passwordField.textProperty().isEmpty(); BooleanBinding passwordsDiffer = passwordField.textProperty().isNotEqualTo(retypePasswordField.textProperty()); okButton.disableProperty().bind(passwordIsEmpty.or(passwordsDiffer)); - passwordStrength.bind(EasyBind.map(passwordField.textProperty(), strengthRater::computeRate)); + passwordStrength = EasyBind.map(passwordField.textProperty(), strengthRater::computeRate); passwordStrengthLevel0.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(0), strengthRater::getBackgroundWithStrengthColor)); passwordStrengthLevel1.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(1), strengthRater::getBackgroundWithStrengthColor)); @@ -110,8 +108,6 @@ public class InitializeController implements ViewController { void setVault(Vault vault) { this.vault = Objects.requireNonNull(vault); - passwordField.swipe(); - retypePasswordField.swipe(); // trigger "default" change to refresh key bindings: okButton.setDefaultButton(false); okButton.setDefaultButton(true); diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java index bd13a8e56..95fb5ed1d 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java @@ -167,7 +167,6 @@ public class UnlockController implements ViewController { } assert vault != null; this.vault = vault; - passwordField.swipe(); advancedOptions.setVisible(false); advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show")); progressIndicator.setVisible(false);