From 48b319ec99fb00033ef543130fc552b48afbeacf Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sat, 8 Aug 2015 19:12:44 +0200 Subject: [PATCH] started working on 0.9.0-SNAPSHOT --- main/core/pom.xml | 2 +- main/crypto-aes/pom.xml | 2 +- main/crypto-api/pom.xml | 2 +- main/installer-debian/pom.xml | 2 +- main/installer-osx/pom.xml | 2 +- main/installer-win-portable/pom.xml | 2 +- main/installer-win/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- .../java/org/cryptomator/ui/controllers/UnlockController.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/main/core/pom.xml b/main/core/pom.xml index dad08e639..40febc2a4 100644 --- a/main/core/pom.xml +++ b/main/core/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT core Cryptomator WebDAV and I/O module diff --git a/main/crypto-aes/pom.xml b/main/crypto-aes/pom.xml index 226c6a870..09d0dbbf5 100644 --- a/main/crypto-aes/pom.xml +++ b/main/crypto-aes/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT crypto-aes Cryptomator cryptographic module (AES) diff --git a/main/crypto-api/pom.xml b/main/crypto-api/pom.xml index 2e8ff7f2c..138041a44 100644 --- a/main/crypto-api/pom.xml +++ b/main/crypto-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT crypto-api Cryptomator cryptographic module API diff --git a/main/installer-debian/pom.xml b/main/installer-debian/pom.xml index e378ad8bf..9058378f1 100644 --- a/main/installer-debian/pom.xml +++ b/main/installer-debian/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT installer-debian pom diff --git a/main/installer-osx/pom.xml b/main/installer-osx/pom.xml index 63e6f75f6..17b287e11 100644 --- a/main/installer-osx/pom.xml +++ b/main/installer-osx/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT installer-osx pom diff --git a/main/installer-win-portable/pom.xml b/main/installer-win-portable/pom.xml index d3348e6e8..258f9c4a6 100644 --- a/main/installer-win-portable/pom.xml +++ b/main/installer-win-portable/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT installer-win-portable pom diff --git a/main/installer-win/pom.xml b/main/installer-win/pom.xml index 088d958e2..20e6306fa 100644 --- a/main/installer-win/pom.xml +++ b/main/installer-win/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT installer-win pom diff --git a/main/pom.xml b/main/pom.xml index 7e74c8358..fe32fde51 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -11,7 +11,7 @@ 4.0.0 org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index aab7166d5..0eb11a843 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index dba84dd44..f1c0c0a0b 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.8.1 + 0.9.0-SNAPSHOT ui Cryptomator GUI 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 1a35982dd..bc3f991c1 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 @@ -131,7 +131,7 @@ public class UnlockController implements Initializable { // at this point we know for sure, that the masterkey can be decrypted, so lets make a backup: Files.copy(masterKeyPath, masterKeyBackupPath, StandardCopyOption.REPLACE_EXISTING); vault.setUnlocked(true); - final Future futureMount = exec.submit(() -> vault.mount()); + final Future futureMount = exec.submit(() -> (boolean) vault.mount()); FXThreads.runOnMainThreadWhenFinished(exec, futureMount, this::unlockAndMountFinished); } catch (IOException ex) { setControlsDisabled(false);