public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Fixup for CB-2654.

Browse Source
This commit is contained in:
Andrew Grieve 2013-04-04 16:45:39 -04:00
parent ba31424604
commit 5ff900f7ec
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
framework/src/org/apache/cordova/InAppBrowser.java
View File

@ -93,9 +93,6 @@ public class InAppBrowser extends CordovaPlugin {
* @return A PluginResult object with a status and message. * @return A PluginResult object with a status and message.
*/ */
public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException { public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
PluginResult.Status status = PluginResult.Status.OK;
String result = "";
try { try {
if (action.equals("open")) { if (action.equals("open")) {
this.callbackContext = callbackContext; this.callbackContext = callbackContext;
@ -109,6 +106,7 @@ public class InAppBrowser extends CordovaPlugin {
Log.d(LOG_TAG, "target = " + target); Log.d(LOG_TAG, "target = " + target);
url = updateUrl(url); url = updateUrl(url);
String result = "";
// SELF // SELF
if (SELF.equals(target)) { if (SELF.equals(target)) {
@ -144,17 +142,14 @@ public class InAppBrowser extends CordovaPlugin {
Log.d(LOG_TAG, "in blank"); Log.d(LOG_TAG, "in blank");
result = this.showWebPage(url, features); result = this.showWebPage(url, features);
} }
PluginResult pluginResult = new PluginResult(status, result);
PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, result);
pluginResult.setKeepCallback(true); pluginResult.setKeepCallback(true);
this.callbackContext.sendPluginResult(pluginResult); this.callbackContext.sendPluginResult(pluginResult);
} }
else if (action.equals("close")) { else if (action.equals("close")) {
this.callbackContext = callbackContext;
closeDialog(); closeDialog();
this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK));
PluginResult pluginResult = new PluginResult(PluginResult.Status.OK);
pluginResult.setKeepCallback(false);
this.callbackContext.sendPluginResult(pluginResult);
} }
else if (action.equals("injectScriptCode")) { else if (action.equals("injectScriptCode")) {
String jsWrapper = null; String jsWrapper = null;
@ -191,10 +186,7 @@ public class InAppBrowser extends CordovaPlugin {
injectDeferredObject(args.getString(0), jsWrapper); injectDeferredObject(args.getString(0), jsWrapper);
} }
else { else {
status = PluginResult.Status.INVALID_ACTION; return false;
PluginResult pluginResult = new PluginResult(status, result);
pluginResult.setKeepCallback(true);
this.callbackContext.sendPluginResult(pluginResult);
} }
} catch (JSONException e) { } catch (JSONException e) {
this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION)); this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));