Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 22:29:53 +01:00
Code Issues Projects Releases Wiki Activity

Renamed FIleUtils to IoUtils, added copy() method.

Browse Source
This commit is contained in:
akwizgran
2016-08-22 15:29:13 +01:00
parent d34afa5f30
commit 34a4a3f3c6
4 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/org/briarproject/android/util/AndroidUtils.java
View File

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

17
briar-core/src/org/briarproject/util/FileUtils.java
View File

@@ -1,17 +0,0 @@
package org.briarproject.util;
import java.io.File;
public class FileUtils {
public static void deleteFileOrDir(File f) {
if (f.isFile()) {
f.delete();
} else if (f.isDirectory()) {
File[] children = f.listFiles();
if (children != null)
for (File child : children) deleteFileOrDir(child);
f.delete();
}
}
}

40
briar-core/src/org/briarproject/util/IoUtils.java Normal file
View File

@@ -0,0 +1,40 @@
package org.briarproject.util;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
public class IoUtils {
public static void deleteFileOrDir(File f) {
if (f.isFile()) {
f.delete();
} else if (f.isDirectory()) {
File[] children = f.listFiles();
if (children != null)
for (File child : children) deleteFileOrDir(child);
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();
}
}
}

4
briar-tests/src/org/briarproject/TestUtils.java
View File

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