github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 08:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix up some minor FileTransfer bugs / warnings.

Browse Source 
- Catch abort error in download
- Fix up merge conflicts
- Fixed a couple of compiler warnings
This commit is contained in:
Andrew Grieve 2012-09-20 23:39:42 -04:00
parent df9d314361
commit 17af417235
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
framework/src/org/apache/cordova/FileTransfer.java
View File

@ -66,12 +66,13 @@ public class FileTransfer extends Plugin {
public static int CONNECTION_ERR = 3; public static int CONNECTION_ERR = 3;
public static int ABORTED_ERR = 4; public static int ABORTED_ERR = 4;
private static HashSet abortTriggered = new HashSet(); private static HashSet<String> abortTriggered = new HashSet<String>();
private SSLSocketFactory defaultSSLSocketFactory = null; private SSLSocketFactory defaultSSLSocketFactory = null;
private HostnameVerifier defaultHostnameVerifier = null; private HostnameVerifier defaultHostnameVerifier = null;
static class AbortException extends Exception { private static class AbortException extends Exception {
private static final long serialVersionUID = 1L;
public AbortException(String str) { public AbortException(String str) {
super(str); super(str);
} }
@ -95,10 +96,8 @@ public class FileTransfer extends Plugin {
if (action.equals("upload")) { if (action.equals("upload")) {
return upload(URLDecoder.decode(source), target, args, callbackId); return upload(URLDecoder.decode(source), target, args, callbackId);
} else if (action.equals("download")) { } else {
String objectId = args.getString(2); return download(source, target, args, callbackId);
boolean trustEveryone = args.optBoolean(3);
return download(source, target, trustEveryone, objectId, callbackId);
} }
} else if (action.equals("abort")) { } else if (action.equals("abort")) {
return abort(args); return abort(args);
@ -308,7 +307,6 @@ public class FileTransfer extends Plugin {
if (objectId != null) { if (objectId != null) {
// Only send progress callbacks if the JS code sent us an object ID, // Only send progress callbacks if the JS code sent us an object ID,
// so we don't spam old versions with unrecognized callbacks. // so we don't spam old versions with unrecognized callbacks.
Log.d(LOG_TAG, "****** About to send a progress result from upload");
progress.setLoaded(totalBytes); progress.setLoaded(totalBytes);
PluginResult progressResult = new PluginResult(PluginResult.Status.OK, progress.toJSONObject()); PluginResult progressResult = new PluginResult(PluginResult.Status.OK, progress.toJSONObject());
progressResult.setKeepCallback(true); progressResult.setKeepCallback(true);
@ -379,7 +377,6 @@ public class FileTransfer extends Plugin {
return new PluginResult(PluginResult.Status.JSON_EXCEPTION); return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
} catch (AbortException e) { } catch (AbortException e) {
JSONObject error = createFileTransferError(ABORTED_ERR, source, target, conn); JSONObject error = createFileTransferError(ABORTED_ERR, source, target, conn);
Log.e(LOG_TAG, error.toString(), e);
return new PluginResult(PluginResult.Status.ERROR, error); return new PluginResult(PluginResult.Status.ERROR, error);
} catch (Throwable t) { } catch (Throwable t) {
// Shouldn't happen, but will // Shouldn't happen, but will
@ -498,11 +495,13 @@ public class FileTransfer extends Plugin {
* @param target Full path of the file on the file system * @param target Full path of the file on the file system
* @return JSONObject the downloaded file * @return JSONObject the downloaded file
*/ */
private PluginResult download(String source, String target, boolean trustEveryone, String objectId, String callbackId) { private PluginResult download(String source, String target, JSONArray args, String callbackId) {
Log.d(LOG_TAG, "download " + source + " to " + target); Log.d(LOG_TAG, "download " + source + " to " + target);
HttpURLConnection connection = null; HttpURLConnection connection = null;
try { try {
boolean trustEveryone = args.optBoolean(2);
String objectId = args.getString(3);
File file = getFileFromPath(target); File file = getFileFromPath(target);
// create needed directories // create needed directories
@ -580,7 +579,6 @@ public class FileTransfer extends Plugin {
if (objectId != null) { if (objectId != null) {
// Only send progress callbacks if the JS code sent us an object ID, // Only send progress callbacks if the JS code sent us an object ID,
// so we don't spam old versions with unrecognized callbacks. // so we don't spam old versions with unrecognized callbacks.
Log.d(LOG_TAG, "****** About to send a progress result from download");
progress.setLoaded(totalBytes); progress.setLoaded(totalBytes);
PluginResult progressResult = new PluginResult(PluginResult.Status.OK, progress.toJSONObject()); PluginResult progressResult = new PluginResult(PluginResult.Status.OK, progress.toJSONObject());
progressResult.setKeepCallback(true); progressResult.setKeepCallback(true);
@ -617,6 +615,9 @@ public class FileTransfer extends Plugin {
return new PluginResult(PluginResult.Status.IO_EXCEPTION, error); return new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
} }
} catch (AbortException e) {
JSONObject error = createFileTransferError(ABORTED_ERR, source, target, connection);
return new PluginResult(PluginResult.Status.ERROR, error);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
JSONObject error = createFileTransferError(FILE_NOT_FOUND_ERR, source, target, connection); JSONObject error = createFileTransferError(FILE_NOT_FOUND_ERR, source, target, connection);
Log.d(LOG_TAG, "I got a file not found exception"); Log.d(LOG_TAG, "I got a file not found exception");