Merge branch 'release/1.9.0'

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptofs</artifactId>
-	<version>1.8.10</version>
+	<version>1.9.0</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,7 +14,7 @@
 	</scm>
 
 	<properties>
-		<cryptolib.version>1.2.1</cryptolib.version>
+		<cryptolib.version>1.3.0-beta2</cryptolib.version>
 		<dagger.version>2.24</dagger.version>
 		<guava.version>28.1-jre</guava.version>
 		<slf4j.version>1.7.28</slf4j.version>

src/main/java/org/cryptomator/cryptofs/CiphertextFilePath.java

@@ -0,0 +1,66 @@
+package org.cryptomator.cryptofs;
+
+import org.cryptomator.cryptofs.common.Constants;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+
+public class CiphertextFilePath {
+
+	private final Path path;
+	private final Optional<LongFileNameProvider.DeflatedFileName> deflatedFileName;
+
+	CiphertextFilePath(Path path, Optional<LongFileNameProvider.DeflatedFileName> deflatedFileName) {
+		this.path = Objects.requireNonNull(path);
+		this.deflatedFileName = Objects.requireNonNull(deflatedFileName);
+	}
+
+	public Path getRawPath() {
+		return path;
+	}
+
+	public boolean isShortened() {
+		return deflatedFileName.isPresent();
+	}
+
+	public Path getFilePath() {
+		return isShortened() ? path.resolve(Constants.CONTENTS_FILE_NAME) : path;
+	}
+
+	public Path getDirFilePath() {
+		return path.resolve(Constants.DIR_FILE_NAME);
+	}
+
+	public Path getSymlinkFilePath() {
+		return path.resolve(Constants.SYMLINK_FILE_NAME);
+	}
+
+	public Path getInflatedNamePath() {
+		return path.resolve(Constants.INFLATED_FILE_NAME);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(path, deflatedFileName);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof CiphertextFilePath) {
+			CiphertextFilePath other = (CiphertextFilePath) obj;
+			return this.path.equals(other.path) && this.deflatedFileName.equals(other.deflatedFileName);
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public String toString() {
+		return path.toString();
+	}
+
+	public void persistLongFileName() {
+		deflatedFileName.ifPresent(LongFileNameProvider.DeflatedFileName::persist);
+	}
+}

src/main/java/org/cryptomator/cryptofs/CopyOperation.java

@@ -1,5 +1,7 @@
 package org.cryptomator.cryptofs;
 
+import org.cryptomator.cryptofs.common.ArrayUtils;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.io.IOException;