mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 09:36:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

started working on 0.9.0-SNAPSHOT

Browse Source
This commit is contained in:
Sebastian Stenzel
2015-08-08 19:12:44 +02:00
parent 9ea9cb6eb2
commit 48b319ec99
11 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/core/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>core</artifactId>
<name>Cryptomator WebDAV and I/O module</name>

2
main/crypto-aes/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>crypto-aes</artifactId>
<name>Cryptomator cryptographic module (AES)</name>

2
main/crypto-api/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>crypto-api</artifactId>
<name>Cryptomator cryptographic module API</name>

2
main/installer-debian/pom.xml
View File

@@ -3,7 +3,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>installer-debian</artifactId>
<packaging>pom</packaging>

2
main/installer-osx/pom.xml
View File

@@ -3,7 +3,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>installer-osx</artifactId>
<packaging>pom</packaging>

2
main/installer-win-portable/pom.xml
View File

@@ -3,7 +3,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>installer-win-portable</artifactId>
<packaging>pom</packaging>

2
main/installer-win/pom.xml
View File

@@ -3,7 +3,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>installer-win</artifactId>
<packaging>pom</packaging>

2
main/pom.xml
View File

@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Cryptomator</name>

2
main/uber-jar/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>uber-jar</artifactId>
<packaging>pom</packaging>

2
main/ui/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.8.1</version>
<version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>ui</artifactId>
<name>Cryptomator GUI</name>

2
main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
View File

@@ -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<Boolean> futureMount = exec.submit(() -> vault.mount());
final Future<Boolean> futureMount = exec.submit(() -> (boolean) vault.mount());
FXThreads.runOnMainThreadWhenFinished(exec, futureMount, this::unlockAndMountFinished);
} catch (IOException ex) {
setControlsDisabled(false);