X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=a1eb26be2f675c78012256a6dde4dca3a796f18f;hp=138a35b0190494d151692b85f2f5b4de6989a0ae;hb=83814718eb36f98212441127b47d199c62e85920;hpb=45caf2c8d24fd388bbad6dedfd8cb45aaccbdd64 diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java index 138a35b0..a1eb26be 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -65,8 +65,10 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc private String formattedUrlString; // homepage is used in onCreate and onOptionsItemSelected. private String homepage = "https://www.duckduckgo.com/"; - // enableJavaScript is used onCreate and onOptionsItemSelected. + // enableJavaScript is used in onCreate and onOptionsItemSelected. private boolean enableJavaScript; + // enableDomStorage is used in onCreate and onOptionsItemSelected. + private boolean enableDomStorage; // actionBar is used in onCreate and onOptionsItemSelected. private ActionBar actionBar; @@ -255,14 +257,11 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc // Set JavaScript initial status. enableJavaScript = true; - if (enableJavaScript) { - mainWebView.getSettings().setJavaScriptEnabled(true); - } else { - mainWebView.getSettings().setJavaScriptEnabled(false); - } + mainWebView.getSettings().setJavaScriptEnabled(enableJavaScript); - // Enable DOM Storage. - mainWebView.getSettings().setDomStorageEnabled(true); + // Set DOM Storage initial status. + enableDomStorage = true; + mainWebView.getSettings().setDomStorageEnabled(enableDomStorage); // Get the intent information that started the app. final Intent intent = getIntent(); @@ -287,13 +286,13 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.menu_webview, menu); MenuItem toggleJavaScriptMenuItem = menu.findItem(R.id.toggleJavaScript); + MenuItem toggleDomStorageMenuItem = menu.findItem(R.id.toggleDomStorage); // Set the JavaScript menu item checkbox initial status. - if (enableJavaScript) { - toggleJavaScriptMenuItem.setChecked(true); - } else { - toggleJavaScriptMenuItem.setChecked(false); - } + toggleJavaScriptMenuItem.setChecked(enableJavaScript); + + // Set the DOM Storage menu item checkbox initial status. + toggleDomStorageMenuItem.setChecked(enableDomStorage); return true; } @@ -323,6 +322,20 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc } return true; + case R.id.toggleDomStorage: + if (enableDomStorage) { + enableDomStorage = false; + menuItem.setChecked(false); + mainWebView.getSettings().setDomStorageEnabled(false); + mainWebView.loadUrl(formattedUrlString); + } else { + enableDomStorage = true; + menuItem.setChecked(true); + mainWebView.getSettings().setDomStorageEnabled(true); + mainWebView.loadUrl(formattedUrlString); + } + return true; + case R.id.home: mainWebView.loadUrl(homepage); return true;