Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8A11710CD1 for ; Thu, 3 Apr 2014 06:07:49 +0000 (UTC) Received: (qmail 63098 invoked by uid 500); 3 Apr 2014 06:07:48 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 63004 invoked by uid 500); 3 Apr 2014 06:07:47 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 62728 invoked by uid 99); 3 Apr 2014 06:07:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Apr 2014 06:07:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0FEE29394EE; Thu, 3 Apr 2014 06:07:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: naika@apache.org To: commits@cordova.apache.org Date: Thu, 03 Apr 2014 06:07:44 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: CB-6388: Handle binary data correctly in LOAD_URL bridge Repository: cordova-amazon-fireos Updated Branches: refs/heads/master 5e9cb8fbb -> 9375b4103 CB-6388: Handle binary data correctly in LOAD_URL bridge Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/736f44bb Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/736f44bb Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/736f44bb Branch: refs/heads/master Commit: 736f44bbc2c663d1211bba59cfa6479ecd52205d Parents: c303a63 Author: Ian Clelland Authored: Wed Apr 2 12:08:27 2014 -0400 Committer: Archana Naik Committed: Wed Apr 2 13:31:04 2014 -0700 ---------------------------------------------------------------------- .../apache/cordova/NativeToJsMessageQueue.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/736f44bb/framework/src/org/apache/cordova/NativeToJsMessageQueue.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java index 9b61f98..56c9a55 100755 --- a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java +++ b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java @@ -494,9 +494,22 @@ public class NativeToJsMessageQueue { .append(success) .append(",") .append(status) - .append(",[") - .append(pluginResult.getMessage()) - .append("],") + .append(",["); + switch (pluginResult.getMessageType()) { + case PluginResult.MESSAGE_TYPE_BINARYSTRING: + sb.append("atob('") + .append(pluginResult.getMessage()) + .append("')"); + break; + case PluginResult.MESSAGE_TYPE_ARRAYBUFFER: + sb.append("cordova.require('cordova/base64').toArrayBuffer('") + .append(pluginResult.getMessage()) + .append("')"); + break; + default: + sb.append(pluginResult.getMessage()); + } + sb.append("],") .append(pluginResult.getKeepCallback()) .append(");"); }