You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2013/01/18 18:33:40 UTC
[2/8] android commit: Working Base64 encoding.
Working Base64 encoding.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/03b974ee
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/03b974ee
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/03b974ee
Branch: refs/heads/master
Commit: 03b974ee3f4272c11c6e51ee512bd7151e5aface
Parents: f145605
Author: Braden Shepherdson <br...@chromium.org>
Authored: Tue Jan 15 11:48:09 2013 -0500
Committer: Braden Shepherdson <br...@chromium.org>
Committed: Tue Jan 15 11:48:09 2013 -0500
----------------------------------------------------------------------
framework/src/org/apache/cordova/BinaryEcho.java | 7 ++-----
.../src/org/apache/cordova/api/PluginResult.java | 3 ++-
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/03b974ee/framework/src/org/apache/cordova/BinaryEcho.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/BinaryEcho.java b/framework/src/org/apache/cordova/BinaryEcho.java
index 1a25f6e..61f590b 100644
--- a/framework/src/org/apache/cordova/BinaryEcho.java
+++ b/framework/src/org/apache/cordova/BinaryEcho.java
@@ -25,6 +25,7 @@ import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
+import android.util.Base64;
import android.util.Log;
public class BinaryEcho extends CordovaPlugin {
@@ -43,12 +44,8 @@ public class BinaryEcho extends CordovaPlugin {
//CordovaJSONArray cdvArgs = (CordovaJSONArray) args;
//byte[] data = cdvArgs.getArrayBuffer(0);
Log.i("Braden", "BinaryEcho top");
- String str = args.getString(0);
- byte[] data = args.getString(0).getBytes();
+ byte[] data = Base64.decode(args.getString(0), Base64.DEFAULT);
Log.i("Braden", "byte[] retrieved: " + data.length);
- for (int i = 0; i < 10; i++) {
- Log.i("Braden", str.substring(i, i+1) + " " + data[i]);
- }
// Don't return any result now, since status results will be sent when events come in from broadcast receiver
PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, data);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/03b974ee/framework/src/org/apache/cordova/api/PluginResult.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/api/PluginResult.java b/framework/src/org/apache/cordova/api/PluginResult.java
index 610da97..ddceb42 100755
--- a/framework/src/org/apache/cordova/api/PluginResult.java
+++ b/framework/src/org/apache/cordova/api/PluginResult.java
@@ -21,6 +21,7 @@ package org.apache.cordova.api;
import org.json.JSONArray;
import org.json.JSONObject;
+import android.util.Base64;
import android.util.Log;
public class PluginResult {
@@ -73,7 +74,7 @@ public class PluginResult {
public PluginResult(Status status, byte[] data) {
this.status = status.ordinal();
this.messageType = MESSAGE_TYPE_ARRAYBUFFER;
- this.encodedMessage = new String(data);
+ this.encodedMessage = Base64.encodeToString(data, Base64.NO_WRAP);
Log.i("Braden", "Message.length() = " + this.encodedMessage.length());
}