Merge branch 'develop' into release/1.1.0

Author: tobihagemann

src/main/java/org/cryptomator/cloudaccess/MetadataCachingProviderDecorator.java

@@ -9,6 +9,7 @@
 import org.cryptomator.cloudaccess.api.ProgressListener;
 import org.cryptomator.cloudaccess.api.Quota;
 import org.cryptomator.cloudaccess.api.exceptions.NotFoundException;
+import org.cryptomator.cloudaccess.api.exceptions.QuotaNotAvailableException;
 
 import java.io.InputStream;
 import java.time.Duration;
@@ -65,14 +66,14 @@ public CompletionStage<Quota> quota(CloudPath folder) {
 		if (cachedMetadata != null) {
 			return cachedMetadata //
 					.map(CompletableFuture::completedFuture) //
-					.orElseGet(() -> CompletableFuture.failedFuture(new NotFoundException()));
+					.orElseGet(() -> CompletableFuture.failedFuture(new QuotaNotAvailableException()));
 		} else {
 			return delegate.quota(folder) //
 					.whenComplete((quota, exception) -> {
 						if (exception == null) {
 							assert quota != null;
 							quotaCache.put(folder, Optional.of(quota));
-						} else if (exception instanceof NotFoundException) {
+						} else if (exception instanceof NotFoundException || exception instanceof QuotaNotAvailableException) {
 							quotaCache.put(folder, Optional.empty());
 						} else {
 							quotaCache.invalidate(folder);

src/main/java/org/cryptomator/cloudaccess/vaultformat8/VaultFormat8ProviderDecorator.java

@@ -178,8 +178,7 @@ public CompletionStage<CloudPath> createFolder(CloudPath folder) {
 
 	@Override
 	public CompletionStage<Void> deleteFile(CloudPath file) {
-		return itemMetadata(file) //
-				.thenCompose(cloudNode -> getC9rPath(file)) //
+		return getC9rPath(file) //
 				.thenCompose(ciphertextPath -> {
 					fileHeaderCache.evict(ciphertextPath);
 					return delegate.deleteFile(ciphertextPath);
@@ -188,8 +187,7 @@ public CompletionStage<Void> deleteFile(CloudPath file) {
 
 	@Override
 	public CompletionStage<Void> deleteFolder(CloudPath folder) {
-		return itemMetadata(folder) //
-				.thenCompose(cloudNode -> deleteCiphertextDir(getDirPathFromClearTextDir(folder))) //
+		return deleteCiphertextDir(getDirPathFromClearTextDir(folder)) //
 				.thenCompose(ignored -> getC9rPath(folder)) //
 				.thenCompose(delegate::deleteFolder) //
 				.thenRun(() -> dirIdCache.evictIncludingDescendants(folder));