Renamed FIleUtils to IoUtils, added copy() method.

briar-android/src/org/briarproject/android/util/AndroidUtils.java

@@ -9,7 +9,7 @@ import android.support.design.widget.TextInputLayout;
 import android.text.format.DateUtils;
 
 import org.briarproject.R;
-import org.briarproject.util.FileUtils;
+import org.briarproject.util.IoUtils;
 import org.briarproject.util.StringUtils;
 
 import java.io.File;
@@ -89,7 +89,7 @@ public class AndroidUtils {
 		if (children != null) {
 			for (File child : children) {
 				if (!child.getName().equals("lib"))
-					FileUtils.deleteFileOrDir(child);
+					IoUtils.deleteFileOrDir(child);
 			}
 		}
 	}

briar-core/src/org/briarproject/util/FileUtils.java → briar-core/src/org/briarproject/util/IoUtils.java

 package org.briarproject.util;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
-public class FileUtils {
+public class IoUtils {
 
 	public static void deleteFileOrDir(File f) {
 		if (f.isFile()) {
@@ -14,4 +17,24 @@ public class FileUtils {
 			f.delete();
 		}
 	}
+
+	public static void copy(InputStream in, OutputStream out)
+			throws IOException {
+		byte[] buf = new byte[4096];
+		try {
+			try {
+				while (true) {
+					int read = in.read(buf);
+					if (read == -1) break;
+					out.write(buf, 0, read);
+				}
+				out.flush();
+			} finally {
+				in.close();
+			}
+		} finally {
+			out.close();
+		}
+	}
+
 }

briar-tests/src/org/briarproject/TestUtils.java

@@ -2,7 +2,7 @@ package org.briarproject;
 
 import org.briarproject.api.UniqueId;
 import org.briarproject.api.crypto.SecretKey;
-import org.briarproject.util.FileUtils;
+import org.briarproject.util.IoUtils;
 
 import java.io.File;
 import java.util.Random;
@@ -20,7 +20,7 @@ public class TestUtils {
 	}
 
 	public static void deleteTestDirectory(File testDir) {
-		FileUtils.deleteFileOrDir(testDir);
+		IoUtils.deleteFileOrDir(testDir);
 		testDir.getParentFile().delete(); // Delete if empty
 	}