wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 942611 - Store temp files in Android's cache dir. r=rewman

Browse Source
This commit is contained in:
Wes Johnston 2014-03-06 12:23:52 -08:00
parent 220386026f
commit bfa9a38eda
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/FilePicker.java
View File

@ -202,7 +202,7 @@ public class FilePicker implements GeckoEventListener {
* pick and launch the file picker, but will throw away the result.
*/
protected void showFilePickerAsync(String mimeType, final ResultHandler handler) {
final FilePickerResultHandler fileHandler = new FilePickerResultHandler(handler);
final FilePickerResultHandler fileHandler = new FilePickerResultHandler(handler, mContext);
getFilePickerIntentAsync(mimeType, fileHandler, new IntentHandler() {
@Override
public void gotIntent(Intent intent) {

29
mobile/android/base/FilePickerResultHandler.java
View File

@ -9,6 +9,7 @@ import org.mozilla.gecko.util.ActivityResultHandler;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
@ -32,31 +33,25 @@ import java.util.Queue;
class FilePickerResultHandler implements ActivityResultHandler {
private static final String LOGTAG = "GeckoFilePickerResultHandler";
private static final String UPLOADS_DIR = "uploads";
protected final Queue<String> mFilePickerResult;
protected final FilePicker.ResultHandler mHandler;
protected final FilePicker.ResultHandler handler;
private final File cacheDir;
// this code is really hacky and doesn't belong anywhere so I'm putting it here for now
// until I can come up with a better solution.
private String mImageName = "";
public FilePickerResultHandler(Queue<String> resultQueue) {
mFilePickerResult = resultQueue;
mHandler = null;
}
/* Use this constructor to asynchronously listen for results */
public FilePickerResultHandler(FilePicker.ResultHandler handler) {
mFilePickerResult = null;
mHandler = handler;
public FilePickerResultHandler(FilePicker.ResultHandler handler, Context context) {
cacheDir = new File(context.getCacheDir(), UPLOADS_DIR);
this.handler = handler;
}
private void sendResult(String res) {
if (mFilePickerResult != null)
mFilePickerResult.offer(res);
if (mHandler != null)
mHandler.gotFile(res);
if (handler != null) {
handler.gotFile(res);
}
}
@Override
@ -192,7 +187,9 @@ class FilePickerResultHandler implements ActivityResultHandler {
// Now write the data to the temp file
try {
File file = File.createTempFile(fileName, fileExt, GeckoLoader.getGREDir(GeckoAppShell.getContext()));
cacheDir.mkdir();
File file = File.createTempFile(fileName, fileExt, cacheDir);
FileOutputStream fos = new FileOutputStream(file);
InputStream is = cr.openInputStream(mUri);
byte[] buf = new byte[4096];