Updated Branches: refs/heads/master a219feaa6 -> 2dc0727e3
CB-1151: FileTransfer.download decodes the URL, resulting in a 404 error Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/2dc0727e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/2dc0727e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/2dc0727e Branch: refs/heads/master Commit: 2dc0727e36438f82e811e1b04014095023164528 Parents: a219fea Author: macdonst <simon.macdon...@gmail.com> Authored: Mon Aug 13 15:43:55 2012 -0400 Committer: macdonst <simon.macdon...@gmail.com> Committed: Mon Aug 13 15:43:55 2012 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/FileTransfer.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/2dc0727e/framework/src/org/apache/cordova/FileTransfer.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/FileTransfer.java b/framework/src/org/apache/cordova/FileTransfer.java index 6cde4b5..61fa284 100644 --- a/framework/src/org/apache/cordova/FileTransfer.java +++ b/framework/src/org/apache/cordova/FileTransfer.java @@ -75,7 +75,7 @@ public class FileTransfer extends Plugin { String source = null; String target = null; try { - source = URLDecoder.decode(args.getString(0)); + source = args.getString(0); target = args.getString(1); } catch (JSONException e) { Log.d(LOG_TAG, "Missing source or target"); @@ -83,7 +83,7 @@ public class FileTransfer extends Plugin { } if (action.equals("upload")) { - return upload(source, target, args); + return upload(URLDecoder.decode(source), target, args); } else if (action.equals("download")) { return download(source, target); } else { @@ -117,7 +117,7 @@ public class FileTransfer extends Plugin { boolean trustEveryone = args.optBoolean(6); boolean chunkedMode = args.optBoolean(7) || args.isNull(7); //Always use chunked mode unless set to false as per API JSONObject headers = args.optJSONObject(8); - // Look for headers on the params map for backwards compatibility with older Cordova versions. + // Look for headers on the params map for backwards compatibility with older Cordova versions. if (headers == null && params != null) { headers = params.optJSONObject("headers"); } @@ -184,7 +184,7 @@ public class FileTransfer extends Plugin { conn.setRequestMethod("POST"); conn.setRequestProperty("Connection", "Keep-Alive"); conn.setRequestProperty("Content-Type", "multipart/form-data;boundary=" + BOUNDARY); - + // Set the cookies on the response String cookie = CookieManager.getInstance().getCookie(target); if (cookie != null) {
