You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/03/26 00:05:04 UTC
[3/6] android commit: Fix NPE in InAppBrowser.
Fix NPE in InAppBrowser.
When cordova.getActivity().getIntent().getExtras() == null.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/73c7994c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/73c7994c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/73c7994c
Branch: refs/heads/2.6.x
Commit: 73c7994cd15264349f64fe82cb83e61558ebbd53
Parents: 0c74090
Author: Andrew Grieve <ag...@chromium.org>
Authored: Sat Mar 23 14:07:57 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Sat Mar 23 14:07:57 2013 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/InAppBrowser.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/73c7994c/framework/src/org/apache/cordova/InAppBrowser.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/InAppBrowser.java b/framework/src/org/apache/cordova/InAppBrowser.java
index 02aa002..0d5d496 100644
--- a/framework/src/org/apache/cordova/InAppBrowser.java
+++ b/framework/src/org/apache/cordova/InAppBrowser.java
@@ -460,7 +460,7 @@ public class InAppBrowser extends CordovaPlugin {
//Toggle whether this is enabled or not!
Bundle appSettings = cordova.getActivity().getIntent().getExtras();
- boolean enableDatabase = appSettings.getBoolean("InAppBrowserStorageEnabled", true);
+ boolean enableDatabase = appSettings == null ? true : appSettings.getBoolean("InAppBrowserStorageEnabled", true);
if(enableDatabase)
{
String databasePath = cordova.getActivity().getApplicationContext().getDir("inAppBrowserDB", Context.MODE_PRIVATE).getPath();