Merge branch 'hotfix/2.4.4'

cryptomator · Oct 6, 2022 · f2477f7 · f2477f7
2 parents 88608cc + d566e31
commit f2477f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 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>2.4.3</version>
+	<version>2.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>

diff --git a/src/main/java/org/cryptomator/cryptofs/health/dirid/DirIdCheck.java b/src/main/java/org/cryptomator/cryptofs/health/dirid/DirIdCheck.java
@@ -61,7 +61,7 @@ public void check(Path pathToVault, VaultConfig config, Masterkey masterkey, Cry
 			boolean foundDir = dirVisitor.secondLevelDirs.remove(expectedDir);
 			if (foundDir) {
 				iter.remove();
-				if (Files.exists(expectedDir.resolve(Constants.DIR_ID_FILE))) {
+				if (Files.exists(dataDirPath.resolve(expectedDir).resolve(Constants.DIR_ID_FILE))) {
 					resultCollector.accept(new HealthyDir(dirId, dirIdFile, expectedDir));
 				} else {
 					resultCollector.accept(new MissingDirIdBackup(dirId, expectedDir));

diff --git a/src/main/java/org/cryptomator/cryptofs/health/dirid/MissingDirIdBackup.java b/src/main/java/org/cryptomator/cryptofs/health/dirid/MissingDirIdBackup.java
@@ -3,6 +3,7 @@
 import org.cryptomator.cryptofs.CryptoPathMapper;
 import org.cryptomator.cryptofs.DirectoryIdBackup;
 import org.cryptomator.cryptofs.VaultConfig;
+import org.cryptomator.cryptofs.common.Constants;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.cryptolib.api.Cryptor;
 import org.cryptomator.cryptolib.api.Masterkey;
@@ -28,6 +29,7 @@ public String toString() {
 	@Override
 	public void fix(Path pathToVault, VaultConfig config, Masterkey masterkey, Cryptor cryptor) throws IOException {
 		DirectoryIdBackup dirIdBackup = new DirectoryIdBackup(cryptor);
-		dirIdBackup.execute(new CryptoPathMapper.CiphertextDirectory(dirId, cipherDir));
+		Path absCipherDir = pathToVault.resolve(Constants.DATA_DIR_NAME).resolve(cipherDir);
+		dirIdBackup.execute(new CryptoPathMapper.CiphertextDirectory(dirId, absCipherDir));
 	}
 }