Merge branch 'release/1.9.6'

Author: overheadhunter

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptofs</artifactId>
-	<version>1.9.5</version>
+	<version>1.9.6</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>
@@ -14,12 +14,12 @@
 	</scm>
 
 	<properties>
-		<cryptolib.version>1.3.0</cryptolib.version>
+		<cryptolib.version>1.3.1</cryptolib.version>
 		<dagger.version>2.27</dagger.version>
-		<guava.version>28.2-jre</guava.version>
+		<guava.version>29.0-jre</guava.version>
 		<slf4j.version>1.7.30</slf4j.version>
 
-		<junit.jupiter.version>5.6.1</junit.jupiter.version>
+		<junit.jupiter.version>5.6.2</junit.jupiter.version>
 		<mockito.version>3.3.3</mockito.version>
 		<hamcrest.version>2.2</hamcrest.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -41,13 +41,6 @@
 			<organization>cryptomator.org</organization>
 			<organizationUrl>https://cryptomator.org</organizationUrl>
 		</developer>
-		<developer>
-			<name>Markus Kreusch</name>
-			<email>[email protected]</email>
-			<timezone>+1</timezone>
-			<organization>cryptomator.org</organization>
-			<organizationUrl>https://cryptomator.org</organizationUrl>
-		</developer>
 		<developer>
 			<name>Armin Schrenk</name>
 			<email>[email protected]</email>

src/main/java/org/cryptomator/cryptofs/migration/Migrators.java

@@ -78,8 +78,12 @@ public static Migrators get() {
 	public boolean needsMigration(Path pathToVault, String masterkeyFilename) throws IOException {
 		Path masterKeyPath = pathToVault.resolve(masterkeyFilename);
 		byte[] keyFileContents = Files.readAllBytes(masterKeyPath);
-		KeyFile keyFile = KeyFile.parse(keyFileContents);
-		return keyFile.getVersion() < Constants.VAULT_VERSION;
+		try {
+			KeyFile keyFile = KeyFile.parse(keyFileContents);
+			return keyFile.getVersion() < Constants.VAULT_VERSION;
+		} catch (IllegalArgumentException e) {
+			throw new IOException("Malformed masterkey file " + masterKeyPath, e);
+		}
 	}
 
 	/**

src/main/java/org/cryptomator/cryptofs/migration/v7/MigratingVisitor.java

@@ -55,8 +55,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx
 				Path migratedFile = migration.migrate();
 				LOG.info("MOVED {} to {}", migration.getOldPath(), migratedFile);
 			} catch (FileAlreadyExistsException e) {
-				LOG.error("Failed to migrate " + migration.getOldPath() + " due to FileAlreadyExistsException. Already migrated on a different machine?.", e);
-				return FileVisitResult.TERMINATE;
+				LOG.warn("Failed to migrate " + migration.getOldPath() + " due to FileAlreadyExistsException. This can be caused either by sync conflicts or because this file has already been migrated on a different machine.", e);
 			}
 		}
 		migrationsInCurrentDir.clear();