Updating with fixed JS from CB-2279

Partial fix for CB-2269, we probably shoudln't call Config.init twice
Partial Fix for CB-2269
2026-02-10 00:03:01 +08:00 · 2013-01-21 13:47:26 -08:00 · 2013-01-18 16:41:10 -08:00 · 2013-01-18 16:37:55 -08:00 · 2013-01-18 15:33:38 -08:00 · 2013-01-18 11:44:09 -08:00
16 changed files with 691 additions and 450 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.3.0
+2.4.0rc1
--- a/bin/templates/project/Activity.java
+++ b/bin/templates/project/Activity.java
@@ -28,7 +28,6 @@ public class __ACTIVITY__ extends DroidGap
    public void onCreate(Bundle savedInstanceState)
    {
        super.onCreate(savedInstanceState);
-        Config.init(this);
        // Set by <content src="index.html" /> in config.xml
        super.loadUrl(Config.getStartUrl());
        //super.loadUrl("file:///android_asset/www/index.html")
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@@ -33,7 +33,7 @@
                <p class="event received">Device is Ready</p>
            </div>
        </div>
-        <script type="text/javascript" src="cordova-2.3.0.js"></script>
+        <script type="text/javascript" src="cordova-2.4.0rc1.js"></script>
        <script type="text/javascript" src="js/index.js"></script>
        <script type="text/javascript">
            app.initialize();
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
 <html>
  <head>
    <title></title>
-    <script src="cordova-2.3.0.js"></script>
+    <script src="cordova-2.4.0rc1.js"></script>
  </head>
  <body>

--- a/framework/project.properties
+++ b/framework/project.properties
@@ -10,7 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:17
+target=android-17
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true
--- a/framework/src/org/apache/cordova/CordovaArgs.java
+++ b/framework/src/org/apache/cordova/CordovaArgs.java
@@ -0,0 +1,112 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package org.apache.cordova;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import android.util.Base64;
+
+public class CordovaArgs {
+    private JSONArray baseArgs;
+
+    public CordovaArgs(JSONArray args) {
+        this.baseArgs = args;
+    }
+
+
+    // Pass through the basics to the base args.
+    public Object get(int index) throws JSONException {
+        return baseArgs.get(index);
+    }
+
+    public boolean getBoolean(int index) throws JSONException {
+        return baseArgs.getBoolean(index);
+    }
+
+    public double getDouble(int index) throws JSONException {
+        return baseArgs.getDouble(index);
+    }
+
+    public int getInt(int index) throws JSONException {
+        return baseArgs.getInt(index);
+    }
+
+    public JSONArray getJSONArray(int index) throws JSONException {
+        return baseArgs.getJSONArray(index);
+    }
+
+    public Object getJSONObject(int index) throws JSONException {
+        return baseArgs.getJSONObject(index);
+    }
+
+    public long getLong(int index) throws JSONException {
+        return baseArgs.getLong(index);
+    }
+
+    public String getString(int index) throws JSONException {
+        return baseArgs.getString(index);
+    }
+
+
+    public Object opt(int index) {
+        return baseArgs.opt(index);
+    }
+
+    public boolean optBoolean(int index) {
+        return baseArgs.optBoolean(index);
+    }
+
+    public double optDouble(int index) {
+        return baseArgs.optDouble(index);
+    }
+
+    public int optInt(int index) {
+        return baseArgs.optInt(index);
+    }
+
+    public JSONArray optJSONArray(int index) {
+        return baseArgs.optJSONArray(index);
+    }
+
+    public Object optJSONObject(int index) {
+        return baseArgs.optJSONObject(index);
+    }
+
+    public long optLong(int index) {
+        return baseArgs.optLong(index);
+    }
+
+    public String optString(int index) {
+        return baseArgs.optString(index);
+    }
+
+    public boolean isNull(int index) {
+        return baseArgs.isNull(index);
+    }
+
+
+    // The interesting custom helpers.
+    public byte[] getArrayBuffer(int index) throws JSONException {
+        String encoded = baseArgs.getString(index);
+        return Base64.decode(encoded, Base64.DEFAULT);
+    }
+}
+
+
--- a/framework/src/org/apache/cordova/CordovaChromeClient.java
+++ b/framework/src/org/apache/cordova/CordovaChromeClient.java
@@ -385,6 +385,11 @@ public class CordovaChromeClient extends WebChromeClient {
    }

    public void openFileChooser( ValueCallback<Uri> uploadMsg, String acceptType ) {
+        this.openFileChooser(uploadMsg, acceptType, null);
+    }
+    
+    public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture)
+    {
        mUploadMessage = uploadMsg;
        Intent i = new Intent(Intent.ACTION_GET_CONTENT);
        i.addCategory(Intent.CATEGORY_OPENABLE);
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -39,7 +39,7 @@ import android.telephony.TelephonyManager;
 public class Device extends CordovaPlugin {
    public static final String TAG = "Device";

-    public static String cordovaVersion = "2.3.0";              // Cordova version
+    public static String cordovaVersion = "2.4.0rc1";              // Cordova version
    public static String platform = "Android";                  // Device OS
    public static String uuid;                                  // Device UUID

--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -261,7 +261,7 @@ public class DroidGap extends Activity implements CordovaInterface {
    @SuppressWarnings("deprecation")
    @Override
    public void onCreate(Bundle savedInstanceState) {
-
+        Config.init(this);
        LOG.d(TAG, "DroidGap.onCreate()");
        super.onCreate(savedInstanceState);

--- a/framework/src/org/apache/cordova/Echo.java
+++ b/framework/src/org/apache/cordova/Echo.java
@@ -20,24 +20,28 @@ package org.apache.cordova;

 import org.apache.cordova.api.CallbackContext;
 import org.apache.cordova.api.CordovaPlugin;
-import org.json.JSONArray;
 import org.json.JSONException;

 public class Echo extends CordovaPlugin {

    @Override
-    public boolean execute(String action, JSONArray args, final CallbackContext callbackContext) throws JSONException {
-        final String result = args.isNull(0) ? null : args.getString(0);
+    public boolean execute(String action, CordovaArgs args, final CallbackContext callbackContext) throws JSONException {
        if ("echo".equals(action)) {
+            final String result = args.isNull(0) ? null : args.getString(0);
            callbackContext.success(result);
            return true;
        } else if ("echoAsync".equals(action)) {
+            final String result = args.isNull(0) ? null : args.getString(0);
            cordova.getThreadPool().execute(new Runnable() {
                public void run() {
                    callbackContext.success(result);
                }
            });
            return true;
+        } else if ("echoArrayBuffer".equals(action)) {
+            final byte[] result = args.getArrayBuffer(0);
+            callbackContext.success(result);
+            return true;
        }
        return false;
    }
--- a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
+++ b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
@@ -130,7 +130,8 @@ public class NativeToJsMessageQueue {
    }
    
    private void packMessage(JsMessage message, StringBuilder sb) {
-        sb.append(message.calculateEncodedLength())
+        int len = message.calculateEncodedLength();
+        sb.append(len)
          .append(' ');
        message.encodeAsMessage(sb);
    }
@@ -166,7 +167,8 @@ public class NativeToJsMessageQueue {
                // Attach a char to indicate that there are more messages pending.
                sb.append('*');
            }
-            return sb.toString();
+            String ret = sb.toString();
+            return ret;
        }
    }
    
@@ -209,7 +211,8 @@ public class NativeToJsMessageQueue {
            for (int i = willSendAllMessages ? 1 : 0; i < numMessagesToSend; ++i) {
                sb.append('}');
            }
-            return sb.toString();
+            String ret = sb.toString();
+            return ret;
        }
    }   

@@ -406,6 +409,9 @@ public class NativeToJsMessageQueue {
                case PluginResult.MESSAGE_TYPE_STRING: // s
                    ret += 1 + pluginResult.getStrMessage().length();
                    break;
+                case PluginResult.MESSAGE_TYPE_ARRAYBUFFER:
+                    ret += 1 + pluginResult.getMessage().length();
+                    break;
                case PluginResult.MESSAGE_TYPE_JSON:
                default:
                    ret += pluginResult.getMessage().length();
@@ -445,6 +451,10 @@ public class NativeToJsMessageQueue {
                    sb.append('s');
                    sb.append(pluginResult.getStrMessage());
                    break;
+                case PluginResult.MESSAGE_TYPE_ARRAYBUFFER:
+                    sb.append('A');
+                    sb.append(pluginResult.getMessage());
+                    break;
                case PluginResult.MESSAGE_TYPE_JSON:
                default:
                    sb.append(pluginResult.getMessage()); // [ or {
--- a/framework/src/org/apache/cordova/api/CallbackContext.java
+++ b/framework/src/org/apache/cordova/api/CallbackContext.java
@@ -71,6 +71,15 @@ public class CallbackContext {
        sendPluginResult(new PluginResult(PluginResult.Status.OK, message));
    }

+    /**
+     * Helper for success callbacks that just returns the Status.OK by default
+     *
+     * @param message           The message to add to the success result.
+     */
+    public void success(byte[] message) {
+        sendPluginResult(new PluginResult(PluginResult.Status.OK, message));
+    }
+
    /**
     * Helper for success callbacks that just returns the Status.OK by default
     *
--- a/framework/src/org/apache/cordova/api/CordovaPlugin.java
+++ b/framework/src/org/apache/cordova/api/CordovaPlugin.java
@@ -18,12 +18,12 @@
 */
 package org.apache.cordova.api;

+import org.apache.cordova.CordovaArgs;
 import org.apache.cordova.CordovaWebView;
 import org.json.JSONArray;
 import org.json.JSONException;
 import android.content.Intent;

-
 /**
 * Plugins must extend this class and override one of the execute methods.
 */
@@ -76,9 +76,28 @@ public class CordovaPlugin {
     * @return                Whether the action was valid.
     */
    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
+        CordovaArgs cordovaArgs = new CordovaArgs(args);
+        return execute(action, cordovaArgs, callbackContext);
+    }
+
+    /**
+     * Executes the request.
+     *
+     * This method is called from the WebView thread. To do a non-trivial amount of work, use:
+     *     cordova.getThreadPool().execute(runnable);
+     *
+     * To run on the UI thread, use:
+     *     cordova.getActivity().runOnUiThread(runnable);
+     *
+     * @param action          The action to execute.
+     * @param args            The exec() arguments, wrapped with some Cordova helpers.
+     * @param callbackContext The callback context used when calling back into JavaScript.
+     * @return                Whether the action was valid.
+     */
+    public boolean execute(String action, CordovaArgs args, CallbackContext callbackContext) throws JSONException {
        return false;
    }
-    
+
    /**
     * Called when the system is about to start resuming a previous activity.
     *
--- a/framework/src/org/apache/cordova/api/PluginResult.java
+++ b/framework/src/org/apache/cordova/api/PluginResult.java
@@ -21,6 +21,8 @@ package org.apache.cordova.api;
 import org.json.JSONArray;
 import org.json.JSONObject;

+import android.util.Base64;
+
 public class PluginResult {
    private final int status;
    private final int messageType;
@@ -68,6 +70,12 @@ public class PluginResult {
        this.encodedMessage = Boolean.toString(b);
    }

+    public PluginResult(Status status, byte[] data) {
+        this.status = status.ordinal();
+        this.messageType = MESSAGE_TYPE_ARRAYBUFFER;
+        this.encodedMessage = Base64.encodeToString(data, Base64.NO_WRAP);
+    }
+
    public void setKeepCallback(boolean b) {
        this.keepCallback = b;
    }
@@ -79,7 +87,7 @@ public class PluginResult {
    public int getMessageType() {
        return messageType;
    }
-    
+
    public String getMessage() {
        if (encodedMessage == null) {
            encodedMessage = JSONObject.quote(strMessage);
@@ -134,7 +142,8 @@ public class PluginResult {
    public static final int MESSAGE_TYPE_NUMBER = 3;
    public static final int MESSAGE_TYPE_BOOLEAN = 4;
    public static final int MESSAGE_TYPE_NULL = 5;
-    
+    public static final int MESSAGE_TYPE_ARRAYBUFFER = 6;
+
    public static String[] StatusMessages = new String[] {
        "No result",
        "OK",
--- a/test/project.properties
+++ b/test/project.properties
@@ -8,5 +8,5 @@
 # project structure.

 # Project target.
-target=android-16
+target=android-17
 android.library.reference.1=../framework
Author	SHA1	Message	Date
Joe Bowser	d9b15cf69e	Updating with fixed JS from CB-2279	2013-01-21 13:47:26 -08:00
Joe Bowser	dbfe12a993	Partial fix for CB-2269, we probably shoudln't call Config.init twice	2013-01-18 16:41:10 -08:00
Joe Bowser	2b32dfd99d	Partial Fix for CB-2269 * Moved Config.init call into DroidGap for the most common use-case * The CordovaWebView docuemntation still has to be updated * The template has to be changed, since we don't want to have two different types of config	2013-01-18 16:37:55 -08:00
Joe Bowser	679de40780	2.4.0rc1 updating	2013-01-18 15:33:38 -08:00
Joe Bowser	038f0e45b1	Upgrading Test Project properties to 4.2	2013-01-18 11:44:09 -08:00
Joe Bowser	033bfcc804	This should be Android 4.2, not Google APIs	2013-01-18 11:36:12 -08:00
Braden Shepherdson	fa87c08a29	Merge branch 'master' into arraybuffers	2013-01-18 12:33:25 -05:00
Braden Shepherdson	dfb799739a	Change binaryEcho to echoArrayBuffer.	2013-01-18 12:32:52 -05:00
Joe Bowser	1193f7ed22	Fixed Android 4.2 filepicker, time for master	2013-01-17 17:00:50 -08:00
Braden Shepherdson	7530c21a9f	Full binary data support. - Removed BinaryEcho; made Echo support a new binaryEcho action. - Added CordovaArgs wrapper for JSONArray, and a new overload for execute that accepts a CordovaArgs. There is now a default implementation for the JSONArray version of execute that builds a CordovaArgs and calls that version of execute. The default implementation for the CordovaArgs execute is to return false. - Added byte[] version of success() in CallbackContext.	2013-01-17 15:58:38 -05:00
Braden Shepherdson	547b683e61	Remove debugging.	2013-01-15 13:24:59 -05:00
Braden Shepherdson	ff1d943a69	Add CordovaArguments helper to decode ArrayBuffers	2013-01-15 13:21:09 -05:00
Braden Shepherdson	15a5c89e86	Removed debugging output.	2013-01-15 11:52:06 -05:00
Braden Shepherdson	03b974ee3f	Working Base64 encoding.	2013-01-15 11:48:09 -05:00
Braden Shepherdson	f145605c63	Mostly working arraybuffer changes, needs Base64.	2013-01-15 11:16:32 -05:00
@@ -1 +1 @@
 .3.0
 .4.0rc1