You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2012/12/05 02:54:10 UTC
webworks commit: [CB-1954] - support for custom headers for blackberry
Updated Branches:
refs/heads/master 2db6e8803 -> 5598f528f
[CB-1954] - support for custom headers for blackberry
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/5598f528
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/5598f528
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/5598f528
Branch: refs/heads/master
Commit: 5598f528f27ca08e95b597a549e124050b718d09
Parents: 2db6e88
Author: Tim Kim <ti...@adobe.com>
Authored: Tue Dec 4 17:54:02 2012 -0800
Committer: Tim Kim <ti...@adobe.com>
Committed: Tue Dec 4 17:54:02 2012 -0800
----------------------------------------------------------------------
.../src/org/apache/cordova/http/FileTransfer.java | 8 ++++++--
.../src/org/apache/cordova/http/FileUploader.java | 11 ++++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/5598f528/framework/ext/src/org/apache/cordova/http/FileTransfer.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/org/apache/cordova/http/FileTransfer.java b/framework/ext/src/org/apache/cordova/http/FileTransfer.java
index 0312707..b0f089c 100644
--- a/framework/ext/src/org/apache/cordova/http/FileTransfer.java
+++ b/framework/ext/src/org/apache/cordova/http/FileTransfer.java
@@ -113,14 +113,18 @@ public class FileTransfer extends Plugin {
String fileName = getArgument(args, 3, "image.jpg");
String mimeType = getArgument(args, 4, null);
JSONObject params = null;
-
+ JSONObject headers = null;
+
if (args.length() > 5 && !args.isNull(5)) {
params = args.getJSONObject(5);
}
+ if(args.length() > 8 && !args.isNull(8)){
+ headers = args.getJSONObject(8);
+ }
uploader = new FileUploader();
FileUploadResult r = uploader.upload(source, target, fileKey,
- fileName, mimeType, params);
+ fileName, mimeType, params, headers);
int status = r.getResponseCode();
if (status < 200 || status > 399) {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/5598f528/framework/ext/src/org/apache/cordova/http/FileUploader.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/org/apache/cordova/http/FileUploader.java b/framework/ext/src/org/apache/cordova/http/FileUploader.java
index 09ffc47..75645c7 100644
--- a/framework/ext/src/org/apache/cordova/http/FileUploader.java
+++ b/framework/ext/src/org/apache/cordova/http/FileUploader.java
@@ -67,7 +67,7 @@ public class FileUploader {
* @return FileUploadResult containing result of upload request
*/
public FileUploadResult upload(String filePath, String server, String fileKey,
- String fileName, String mimeType, JSONObject params)
+ String fileName, String mimeType, JSONObject params, JSONObject headers)
throws FileNotFoundException, IllegalArgumentException, IOException {
Logger.log(this.getClass().getName() + ": uploading " + filePath + " to " + server);
@@ -141,6 +141,15 @@ public class FileUploader {
HttpProtocolConstants.HEADER_CONTENT_LENGTH,
Long.toString(contentLength));
+ if(headers != null){
+ for(Enumeration e = headers.keys(); e.hasMoreElements();){
+ String key = e.nextElement().toString();
+ String value = headers.optString(key);
+ Logger.log(this.getClass().getName() + ": key=" + key + " value=" + value);
+ httpConn.setRequestProperty(key, value);
+ }
+ }
+
// set cookie
String cookie = HttpUtils.getCookie(server);
if (cookie != null) {