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

Remove PluginManager.exec's return value (unused).

Browse Source 
It's not only not used, but when it was used was messing up the
DISABLE_EXEC_CHAINING flag.
(cherry picked from commit 9946d15f23)
This commit is contained in:
Andrew Grieve 2013-06-20 22:20:58 -04:00
parent e726c0d60b
commit f78b444ed1
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/org/apache/cordova/ExposedJsApi.java
View File

@ -48,9 +48,9 @@ import org.json.JSONException;
jsMessageQueue.setPaused(true); jsMessageQueue.setPaused(true);
try { try {
boolean wasSync = pluginManager.exec(service, action, callbackId, arguments); pluginManager.exec(service, action, callbackId, arguments);
String ret = ""; String ret = "";
if (!NativeToJsMessageQueue.DISABLE_EXEC_CHAINING || wasSync) { if (!NativeToJsMessageQueue.DISABLE_EXEC_CHAINING) {
ret = jsMessageQueue.popAndEncode(); ret = jsMessageQueue.popAndEncode();
} }
return ret; return ret;

12
framework/src/org/apache/cordova/api/PluginManager.java
View File

@ -200,15 +200,14 @@ public class PluginManager {
* this is an async plugin call. * this is an async plugin call.
* @param rawArgs An Array literal string containing any arguments needed in the * @param rawArgs An Array literal string containing any arguments needed in the
* plugin execute method. * plugin execute method.
* @return Whether the task completed synchronously.
*/ */
public boolean exec(String service, String action, String callbackId, String rawArgs) { public void exec(String service, String action, String callbackId, String rawArgs) {
CordovaPlugin plugin = this.getPlugin(service); CordovaPlugin plugin = this.getPlugin(service);
if (plugin == null) { if (plugin == null) {
Log.d(TAG, "exec() call to unknown plugin: " + service); Log.d(TAG, "exec() call to unknown plugin: " + service);
PluginResult cr = new PluginResult(PluginResult.Status.CLASS_NOT_FOUND_EXCEPTION); PluginResult cr = new PluginResult(PluginResult.Status.CLASS_NOT_FOUND_EXCEPTION);
app.sendPluginResult(cr, callbackId); app.sendPluginResult(cr, callbackId);
return true; return;
} }
try { try {
CallbackContext callbackContext = new CallbackContext(callbackId, app); CallbackContext callbackContext = new CallbackContext(callbackId, app);
@ -216,19 +215,16 @@ public class PluginManager {
if (!wasValidAction) { if (!wasValidAction) {
PluginResult cr = new PluginResult(PluginResult.Status.INVALID_ACTION); PluginResult cr = new PluginResult(PluginResult.Status.INVALID_ACTION);
app.sendPluginResult(cr, callbackId); app.sendPluginResult(cr, callbackId);
return true;
} }
return callbackContext.isFinished();
} catch (JSONException e) { } catch (JSONException e) {
PluginResult cr = new PluginResult(PluginResult.Status.JSON_EXCEPTION); PluginResult cr = new PluginResult(PluginResult.Status.JSON_EXCEPTION);
app.sendPluginResult(cr, callbackId); app.sendPluginResult(cr, callbackId);
return true;
} }
} }
@Deprecated @Deprecated
public boolean exec(String service, String action, String callbackId, String jsonArgs, boolean async) { public void exec(String service, String action, String callbackId, String jsonArgs, boolean async) {
return exec(service, action, callbackId, jsonArgs); exec(service, action, callbackId, jsonArgs);
} }
/** /**