From 3ff8d6bc197d39443c5581988794632a6ccc35a4 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sat, 10 Jan 2015 15:51:46 +0100 Subject: [PATCH] - fixed error during exception handling, if trying to decrypt vault with unsupported key length --- .../crypto/exceptions/UnsupportedKeyLengthException.java | 2 +- main/ui/src/main/java/org/cryptomator/ui/UnlockController.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/main/crypto-api/src/main/java/org/cryptomator/crypto/exceptions/UnsupportedKeyLengthException.java b/main/crypto-api/src/main/java/org/cryptomator/crypto/exceptions/UnsupportedKeyLengthException.java index bc7950255..0b9dfc499 100644 --- a/main/crypto-api/src/main/java/org/cryptomator/crypto/exceptions/UnsupportedKeyLengthException.java +++ b/main/crypto-api/src/main/java/org/cryptomator/crypto/exceptions/UnsupportedKeyLengthException.java @@ -7,7 +7,7 @@ public class UnsupportedKeyLengthException extends StorageCryptingException { private final int supportedLength; public UnsupportedKeyLengthException(int length, int maxLength) { - super(String.format("Key length (%i) exceeds policy maximum (%i).", length, maxLength)); + super(String.format("Key length (%d) exceeds policy maximum (%d).", length, maxLength)); this.requestedLength = length; this.supportedLength = maxLength; } diff --git a/main/ui/src/main/java/org/cryptomator/ui/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/UnlockController.java index 387bc1e8b..3cefca716 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/UnlockController.java @@ -137,6 +137,7 @@ public class UnlockController implements Initializable { private void setControlsDisabled(boolean disable) { usernameBox.setDisable(disable); passwordField.setDisable(disable); + checkIntegrity.setDisable(disable); unlockButton.setDisable(disable); }