Merge branch 'release/1.4.4'

cryptomator · Nov 23, 2017 · 4033e3e · 4033e3e
2 parents f7b6fee + 1057b63
commit 4033e3e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptofs</artifactId>
-	<version>1.4.3</version>
+	<version>1.4.4</version>
 	<name>Cryptomator Crypto Filesystem</name>
 	<description>This library provides the Java filesystem provider used by Cryptomator.</description>
 	<url>https://github.com/cryptomator/cryptofs</url>
@@ -17,7 +17,7 @@
 		<java.version>1.8</java.version>
 		<cryptolib.version>1.1.7</cryptolib.version>
 		<dagger.version>2.13</dagger.version>
-		<guava.version>23.4-jre</guava.version>
+		<guava.version>23.5-jre</guava.version>
 		<slf4j.version>1.7.25</slf4j.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -123,13 +123,6 @@
 			<version>1.1</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.57</version>
-			<!-- not actually needed, but otherwise unit tests fail in Eclipe, if the "cryptolib" project is opened in the same workspace -->
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -162,7 +155,7 @@
 					<plugin>
 						<groupId>org.owasp</groupId>
 						<artifactId>dependency-check-maven</artifactId>
-						<version>3.0.1</version>
+						<version>3.0.2</version>
 						<configuration>
 							<cveValidForHours>24</cveValidForHours>
 							<failBuildOnCVSS>0</failBuildOnCVSS>

diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoDirectoryStream.java b/src/main/java/org/cryptomator/cryptofs/CryptoDirectoryStream.java
@@ -75,7 +75,7 @@ public Stream<Path> ciphertextDirectoryListing() {
 		return directoryListing().map(ProcessedPaths::getCiphertextPath);
 	}
 
-	public Stream<ProcessedPaths> directoryListing() {
+	private Stream<ProcessedPaths> directoryListing() {
 		Stream<ProcessedPaths> pathIter = StreamSupport.stream(ciphertextDirStream.spliterator(), false).map(ProcessedPaths::new);
 		Stream<ProcessedPaths> resolved = pathIter.map(this::resolveConflictingFileIfNeeded).filter(Objects::nonNull);
 		Stream<ProcessedPaths> 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
@@ -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);
 	}
 
 	/**