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

Fix NPE caused by NetworkManager sending update before JS is ready.

Browse Source 
This was happening for me when the device has been sleeping long
enough to turn its networking off, and I start an app via adb.
This commit is contained in:
Andrew Grieve 2012-10-02 09:49:53 -04:00
parent 6f873ff6b5
commit 5289d569b0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,6 +219,10 @@ public class NativeToJsMessageQueue {
* Add a JavaScript statement to the list. * Add a JavaScript statement to the list.
*/ */
public void addPluginResult(PluginResult result, String callbackId) { public void addPluginResult(PluginResult result, String callbackId) {
if (callbackId == null) {
Log.e(LOG_TAG, "Got plugin result with no callbackId", new Throwable());
return;
}
// Don't send anything if there is no result and there is no need to // Don't send anything if there is no result and there is no need to
// clear the callbacks. // clear the callbacks.
boolean noResult = result.getStatus() == PluginResult.Status.NO_RESULT.ordinal(); boolean noResult = result.getStatus() == PluginResult.Status.NO_RESULT.ordinal();

8
framework/src/org/apache/cordova/NetworkManager.java
View File

@ -206,9 +206,11 @@ public class NetworkManager extends Plugin {
* @param connection the network info to set as navigator.connection * @param connection the network info to set as navigator.connection
*/ */
private void sendUpdate(String type) { private void sendUpdate(String type) {
PluginResult result = new PluginResult(PluginResult.Status.OK, type); if (connectionCallbackId != null) {
result.setKeepCallback(true); PluginResult result = new PluginResult(PluginResult.Status.OK, type);
this.success(result, this.connectionCallbackId); result.setKeepCallback(true);
this.success(result, this.connectionCallbackId);
}
webView.postMessage("networkconnection", type); webView.postMessage("networkconnection", type);
} }