Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use helper functions where appropriate.

Browse Source
This commit is contained in:
Peter Serwylo 2015-09-09 17:26:22 +10:00
parent 7b773f94f9
commit a09587c7e2
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
F-Droid/src/org/fdroid/fdroid/Utils.java
View File

@ -48,6 +48,7 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.BufferedInputStream;
import java.io.Closeable;
import java.io.File;
import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
@ -162,16 +163,19 @@ public final class Utils {
}
public static boolean copy(File inFile, File outFile) {
InputStream input = null;
OutputStream output = null;
try {
InputStream input = new FileInputStream(inFile);
OutputStream output = new FileOutputStream(outFile);
input = new FileInputStream(inFile);
output = new FileOutputStream(outFile);
Utils.copy(input, output);
output.close();
input.close();
return true;
} catch (IOException e) {
Log.e(TAG, "I/O error when copying a file", e);
return false;
} finally {
closeQuietly(output);
closeQuietly(input);
}
}

23
F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java
View File

@ -10,6 +10,10 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.os.ParcelFileDescriptor;
import android.text.TextUtils;
import android.util.Log;
import org.fdroid.fdroid.Utils;
import java.io.File;
import java.io.FileDescriptor;
@ -49,7 +53,7 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader {
this.listener = listener;
this.localFile = localFile;
if (downloadTitle == null || downloadTitle.trim().length() == 0) {
if (TextUtils.isEmpty(downloadTitle)) {
this.downloadTitle = remoteAddress;
}
@ -97,18 +101,15 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader {
* @throws IOException
*/
private void copyFile(FileDescriptor inputFile, File outputFile) throws IOException {
InputStream is = new FileInputStream(inputFile);
OutputStream os = new FileOutputStream(outputFile);
byte[] buffer = new byte[1024];
int count = 0;
InputStream input = null;
OutputStream output = null;
try {
while ((count = is.read(buffer, 0, buffer.length)) > 0) {
os.write(buffer, 0, count);
}
input = new FileInputStream(inputFile);
output = new FileOutputStream(outputFile);
Utils.copy(input, output);
} finally {
os.close();
is.close();
Utils.closeQuietly(output);
Utils.closeQuietly(input);
}
}