From bb75540200c067c0c96ff3ceffec3aefca24822e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 14 Nov 2017 11:49:09 +0100 Subject: [PATCH 1/4] fixes #18 --- .../java/org/cryptomator/cryptofs/CryptoDirectoryStream.java | 2 +- .../java/org/cryptomator/cryptofs/CryptoFileSystemProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoDirectoryStream.java b/src/main/java/org/cryptomator/cryptofs/CryptoDirectoryStream.java index 38b3651d..2343c893 100644 --- a/src/main/java/org/cryptomator/cryptofs/CryptoDirectoryStream.java +++ b/src/main/java/org/cryptomator/cryptofs/CryptoDirectoryStream.java @@ -75,7 +75,7 @@ public Stream ciphertextDirectoryListing() { return directoryListing().map(ProcessedPaths::getCiphertextPath); } - public Stream directoryListing() { + private Stream directoryListing() { Stream pathIter = StreamSupport.stream(ciphertextDirStream.spliterator(), false).map(ProcessedPaths::new); Stream resolved = pathIter.map(this::resolveConflictingFileIfNeeded).filter(Objects::nonNull); Stream inflated = resolved.map(this::inflateIfNeeded).filter(Objects::nonNull); diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemProvider.java b/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemProvider.java index ea9595af..59c1e73c 100644 --- a/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemProvider.java +++ b/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemProvider.java @@ -179,7 +179,7 @@ public static void initialize(Path pathToVault, String masterkeyFilename, byte[] public static boolean containsVault(Path pathToVault, String masterkeyFilename) { Path masterKeyPath = pathToVault.resolve(masterkeyFilename); Path dataDirPath = pathToVault.resolve(Constants.DATA_DIR_NAME); - return Files.isRegularFile(masterKeyPath) && Files.isDirectory(dataDirPath); + return Files.isReadable(masterKeyPath) && Files.isDirectory(dataDirPath); } /** From 155563639e089c5331df7a7f2cc6970418da3eae Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 14 Nov 2017 18:05:36 +0100 Subject: [PATCH 2/4] updated dependency, fixing build --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5dccdc3..21cf9126 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ org.owasp dependency-check-maven - 3.0.1 + 3.0.2 24 0 From 6e9f16fa0fc97aee74b1ccf2334aaeb5686f5a55 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 23 Nov 2017 11:39:03 +0100 Subject: [PATCH 3/4] updated dependencies --- pom.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 21cf9126..c213f505 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.8 1.1.7 2.13 - 23.4-jre + 23.5-jre 1.7.25 UTF-8 @@ -123,13 +123,6 @@ 1.1 test - - org.bouncycastle - bcprov-jdk15on - 1.57 - - test - From 1057b6336750b124ed34deed76f46134394ac549 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 23 Nov 2017 11:41:07 +0100 Subject: [PATCH 4/4] preparing 1.4.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c213f505..66ca60db 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.cryptomator cryptofs - 1.5.0-SNAPSHOT + 1.4.4 Cryptomator Crypto Filesystem This library provides the Java filesystem provider used by Cryptomator. https://github.com/cryptomator/cryptofs