X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=d2631c48100863646ea04d6a5fd983e6870f309f;hb=5f3848c8f5fc3701bb7e85eb918b6b325c62cd23;hp=138a35b0190494d151692b85f2f5b4de6989a0ae;hpb=45caf2c8d24fd388bbad6dedfd8cb45aaccbdd64;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java index 138a35b0..d2631c48 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -41,6 +41,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; +import android.webkit.CookieManager; import android.webkit.DownloadListener; import android.webkit.WebChromeClient; import android.webkit.WebView; @@ -65,8 +66,21 @@ 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, onCreateOptionsMenu, and onOptionsItemSelected. private boolean enableJavaScript; + // enableDomStorage is used in onCreate, onCreateOptionsMenu, and onOptionsItemSelected. + private boolean enableDomStorage; + + /* enableSaveFormData does nothing until database storage is implemented. + // enableSaveFormData is used in onCreate, onCreateOptionsMenu, and onOptionsItemSelected. + private boolean enableSaveFormData; + */ + + // cookieManager is used in onCreate and onOptionsItemSelected. + private CookieManager cookieManager; + //enableCookies is used in onCreate, onCreateOptionsMenu, and onOptionsItemSelected. + private boolean enableCookies; + // actionBar is used in onCreate and onOptionsItemSelected. private ActionBar actionBar; @@ -255,14 +269,22 @@ 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); + + /* Save Form Data does nothing until database storage is implemented. + // Set Save Form Data initial status. + enableSaveFormData = true; + mainWebView.getSettings().setSaveFormData(enableSaveFormData); + */ + + // Set Cookies initial status. + cookieManager = CookieManager.getInstance(); + enableCookies = true; + cookieManager.setAcceptCookie(enableCookies); // Get the intent information that started the app. final Intent intent = getIntent(); @@ -286,15 +308,45 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc public boolean onCreateOptionsMenu(Menu menu) { // 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); - // Set the JavaScript menu item checkbox initial status. - if (enableJavaScript) { - toggleJavaScriptMenuItem.setChecked(true); - } else { - toggleJavaScriptMenuItem.setChecked(false); - } + // Get MenuItems for checkable menu items. + MenuItem toggleJavaScript = menu.findItem(R.id.toggleJavaScript); + MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage); + /* toggleSaveFormData does nothing until database storage is implemented. + MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData); + */ + MenuItem toggleCookies = menu.findItem(R.id.toggleCookies); + MenuItem clearCookies = menu.findItem(R.id.clearCookies); + + // Set the initial status of the menu item checkboxes. + toggleJavaScript.setChecked(enableJavaScript); + toggleDomStorage.setChecked(enableDomStorage); + /* toggleSaveFormData does nothing until database storage is implemented. + toggleSaveFormData.setChecked(enableSaveFormData); + */ + toggleCookies.setChecked(enableCookies); + + return true; + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + // Enable Clear Cookies if there are any. + MenuItem clearCookies = menu.findItem(R.id.clearCookies); + clearCookies.setEnabled(cookieManager.hasCookies()); + + // Enable Back if canGoBack(). + MenuItem back = menu.findItem(R.id.back); + back.setEnabled(mainWebView.canGoBack()); + // Enable forward if canGoForward(). + MenuItem forward = menu.findItem(R.id.forward); + forward.setEnabled(mainWebView.canGoForward()); + + // Run all the other default commands. + super.onPrepareOptionsMenu(menu); + + // return true displays the menu. return true; } @@ -303,6 +355,8 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc @TargetApi(11) // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. @SuppressLint("SetJavaScriptEnabled") + // removeAllCookies is deprecated, but it is required for API < 21. + @SuppressWarnings("deprecation") public boolean onOptionsItemSelected(MenuItem menuItem) { int menuItemId = menuItem.getItemId(); ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); @@ -314,13 +368,66 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc enableJavaScript = false; menuItem.setChecked(false); mainWebView.getSettings().setJavaScriptEnabled(false); - mainWebView.loadUrl(formattedUrlString); + mainWebView.reload(); } else { enableJavaScript = true; menuItem.setChecked(true); mainWebView.getSettings().setJavaScriptEnabled(true); - mainWebView.loadUrl(formattedUrlString); + mainWebView.reload(); + } + return true; + + case R.id.toggleDomStorage: + if (enableDomStorage) { + enableDomStorage = false; + menuItem.setChecked(false); + mainWebView.getSettings().setDomStorageEnabled(false); + mainWebView.reload(); + } else { + enableDomStorage = true; + menuItem.setChecked(true); + mainWebView.getSettings().setDomStorageEnabled(true); + mainWebView.reload(); + } + return true; + + /* toggleSaveFormData does nothing until database storage is implemented. + case R.id.toggleSaveFormData: + if (enableSaveFormData) { + enableSaveFormData = false; + menuItem.setChecked(false); + mainWebView.getSettings().setSaveFormData(false); + mainWebView.reload(); + } else { + enableSaveFormData = true; + menuItem.setChecked(true); + mainWebView.getSettings().setSaveFormData(true); + mainWebView.reload(); + } + return true; + */ + + case R.id.toggleCookies: + if (enableCookies) { + enableCookies = false; + menuItem.setChecked(false); + cookieManager.setAcceptCookie(false); + mainWebView.reload(); + } else { + enableCookies = true; + menuItem.setChecked(true); + cookieManager.setAcceptCookie(true); + mainWebView.reload(); + } + return true; + + case R.id.clearCookies: + if (Build.VERSION.SDK_INT < 21) { + cookieManager.removeAllCookie(); + } else { + cookieManager.removeAllCookies(null); } + Toast.makeText(getApplicationContext(), "Cookies deleted", Toast.LENGTH_SHORT).show(); return true; case R.id.home: @@ -328,7 +435,7 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc return true; case R.id.refresh: - mainWebView.loadUrl(formattedUrlString); + mainWebView.reload(); return true; case R.id.back: