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 48B0317DDE for ; Fri, 29 Jan 2016 18:36:09 +0000 (UTC) Received: (qmail 11429 invoked by uid 500); 29 Jan 2016 18:36:09 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 11401 invoked by uid 500); 29 Jan 2016 18:36:09 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 11392 invoked by uid 99); 29 Jan 2016 18:36:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jan 2016 18:36:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F18D2DFFF4; Fri, 29 Jan 2016 18:36:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: csantanapr@apache.org To: commits@cordova.apache.org Message-Id: <0d79ced84d7245b0a97f297b5e6b6b8c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: android commit: CB-10472 NullPointerException: org.apache.cordova.PluginManager.onSaveInstanceState check if pluginManager is null before using it This closes #255 Date: Fri, 29 Jan 2016 18:36:08 +0000 (UTC) Repository: cordova-android Updated Branches: refs/heads/5.1.x b8815c24f -> f76653016 CB-10472 NullPointerException: org.apache.cordova.PluginManager.onSaveInstanceState check if pluginManager is null before using it This closes #255 Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f7665301 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f7665301 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f7665301 Branch: refs/heads/5.1.x Commit: f766530160045262d6d7c0ab5a36b5ece737a030 Parents: b8815c2 Author: Carlos Santana Authored: Thu Jan 28 15:57:38 2016 -0500 Committer: Carlos Santana Committed: Fri Jan 29 13:28:49 2016 -0500 ---------------------------------------------------------------------- .../apache/cordova/CordovaInterfaceImpl.java | 25 ++++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f7665301/framework/src/org/apache/cordova/CordovaInterfaceImpl.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java index 65e2a90..d1420b6 100644 --- a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java +++ b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java @@ -108,17 +108,20 @@ public class CordovaInterfaceImpl implements CordovaInterface { // If there was no Activity result, we still need to send out the resume event if the // Activity was destroyed by the OS activityWasDestroyed = false; - - CoreAndroid appPlugin = (CoreAndroid) pluginManager.getPlugin(CoreAndroid.PLUGIN_NAME); - if(appPlugin != null) { - JSONObject obj = new JSONObject(); - try { - obj.put("action", "resume"); - } catch (JSONException e) { - LOG.e(TAG, "Failed to create event message", e); + if(pluginManager != null) + { + CoreAndroid appPlugin = (CoreAndroid) pluginManager.getPlugin(CoreAndroid.PLUGIN_NAME); + if(appPlugin != null) { + JSONObject obj = new JSONObject(); + try { + obj.put("action", "resume"); + } catch (JSONException e) { + LOG.e(TAG, "Failed to create event message", e); + } + appPlugin.sendResumeEvent(new PluginResult(PluginResult.Status.OK, obj)); } - appPlugin.sendResumeEvent(new PluginResult(PluginResult.Status.OK, obj)); } + } } @@ -169,8 +172,10 @@ public class CordovaInterfaceImpl implements CordovaInterface { String serviceName = activityResultCallback.getServiceName(); outState.putString("callbackService", serviceName); } + if(pluginManager != null){ + outState.putBundle("plugin", pluginManager.onSaveInstanceState()); + } - outState.putBundle("plugin", pluginManager.onSaveInstanceState()); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org