Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C1A49C96E for ; Fri, 21 Jun 2013 02:23:16 +0000 (UTC) Received: (qmail 42577 invoked by uid 500); 21 Jun 2013 02:23:16 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 42547 invoked by uid 500); 21 Jun 2013 02:23:16 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 42540 invoked by uid 99); 21 Jun 2013 02:23:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jun 2013 02:23:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 75F6C82B426; Fri, 21 Jun 2013 02:23:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Message-Id: <1466dc52ef3a4afe9ca165aaf58dbdfd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: android commit: Remove PluginManager.exec's return value (unused). Date: Fri, 21 Jun 2013 02:23:16 +0000 (UTC) Updated Branches: refs/heads/3.0.0 e726c0d60 -> f78b444ed Remove PluginManager.exec's return value (unused). It's not only not used, but when it was used was messing up the DISABLE_EXEC_CHAINING flag. (cherry picked from commit 9946d15f2348b8f6a23e589c8916a9410aa4b3da) Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f78b444e Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f78b444e Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f78b444e Branch: refs/heads/3.0.0 Commit: f78b444ed1b4b155f53bddac2d38873e66223aad Parents: e726c0d Author: Andrew Grieve Authored: Thu Jun 20 22:20:58 2013 -0400 Committer: Andrew Grieve Committed: Thu Jun 20 22:22:59 2013 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/ExposedJsApi.java | 4 ++-- framework/src/org/apache/cordova/api/PluginManager.java | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f78b444e/framework/src/org/apache/cordova/ExposedJsApi.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/ExposedJsApi.java b/framework/src/org/apache/cordova/ExposedJsApi.java index 7702d35..40ab1e3 100755 --- a/framework/src/org/apache/cordova/ExposedJsApi.java +++ b/framework/src/org/apache/cordova/ExposedJsApi.java @@ -48,9 +48,9 @@ import org.json.JSONException; jsMessageQueue.setPaused(true); try { - boolean wasSync = pluginManager.exec(service, action, callbackId, arguments); + pluginManager.exec(service, action, callbackId, arguments); String ret = ""; - if (!NativeToJsMessageQueue.DISABLE_EXEC_CHAINING || wasSync) { + if (!NativeToJsMessageQueue.DISABLE_EXEC_CHAINING) { ret = jsMessageQueue.popAndEncode(); } return ret; http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f78b444e/framework/src/org/apache/cordova/api/PluginManager.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/api/PluginManager.java b/framework/src/org/apache/cordova/api/PluginManager.java index 71fc258..e8e92f8 100755 --- a/framework/src/org/apache/cordova/api/PluginManager.java +++ b/framework/src/org/apache/cordova/api/PluginManager.java @@ -200,15 +200,14 @@ public class PluginManager { * this is an async plugin call. * @param rawArgs An Array literal string containing any arguments needed in the * 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); if (plugin == null) { Log.d(TAG, "exec() call to unknown plugin: " + service); PluginResult cr = new PluginResult(PluginResult.Status.CLASS_NOT_FOUND_EXCEPTION); app.sendPluginResult(cr, callbackId); - return true; + return; } try { CallbackContext callbackContext = new CallbackContext(callbackId, app); @@ -216,19 +215,16 @@ public class PluginManager { if (!wasValidAction) { PluginResult cr = new PluginResult(PluginResult.Status.INVALID_ACTION); app.sendPluginResult(cr, callbackId); - return true; } - return callbackContext.isFinished(); } catch (JSONException e) { PluginResult cr = new PluginResult(PluginResult.Status.JSON_EXCEPTION); app.sendPluginResult(cr, callbackId); - return true; } } @Deprecated - public boolean exec(String service, String action, String callbackId, String jsonArgs, boolean async) { - return exec(service, action, callbackId, jsonArgs); + public void exec(String service, String action, String callbackId, String jsonArgs, boolean async) { + exec(service, action, callbackId, jsonArgs); } /**