You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by cs...@apache.org on 2016/01/29 19:25:53 UTC
android commit: CB-10472 NullPointerException:
org.apache.cordova.PluginManager.onSaveInstanceState check if pluginManager
is null before using it This closes #255
Repository: cordova-android
Updated Branches:
refs/heads/master e08d0671a -> 088140aca
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/088140ac
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/088140ac
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/088140ac
Branch: refs/heads/master
Commit: 088140aca49196dd648bb99360c94f7ee88d7711
Parents: e08d067
Author: Carlos Santana <cs...@gmail.com>
Authored: Thu Jan 28 15:57:38 2016 -0500
Committer: Carlos Santana <cs...@gmail.com>
Committed: Fri Jan 29 13:19:00 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/088140ac/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