You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/04/25 20:13:28 UTC
[1/3] git commit: CB-6452 Incremented plugin version on dev branch.
Repository: cordova-plugin-file-transfer
Updated Branches:
refs/heads/master 6a92b13cf -> a59eb7731
CB-6452 Incremented plugin version on dev branch.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/eb63c466
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/eb63c466
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/eb63c466
Branch: refs/heads/master
Commit: eb63c466e8425f9bf7ceb9c570f91d42979e5993
Parents: 8b727b2
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Apr 17 11:16:03 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Apr 17 11:16:03 2014 -0400
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/eb63c466/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index a4f4346..333123b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -21,7 +21,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.file-transfer"
- version="0.4.3">
+ version="0.4.4-dev">
<name>File Transfer</name>
<description>Cordova File Transfer Plugin</description>
<license>Apache 2.0</license>
[2/3] git commit: CB-6494 android: Fix upload of KitKat content URIs
Posted by ia...@apache.org.
CB-6494 android: Fix upload of KitKat content URIs
FileTransfer was double-decoding the source URL.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/98e5da55
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/98e5da55
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/98e5da55
Branch: refs/heads/master
Commit: 98e5da556f11ff04d532d2f7569f4ef7bd786ba1
Parents: eb63c46
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Apr 22 22:16:53 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Apr 22 22:16:53 2014 -0400
----------------------------------------------------------------------
src/android/FileTransfer.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/98e5da55/src/android/FileTransfer.java
----------------------------------------------------------------------
diff --git a/src/android/FileTransfer.java b/src/android/FileTransfer.java
index e370c5f..eeed2f6 100644
--- a/src/android/FileTransfer.java
+++ b/src/android/FileTransfer.java
@@ -28,10 +28,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URLConnection;
-import java.net.URLDecoder;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.HashMap;
@@ -177,12 +175,7 @@ public class FileTransfer extends CordovaPlugin {
String target = args.getString(1);
if (action.equals("upload")) {
- try {
- source = URLDecoder.decode(source, "UTF-8");
- upload(source, target, args, callbackContext);
- } catch (UnsupportedEncodingException e) {
- callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.MALFORMED_URL_EXCEPTION, "UTF-8 error."));
- }
+ upload(source, target, args, callbackContext);
} else {
download(source, target, args, callbackContext);
}
[3/3] git commit: Merge branch 'dev' into master
Posted by ia...@apache.org.
Merge branch 'dev' into master
Futher development should take place on master
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/a59eb773
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/a59eb773
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/a59eb773
Branch: refs/heads/master
Commit: a59eb773161d24f347cfb44596f0072b14f12ee4
Parents: 6a92b13 98e5da5
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Apr 25 11:21:38 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri Apr 25 11:21:38 2014 -0400
----------------------------------------------------------------------
plugin.xml | 2 +-
src/android/FileTransfer.java | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------