From 48f58110fec31a6cf8dd4e39962682d21513adaa Mon Sep 17 00:00:00 2001 From: Simon MacDonald Date: Tue, 27 Nov 2012 12:18:49 -0500 Subject: [PATCH] CB-1938: Regression, Android back button event is no longer fired --- framework/src/org/apache/cordova/App.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java index 5433d314..dad34a07 100755 --- a/framework/src/org/apache/cordova/App.java +++ b/framework/src/org/apache/cordova/App.java @@ -19,13 +19,14 @@ package org.apache.cordova; +import org.apache.cordova.api.CallbackContext; import org.apache.cordova.api.CordovaPlugin; import org.apache.cordova.api.LOG; -import org.apache.cordova.api.Plugin; import org.apache.cordova.api.PluginResult; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; + import java.util.HashMap; /** @@ -36,12 +37,12 @@ public class App extends CordovaPlugin { /** * Executes the request and returns PluginResult. * - * @param action The action to execute. - * @param args JSONArry of arguments for the plugin. - * @param callbackId The callback id used when calling back into JavaScript. - * @return A PluginResult object with a status and message. + * @param action The action to execute. + * @param args JSONArry of arguments for the plugin. + * @param callbackContext The callback context from which we were invoked. + * @return A PluginResult object with a status and message. */ - public PluginResult execute(String action, JSONArray args, String callbackId) { + public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException { PluginResult.Status status = PluginResult.Status.OK; String result = ""; @@ -80,9 +81,11 @@ public class App extends CordovaPlugin { else if (action.equals("exitApp")) { this.exitApp(); } - return new PluginResult(status, result); + callbackContext.sendPluginResult(new PluginResult(status, result)); + return true; } catch (JSONException e) { - return new PluginResult(PluginResult.Status.JSON_EXCEPTION); + callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION)); + return false; } }