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/02/20 20:25:44 UTC
[2/3] android commit: Setting to turn off Online Storage
Setting to turn off Online Storage
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/11beb37c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/11beb37c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/11beb37c
Branch: refs/heads/master
Commit: 11beb37c5017b326403e9d502297919b65e13801
Parents: cb19205
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Feb 20 11:21:17 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Feb 20 11:21:17 2013 -0800
----------------------------------------------------------------------
framework/src/org/apache/cordova/Config.java | 5 ++++
framework/src/org/apache/cordova/InAppBrowser.java | 16 ++++++++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/11beb37c/framework/src/org/apache/cordova/Config.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Config.java b/framework/src/org/apache/cordova/Config.java
index 01eb2bb..e42d761 100644
--- a/framework/src/org/apache/cordova/Config.java
+++ b/framework/src/org/apache/cordova/Config.java
@@ -143,6 +143,11 @@ public class Config {
boolean value = xml.getAttributeValue(null, "value").equals("true");
action.getIntent().putExtra(name, value);
}
+ else if(name.equals("InAppBrowserStorageEnabled"))
+ {
+ boolean value = xml.getAttributeValue(null, "value").equals("true");
+ action.getIntent().putExtra(name, value);
+ }
else
{
String value = xml.getAttributeValue(null, "value");
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/11beb37c/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 7e7f862..ffcc649 100644
--- a/framework/src/org/apache/cordova/InAppBrowser.java
+++ b/framework/src/org/apache/cordova/InAppBrowser.java
@@ -35,7 +35,9 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Bitmap;
+import android.graphics.Color;
import android.net.Uri;
+import android.os.Bundle;
import android.text.InputType;
import android.util.Log;
import android.util.TypedValue;
@@ -428,10 +430,18 @@ public class InAppBrowser extends CordovaPlugin {
*/
// @TODO: replace with settings.setPluginState(android.webkit.WebSettings.PluginState.ON)
settings.setPluginsEnabled(true);
- settings.setDatabaseEnabled(true);
- String databasePath = cordova.getActivity().getApplicationContext().getDir("inAppBrowserDB", Context.MODE_PRIVATE).getPath();
- settings.setDatabasePath(databasePath);
+
+ //Toggle whether this is enabled or not!
+ Bundle appSettings = cordova.getActivity().getIntent().getExtras();
+ boolean enableDatabase = appSettings.getBoolean("InAppBrowserStorageEnabled", true);
+ if(enableDatabase)
+ {
+ String databasePath = cordova.getActivity().getApplicationContext().getDir("inAppBrowserDB", Context.MODE_PRIVATE).getPath();
+ settings.setDatabasePath(databasePath);
+ settings.setDatabaseEnabled(true);
+ }
settings.setDomStorageEnabled(true);
+
inAppWebView.loadUrl(url);
inAppWebView.setId(6);
inAppWebView.getSettings().setLoadWithOverviewMode(true);