Worked around JavaScript bridge exception for Android 2.3. Use "prompt" instead of calling objects directly. There were several objects called from JavaScript, including BrowserKey, so key events had to be reworked.

2026-05-11 00:00:05 +08:00 · 2011-02-27 20:07:24 -06:00
parent 1711fb07d7
commit 2bc7bd6768
8 changed files with 213 additions and 133 deletions
@@ -3,7 +3,7 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

 /**
@@ -63,3 +63,27 @@ App.prototype.clearHistory = function() {
 App.prototype.addService = function(serviceType, className) {
 	PhoneGap.exec(null, null, "App", "addService", [serviceType, className]);
 };
+
+/**
+ * Override the default behavior of the Android back button.
+ * If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
+ * 
+ * Note: The user should not have to call this method.  Instead, when the user
+ *       registers for the "backbutton" event, this is automatically done.
+ * 
+ * @param override		T=override, F=cancel override
+ */
+App.prototype.overrideBackbutton = function(override) {
+    PhoneGap.exec(null, null, "App", "overrideBackbutton", [override]);
+};
+
+/**
+ * Exit and terminate the application.
+ */
+App.prototype.exitApp = function() {
+	return PhoneGap.exec(null, null, "App", "exitApp", []);
+};
+
+PhoneGap.addConstructor(function() {
+    navigator.app = window.app = new App();
+});
@@ -3,7 +3,7 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

 /**
@@ -62,30 +62,36 @@ Device.prototype.getInfo = function(successCallback, errorCallback) {
 };

 /*
+ * DEPRECATED
 * This is only for Android.
 *
 * You must explicitly override the back button.
 */
 Device.prototype.overrideBackButton = function() {
-    BackButton.override();
+	console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
+	app.overrideBackbutton(true);
 };

 /*
+ * DEPRECATED
 * This is only for Android.
 *
 * This resets the back button to the default behaviour
 */
 Device.prototype.resetBackButton = function() {
-    BackButton.reset();
+	console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
+	app.overrideBackbutton(false);
 };

 /*
+ * DEPRECATED
 * This is only for Android.
 *
 * This terminates the activity!
 */
 Device.prototype.exitApp = function() {
-    BackButton.exitApp();
+	console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
+	app.exitApp();
 };

 PhoneGap.addConstructor(function() {
@@ -1,32 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-function KeyEvent() {
-}
-
-KeyEvent.prototype.backTrigger = function() {
-    var e = document.createEvent('Events');
-    e.initEvent('backKeyDown');
-    document.dispatchEvent(e);
-};
-
-KeyEvent.prototype.menuTrigger = function() {
-    var e = document.createEvent('Events');
-    e.initEvent('menuKeyDown');
-    document.dispatchEvent(e);
-};
-
-KeyEvent.prototype.searchTrigger = function() {
-    var e = document.createEvent('Events');
-    e.initEvent('searchKeyDown');
-    document.dispatchEvent(e);
-};
-
-if (document.keyEvent === null || typeof document.keyEvent === 'undefined') {
-    window.keyEvent = document.keyEvent = new KeyEvent();
-}
@@ -3,7 +3,7 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 * 
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */


@@ -293,11 +293,17 @@ PhoneGap.Channel.join(function() {

    // Start listening for XHR callbacks
    setTimeout(function() {
-            if (CallbackServer.usePolling()) {
+            if (PhoneGap.UsePolling) {
                PhoneGap.JSCallbackPolling();
            }
            else {
-                PhoneGap.JSCallback();
+                var polling = prompt("usePolling", "gap_callbackServer:");
+                if (polling == "true") {
+                    PhoneGap.JSCallbackPolling();
+                }
+                else {
+                    PhoneGap.JSCallback();
+                }
            }
        }, 1);

@@ -307,6 +313,8 @@ PhoneGap.Channel.join(function() {
    // Fire event to notify that all objects are created
    PhoneGap.onPhoneGapReady.fire();

+    // Fire onDeviceReady event once all constructors have run and PhoneGap info has been
+    // received from native side, and any user defined initialization channels.
    PhoneGap.Channel.join(function() {
    
        // Turn off app loading dialog
@@ -320,22 +328,6 @@ PhoneGap.Channel.join(function() {

 }, [ PhoneGap.onDOMContentLoaded, PhoneGap.onNativeReady ]);

-/**
- * Fire onDeviceReady event once all constructors have run and PhoneGap info has been
- * received from native side.
- */
- /*
-PhoneGap.Channel.join(function() {
-    // Turn off app loading dialog
-    navigator.notification.activityStop();
-
-    PhoneGap.onDeviceReady.fire();
-
-    // Fire the onresume event, since first one happens before JavaScript is loaded
-    PhoneGap.onResume.fire();
-}, [ PhoneGap.onPhoneGapReady, PhoneGap.onPhoneGapInfoReady]);
-*/
-
 // Listen for DOMContentLoaded and notify our channel subscribers
 document.addEventListener('DOMContentLoaded', function() {
    PhoneGap.onDOMContentLoaded.fire();
@@ -355,11 +347,41 @@ document.addEventListener = function(evt, handler, capture) {
        }
    } else if (e === 'pause') {
        PhoneGap.onPause.subscribe(handler);
-    } else {
+    }     
+    else {
+        // If subscribing to Android backbutton
+        if (e === 'backbutton') {
+            PhoneGap.exec(null, null, "App", "overrideBackbutton", [true]);
+        } 
+        
        PhoneGap.m_document_addEventListener.call(document, evt, handler, capture);
    }
 };

+// Intercept calls to document.removeEventListener and watch for events that 
+// are generated by PhoneGap native code
+PhoneGap.m_document_removeEventListener = document.removeEventListener;
+
+document.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+
+    // If unsubscribing to Android backbutton
+    if (e === 'backbutton') {
+        PhoneGap.exec(null, null, "App", "overrideBackbutton", [false]);
+    } 
+
+    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
+};
+
+/**
+ * Method to fire event from native code
+ */
+PhoneGap.fireEvent = function(type) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    document.dispatchEvent(e);
+};
+
 /**
 * If JSON not included, use our own stringify. (Android 1.6)
 * The restriction on ours is that it must be an array of simple types.
@@ -495,8 +517,7 @@ PhoneGap.exec = function(success, fail, service, action, args) {
            PhoneGap.callbacks[callbackId] = {success:success, fail:fail};
        }
        
-        // Note: Device returns string, but for some reason emulator returns object - so convert to string.
-        var r = ""+PluginManager.exec(service, action, callbackId, this.stringify(args), true);
+        var r = prompt(this.stringify(args), "gap:"+this.stringify([service, action, callbackId, true]));
        
        // If a result was returned
        if (r.length > 0) {
@@ -672,6 +693,13 @@ PhoneGap.JSCallbackToken = null;
 * Java to JavaScript.
 */
 PhoneGap.JSCallback = function() {
+
+    // If polling flag was changed, start using polling from now on
+    if (PhoneGap.UsePolling) {
+        PhoneGap.JSCallbackPolling();
+        return;
+    }
+
    var xmlhttp = new XMLHttpRequest();

    // Callback function when XMLHttpRequest is ready
@@ -718,7 +746,7 @@ PhoneGap.JSCallback = function() {
            // If error, restart callback server
            else {
                console.log("JSCallback Error: Request failed.");
-                CallbackServer.restartServer();
+                prompt("restartServer", "gap_callbackServer:");
                PhoneGap.JSCallbackPort = null;
                PhoneGap.JSCallbackToken = null;
                setTimeout(PhoneGap.JSCallback, 100);
@@ -727,10 +755,10 @@ PhoneGap.JSCallback = function() {
    };

    if (PhoneGap.JSCallbackPort === null) {
-        PhoneGap.JSCallbackPort = CallbackServer.getPort();
+        PhoneGap.JSCallbackPort = prompt("getPort", "gap_callbackServer:");
    }
    if (PhoneGap.JSCallbackToken === null) {
-        PhoneGap.JSCallbackToken = CallbackServer.getToken();
+        PhoneGap.JSCallbackToken = prompt("getToken", "gap_callbackServer:");
    }
    xmlhttp.open("GET", "http://127.0.0.1:"+PhoneGap.JSCallbackPort+"/"+PhoneGap.JSCallbackToken , true);
    xmlhttp.send();
@@ -742,6 +770,11 @@ PhoneGap.JSCallback = function() {
 */
 PhoneGap.JSCallbackPollingPeriod = 50;

+/**
+ * Flag that can be set by the user to force polling to be used or force XHR to be used.
+ */
+PhoneGap.UsePolling = false;    // T=use polling, F=use XHR
+
 /**
 * This is only for Android.
 *
@@ -750,7 +783,14 @@ PhoneGap.JSCallbackPollingPeriod = 50;
 * Java to JavaScript.
 */
 PhoneGap.JSCallbackPolling = function() {
-    var msg = CallbackServer.getJavascript();
+
+    // If polling flag was changed, stop using polling from now on
+    if (!PhoneGap.UsePolling) {
+        PhoneGap.JSCallback();
+        return;
+    }
+
+    var msg = prompt("", "gap_poll:");
    if (msg) {
        setTimeout(function() {
            try {