diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js index c86b71d4..78dc4c88 100644 --- a/framework/assets/www/cordova.js +++ b/framework/assets/www/cordova.js @@ -1,5 +1,5 @@ // Platform: android -// 24ab6855470f2dc0662624b597c98585e56a1666 +// fc4db9145934bd0053161cbf9ffc0caf83b770c6 /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -19,7 +19,7 @@ under the License. */ ;(function() { -var PLATFORM_VERSION_BUILD_LABEL = '4.0.x'; +var PLATFORM_VERSION_BUILD_LABEL = '4.0.0-dev'; // file: src/scripts/require.js /*jshint -W079 */ @@ -900,9 +900,13 @@ var cordova = require('cordova'), jsToNativeBridgeMode, // Set lazily. nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT, pollEnabled = false, - messagesFromNative = [], bridgeSecret = -1; +var messagesFromNative = []; +var isProcessing = false; +var resolvedPromise = typeof Promise == 'undefined' ? null : Promise.resolve(); +var nextTick = resolvedPromise ? function(fn) { resolvedPromise.then(fn); } : function(fn) { setTimeout(fn); }; + function androidExec(success, fail, service, action, args) { if (bridgeSecret < 0) { // If we ever catch this firing, we'll need to queue up exec()s @@ -931,16 +935,17 @@ function androidExec(success, fail, service, action, args) { cordova.callbacks[callbackId] = {success:success, fail:fail}; } - var messages = nativeApiProvider.get().exec(bridgeSecret, service, action, callbackId, argsJson); + var msgs = nativeApiProvider.get().exec(bridgeSecret, service, action, callbackId, argsJson); // If argsJson was received by Java as null, try again with the PROMPT bridge mode. // This happens in rare circumstances, such as when certain Unicode characters are passed over the bridge on a Galaxy S2. See CB-2666. - if (jsToNativeBridgeMode == jsToNativeModes.JS_OBJECT && messages === "@Null arguments.") { + if (jsToNativeBridgeMode == jsToNativeModes.JS_OBJECT && msgs === "@Null arguments.") { androidExec.setJsToNativeBridgeMode(jsToNativeModes.PROMPT); androidExec(success, fail, service, action, args); androidExec.setJsToNativeBridgeMode(jsToNativeModes.JS_OBJECT); - return; - } else { - androidExec.processMessages(messages, true); + } else if (msgs) { + messagesFromNative.push(msgs); + // Always process async to avoid exceptions messing up stack. + nextTick(processMessages); } } @@ -959,8 +964,12 @@ function pollOnce(opt_fromOnlineEvent) { // We know there's nothing to retrieve, so no need to poll. return; } - var msg = nativeApiProvider.get().retrieveJsMessages(bridgeSecret, !!opt_fromOnlineEvent); - androidExec.processMessages(msg); + var msgs = nativeApiProvider.get().retrieveJsMessages(bridgeSecret, !!opt_fromOnlineEvent); + if (msgs) { + messagesFromNative.push(msgs); + // Process sync since we know we're already top-of-stack. + processMessages(); + } } function pollingTimerFunc() { @@ -1053,63 +1062,51 @@ function buildPayload(payload, message) { // Processes a single message, as encoded by NativeToJsMessageQueue.java. function processMessage(message) { - try { - var firstChar = message.charAt(0); - if (firstChar == 'J') { - eval(message.slice(1)); - } else if (firstChar == 'S' || firstChar == 'F') { - var success = firstChar == 'S'; - var keepCallback = message.charAt(1) == '1'; - var spaceIdx = message.indexOf(' ', 2); - var status = +message.slice(2, spaceIdx); - var nextSpaceIdx = message.indexOf(' ', spaceIdx + 1); - var callbackId = message.slice(spaceIdx + 1, nextSpaceIdx); - var payloadMessage = message.slice(nextSpaceIdx + 1); - var payload = []; - buildPayload(payload, payloadMessage); - cordova.callbackFromNative(callbackId, success, status, payload, keepCallback); - } else { - console.log("processMessage failed: invalid message: " + JSON.stringify(message)); - } - } catch (e) { - console.log("processMessage failed: Error: " + e); - console.log("processMessage failed: Stack: " + e.stack); - console.log("processMessage failed: Message: " + message); + var firstChar = message.charAt(0); + if (firstChar == 'J') { + // This is deprecated on the .java side. It doesn't work with CSP enabled. + eval(message.slice(1)); + } else if (firstChar == 'S' || firstChar == 'F') { + var success = firstChar == 'S'; + var keepCallback = message.charAt(1) == '1'; + var spaceIdx = message.indexOf(' ', 2); + var status = +message.slice(2, spaceIdx); + var nextSpaceIdx = message.indexOf(' ', spaceIdx + 1); + var callbackId = message.slice(spaceIdx + 1, nextSpaceIdx); + var payloadMessage = message.slice(nextSpaceIdx + 1); + var payload = []; + buildPayload(payload, payloadMessage); + cordova.callbackFromNative(callbackId, success, status, payload, keepCallback); + } else { + console.log("processMessage failed: invalid message: " + JSON.stringify(message)); } } -var isProcessing = false; - -// This is called from the NativeToJsMessageQueue.java. -androidExec.processMessages = function(messages, opt_useTimeout) { - if (messages) { - messagesFromNative.push(messages); - } +function processMessages() { // Check for the reentrant case. if (isProcessing) { return; } - if (opt_useTimeout) { - window.setTimeout(androidExec.processMessages, 0); + if (messagesFromNative.length === 0) { return; } isProcessing = true; try { - // TODO: add setImmediate polyfill and process only one message at a time. - while (messagesFromNative.length) { - var msg = popMessageFromQueue(); - // The Java side can send a * message to indicate that it - // still has messages waiting to be retrieved. - if (msg == '*' && messagesFromNative.length === 0) { - setTimeout(pollOnce, 0); - return; - } - processMessage(msg); + var msg = popMessageFromQueue(); + // The Java side can send a * message to indicate that it + // still has messages waiting to be retrieved. + if (msg == '*' && messagesFromNative.length === 0) { + nextTick(pollOnce); + return; } + processMessage(msg); } finally { isProcessing = false; + if (messagesFromNative.length > 0) { + nextTick(processMessages); + } } -}; +} function popMessageFromQueue() { var messageBatch = messagesFromNative.shift(); @@ -1566,9 +1563,6 @@ function onMessageFromNative(msg) { // App life cycle events case 'pause': case 'resume': - // Keyboard events - case 'hidekeyboard': - case 'showkeyboard': // Volume events case 'volumedownbutton': case 'volumeupbutton': @@ -1585,13 +1579,14 @@ function onMessageFromNative(msg) { define("cordova/plugin/android/app", function(require, exports, module) { var exec = require('cordova/exec'); +var APP_PLUGIN_NAME = Number(require('cordova').platformVersion.split('.')[0]) >= 4 ? 'CoreAndroid' : 'App'; module.exports = { /** * Clear the resource cache. */ clearCache:function() { - exec(null, null, "App", "clearCache", []); + exec(null, null, APP_PLUGIN_NAME, "clearCache", []); }, /** @@ -1609,14 +1604,14 @@ module.exports = { * navigator.app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000}); */ loadUrl:function(url, props) { - exec(null, null, "App", "loadUrl", [url, props]); + exec(null, null, APP_PLUGIN_NAME, "loadUrl", [url, props]); }, /** * Cancel loadUrl that is waiting to be loaded. */ cancelLoadUrl:function() { - exec(null, null, "App", "cancelLoadUrl", []); + exec(null, null, APP_PLUGIN_NAME, "cancelLoadUrl", []); }, /** @@ -1624,7 +1619,7 @@ module.exports = { * Instead of BACK button loading the previous web page, it will exit the app. */ clearHistory:function() { - exec(null, null, "App", "clearHistory", []); + exec(null, null, APP_PLUGIN_NAME, "clearHistory", []); }, /** @@ -1632,7 +1627,7 @@ module.exports = { * This is the same as pressing the backbutton on Android device. */ backHistory:function() { - exec(null, null, "App", "backHistory", []); + exec(null, null, APP_PLUGIN_NAME, "backHistory", []); }, /** @@ -1645,7 +1640,7 @@ module.exports = { * @param override T=override, F=cancel override */ overrideBackbutton:function(override) { - exec(null, null, "App", "overrideBackbutton", [override]); + exec(null, null, APP_PLUGIN_NAME, "overrideBackbutton", [override]); }, /** @@ -1660,14 +1655,14 @@ module.exports = { * @param override T=override, F=cancel override */ overrideButton:function(button, override) { - exec(null, null, "App", "overrideButton", [button, override]); + exec(null, null, APP_PLUGIN_NAME, "overrideButton", [button, override]); }, /** * Exit and terminate the application. */ exitApp:function() { - return exec(null, null, "App", "exitApp", []); + return exec(null, null, APP_PLUGIN_NAME, "exitApp", []); } };