Add folder upload support

domain/src/main/java/org/cryptomator/domain/usecases/cloud/DownloadFiles.java

@@ -8,8 +8,6 @@
 import org.cryptomator.generator.Parameter;
 import org.cryptomator.generator.UseCase;
 
-import java.io.Closeable;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,18 +30,10 @@ public List<CloudFile> execute(ProgressAware<DownloadState> progressAware) throw
 				cloudContentRepository.read(file.getDownloadFile(), null, file.getDataSink(), progressAware);
 				downloadedFiles.add(file.getDownloadFile());
 			} finally {
-				closeQuietly(file.getDataSink());
+				StreamHelper.closeQuietly(file.getDataSink());
 			}
 		}
 		return downloadedFiles;
 	}
 
-	private void closeQuietly(Closeable closeable) {
-		try {
-			closeable.close();
-		} catch (IOException e) {
-			// ignore
-		}
-	}
-
 }

domain/src/main/java/org/cryptomator/domain/usecases/cloud/StreamHelper.java

@@ -0,0 +1,38 @@
+package org.cryptomator.domain.usecases.cloud;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+class StreamHelper {
+
+	private static final int EOF = -1;
+	private static final int BUFFER_SIZE = 4096;
+
+	private StreamHelper() {
+	}
+
+	static void copy(InputStream in, OutputStream out) throws IOException {
+		byte[] buffer = new byte[BUFFER_SIZE];
+		try {
+			int read;
+			while ((read = in.read(buffer)) != EOF) {
+				out.write(buffer, 0, read);
+			}
+		} finally {
+			closeQuietly(in);
+			closeQuietly(out);
+		}
+	}
+
+	static void closeQuietly(Closeable closeable) {
+		if (closeable != null) {
+			try {
+				closeable.close();
+			} catch (IOException e) {
+				// ignore
+			}
+		}
+	}
+}

domain/src/main/java/org/cryptomator/domain/usecases/cloud/UploadFiles.java

@@ -12,7 +12,6 @@
 import org.cryptomator.generator.Parameter;
 import org.cryptomator.generator.UseCase;
 
-import java.io.Closeable;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -26,8 +25,6 @@
 @UseCase
 class UploadFiles {
 
-	private static final int EOF = -1;
-
 	private final Context context;
 	private final CloudContentRepository cloudContentRepository;
 	private final CloudFolder parent;
@@ -104,7 +101,7 @@ private File copyDataToFile(DataSource dataSource) {
 			File target = createTempFile("upload", "tmp", dir);
 			InputStream in = CancelAwareDataSource.wrap(dataSource, cancelledFlag).open(context);
 			OutputStream out = new FileOutputStream(target);
-			copy(in, out);
+			StreamHelper.copy(in, out);
 			dataSource.modifiedDate(context).ifPresent(value -> target.setLastModified(value.getTime()));
 			return target;
 		} catch (IOException e) {
@@ -123,36 +120,4 @@ private CloudFile writeCloudFile(String fileName, CancelAwareDataSource dataSour
 				size);
 	}
 
-	private void copy(InputStream in, OutputStream out) throws IOException {
-		byte[] buffer = new byte[4096];
-		try {
-			while (copyDidNotReachEof(in, out, buffer)) {
-				// empty
-			}
-		} finally {
-			closeQuietly(in);
-			closeQuietly(out);
-		}
-	}
-
-	private boolean copyDidNotReachEof(InputStream in, OutputStream out, byte[] buffer) throws IOException {
-		int read = in.read(buffer);
-		if (read == EOF) {
-			return false;
-		} else {
-			out.write(buffer, 0, read);
-			return true;
-		}
-	}
-
-	private void closeQuietly(Closeable closeable) {
-		if (closeable != null) {
-			try {
-				closeable.close();
-			} catch (IOException e) {
-				// ignore
-			}
-		}
-	}
-
 }

domain/src/main/java/org/cryptomator/domain/usecases/cloud/UploadFolderFiles.java

@@ -0,0 +1,133 @@
+package org.cryptomator.domain.usecases.cloud;
+
+import android.content.Context;
+
+import org.cryptomator.domain.CloudFile;
+import org.cryptomator.domain.CloudFolder;
+import org.cryptomator.domain.exception.BackendException;
+import org.cryptomator.domain.exception.CancellationException;
+import org.cryptomator.domain.exception.FatalBackendException;
+import org.cryptomator.domain.repository.CloudContentRepository;
+import org.cryptomator.domain.usecases.ProgressAware;
+import org.cryptomator.generator.Parameter;
+import org.cryptomator.generator.UseCase;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.io.File.createTempFile;
+
+@UseCase
+class UploadFolderFiles {
+
+	private final Context context;
+	private final CloudContentRepository cloudContentRepository;
+	private final CloudFolder parent;
+	private final UploadFolderStructure folderStructure;
+
+	private volatile boolean cancelled;
+	private final Flag cancelledFlag = new Flag() {
+		@Override
+		public boolean get() {
+			return cancelled;
+		}
+	};
+
+	public UploadFolderFiles(Context context, //
+			CloudContentRepository cloudContentRepository, //
+			@Parameter CloudFolder parent, //
+			@Parameter UploadFolderStructure folderStructure) {
+		this.context = context;
+		this.cloudContentRepository = cloudContentRepository;
+		this.parent = parent;
+		this.folderStructure = folderStructure;
+	}
+
+	public void onCancel() {
+		cancelled = true;
+	}
+
+	public List<CloudFile> execute(ProgressAware<UploadState> progressAware) throws BackendException {
+		cancelled = false;
+		try {
+			return uploadFolder(parent, folderStructure, progressAware);
+		} catch (BackendException | RuntimeException e) {
+			if (cancelled) {
+				throw new CancellationException(e);
+			} else {
+				throw e;
+			}
+		}
+	}
+
+	private List<CloudFile> uploadFolder(CloudFolder targetParent, UploadFolderStructure structure, ProgressAware<UploadState> progressAware) throws BackendException {
+		CloudFolder createdFolder = cloudContentRepository.create( //
+				cloudContentRepository.folder(targetParent, structure.getFolderName()));
+
+		List<CloudFile> uploadedFiles = new ArrayList<>();
+
+		for (UploadFile file : structure.getFiles()) {
+			uploadedFiles.add(upload(createdFolder, file, progressAware));
+		}
+
+		for (UploadFolderStructure subfolder : structure.getSubfolders()) {
+			uploadedFiles.addAll(uploadFolder(createdFolder, subfolder, progressAware));
+		}
+
+		return uploadedFiles;
+	}
+
+	private CloudFile upload(CloudFolder folder, UploadFile uploadFile, ProgressAware<UploadState> progressAware) throws BackendException {
+		DataSource dataSource = uploadFile.getDataSource();
+		if (dataSource.size(context) != null) {
+			return upload(folder, uploadFile, dataSource, progressAware);
+		} else {
+			File file = copyDataToFile(dataSource);
+			try {
+				return upload(folder, uploadFile, FileBasedDataSource.from(file), progressAware);
+			} finally {
+				file.delete();
+			}
+		}
+	}
+
+	private CloudFile upload(CloudFolder folder, UploadFile uploadFile, DataSource dataSource, ProgressAware<UploadState> progressAware) throws BackendException {
+		return writeCloudFile( //
+				folder, //
+				uploadFile.getFileName(), //
+				CancelAwareDataSource.wrap(dataSource, cancelledFlag), //
+				uploadFile.getReplacing(), //
+				progressAware);
+	}
+
+	private CloudFile writeCloudFile(CloudFolder folder, String fileName, CancelAwareDataSource dataSource, boolean replacing, ProgressAware<UploadState> progressAware) throws BackendException {
+		Long size = dataSource.size(context);
+		CloudFile source = cloudContentRepository.file(folder, fileName, size);
+		return cloudContentRepository.write( //
+				source, //
+				dataSource, //
+				progressAware, //
+				replacing, //
+				size);
+	}
+
+	private File copyDataToFile(DataSource dataSource) {
+		File dir = context.getCacheDir();
+		try {
+			File target = createTempFile("upload", "tmp", dir);
+			InputStream in = CancelAwareDataSource.wrap(dataSource, cancelledFlag).open(context);
+			OutputStream out = new FileOutputStream(target);
+			StreamHelper.copy(in, out);
+			dataSource.modifiedDate(context).ifPresent(value -> target.setLastModified(value.getTime()));
+			return target;
+		} catch (IOException e) {
+			throw new FatalBackendException(e);
+		}
+	}
+
+}

domain/src/main/java/org/cryptomator/domain/usecases/cloud/UploadFolderStructure.java

@@ -0,0 +1,45 @@
+package org.cryptomator.domain.usecases.cloud;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UploadFolderStructure {
+
+	private final String folderName;
+	private final List<UploadFile> files;
+	private final List<UploadFolderStructure> subfolders;
+
+	public UploadFolderStructure(String folderName) {
+		this.folderName = folderName;
+		this.files = new ArrayList<>();
+		this.subfolders = new ArrayList<>();
+	}
+
+	public String getFolderName() {
+		return folderName;
+	}
+
+	public List<UploadFile> getFiles() {
+		return files;
+	}
+
+	public List<UploadFolderStructure> getSubfolders() {
+		return subfolders;
+	}
+
+	public void addFile(UploadFile file) {
+		this.files.add(file);
+	}
+
+	public void addSubfolder(UploadFolderStructure subfolder) {
+		this.subfolders.add(subfolder);
+	}
+
+	public int totalFileCount() {
+		int count = files.size();
+		for (UploadFolderStructure subfolder : subfolders) {
+			count += subfolder.totalFileCount();
+		}
+		return count;
+	}
+}