]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/java/com/stoutner/privacybrowser/Webview.java
Create Clear Dom Storage and Exit menu items and set launchMode="SingleTask".
[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / Webview.java
index c5d52dfbfc6958337c7d0ff91927023c528046df..53311f7adb6f5c51e9c8a86193a74ee2e4d3bc2f 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser.
  *
@@ -41,10 +41,10 @@ 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.WebResourceError;
-import android.webkit.WebResourceRequest;
+import android.webkit.WebStorage;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.EditText;
@@ -61,22 +61,43 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
     // favoriteIcon is public static so it can be accessed from CreateHomeScreenShortcut.
     public static Bitmap favoriteIcon;
 
+    // mainWebView is used in onCreate and onOptionsItemSelected.
+    private WebView mainWebView;
+    // formattedUrlString is used in onCreate, onOptionsItemSelected, onCreateHomeScreenShortcutCreate, and loadUrlFromTextBox.
     private String formattedUrlString;
+    // homepage is used in onCreate and onOptionsItemSelected.
     private String homepage = "https://www.duckduckgo.com/";
+    // enableJavaScript is used in onCreate, onCreateOptionsMenu, and onOptionsItemSelected.
+    private boolean enableJavaScript;
+    // enableDomStorage is used in onCreate, onCreateOptionsMenu, and onOptionsItemSelected.
+    private boolean enableDomStorage;
 
-    // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled.
-    @SuppressLint("SetJavaScriptEnabled")
+    /*  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;
 
     @Override
+    // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled.
+    @SuppressLint("SetJavaScriptEnabled")
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_webview);
 
-        final WebView mainWebView = (WebView) findViewById(R.id.mainWebView);
         final FrameLayout fullScreenVideoFrameLayout = (FrameLayout) findViewById(R.id.fullScreenVideoFrameLayout);
         final Activity mainWebViewActivity = this;
 
-        final ActionBar actionBar = getSupportActionBar();
+        mainWebView = (WebView) findViewById(R.id.mainWebView);
+        actionBar = getSupportActionBar();
+
         if (actionBar != null) {
             // Remove the title from the action bar.
             actionBar.setDisplayShowTitleEnabled(false);
@@ -115,9 +136,11 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
                 return true;
             }
 
+            /* These errors do not provide any useful information and clutter the screen.
             public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
-                Toast.makeText(mainWebViewActivity, "Error loading " + request + "   Error: " + error, Toast.LENGTH_LONG).show();
+                Toast.makeText(mainWebViewActivity, "Error loading " + request + "   Error: " + error, Toast.LENGTH_SHORT).show();
             }
+            */
 
             // Update the URL in urlTextBox when the page starts to load.
             @Override
@@ -172,7 +195,9 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
             // Enter full screen video
             @Override
             public void onShowCustomView(View view, CustomViewCallback callback) {
-                getSupportActionBar().hide();
+                if (getSupportActionBar() != null) {
+                    getSupportActionBar().hide();
+                }
 
                 fullScreenVideoFrameLayout.addView(view);
                 fullScreenVideoFrameLayout.setVisibility(View.VISIBLE);
@@ -202,7 +227,9 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
 
             // Exit full screen video
             public void onHideCustomView() {
-                getSupportActionBar().show();
+                if (getSupportActionBar() != null) {
+                    getSupportActionBar().show();
+                }
 
                 mainWebView.setVisibility(View.VISIBLE);
 
@@ -211,6 +238,7 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
             }
         });
 
+        // Allow the downloading of files.
         mainWebView.setDownloadListener(new DownloadListener() {
             // Launch the Android download manager when a link leads to a download.
             @Override
@@ -239,11 +267,24 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
             mainWebView.getSettings().setDisplayZoomControls(false);
         }
 
-        // Enable JavaScript.
-        mainWebView.getSettings().setJavaScriptEnabled(true);
+        // Set JavaScript initial status.
+        enableJavaScript = false;
+        mainWebView.getSettings().setJavaScriptEnabled(enableJavaScript);
+
+        // Set DOM Storage initial status.
+        enableDomStorage = false;
+        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);
+        */
 
-        // Enable DOM Storage.
-        mainWebView.getSettings().setDomStorageEnabled(true);
+        // Set Cookies initial status.
+        enableCookies = false;
+        cookieManager = CookieManager.getInstance();
+        cookieManager.setAcceptCookie(enableCookies);
 
         // Get the intent information that started the app.
         final Intent intent = getIntent();
@@ -263,39 +304,167 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
         mainWebView.loadUrl(formattedUrlString);
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        // Sets the new intent as the activity intent, so that any future getIntent() picks up this one.
+        setIntent(intent);
+
+        if (intent.getData() != null) {
+            // Get the intent data and convert it to a string.
+            final Uri intentUriData = intent.getData();
+            formattedUrlString = intentUriData.toString();
+        }
+
+        // Load the website.
+        mainWebView.loadUrl(formattedUrlString);
+    }
+
     @Override
     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);
+
+        // 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);
+
+        // 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;
     }
 
-    // @TargetApi(11) turns off the errors regarding copy and paste, which are removed from view in menu_webview.xml for lower version of Android.
     @Override
+    // @TargetApi(11) turns off the errors regarding copy and paste, which are removed from view in menu_webview.xml for lower version of Android.
     @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);
-        ActionBar actionBar = getSupportActionBar();
-        final WebView mainWebView = (WebView) findViewById(R.id.mainWebView);
 
         // Sets the commands that relate to the menu entries.
         switch (menuItemId) {
+            case R.id.toggleJavaScript:
+                if (enableJavaScript) {
+                    enableJavaScript = false;
+                    menuItem.setChecked(false);
+                    mainWebView.getSettings().setJavaScriptEnabled(false);
+                    mainWebView.reload();
+                } else {
+                    enableJavaScript = true;
+                    menuItem.setChecked(true);
+                    mainWebView.getSettings().setJavaScriptEnabled(true);
+                    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.clearDomStorage:
+                WebStorage webStorage = WebStorage.getInstance();
+                webStorage.deleteAllData();
+                Toast.makeText(getApplicationContext(), "DOM storage deleted", Toast.LENGTH_SHORT).show();
+                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:
                 mainWebView.loadUrl(homepage);
-                break;
+                return true;
 
             case R.id.refresh:
-                mainWebView.loadUrl(formattedUrlString);
-                break;
+                mainWebView.reload();
+                return true;
 
             case R.id.back:
                 mainWebView.goBack();
-                break;
+                return true;
 
             case R.id.forward:
                 mainWebView.goForward();
-                break;
+                return true;
 
             case R.id.copyURL:
                 // Make sure that actionBar is not null.
@@ -303,7 +472,7 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
                     EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox);
                     clipboard.setPrimaryClip(ClipData.newPlainText("URL", urlTextBox.getText()));
                 }
-                break;
+                return true;
 
             case R.id.pasteURL:
                 // Make sure that actionBar is not null.
@@ -317,7 +486,7 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
                         e.printStackTrace();
                     }
                 }
-                break;
+                return true;
 
             case R.id.shareURL:
                 // Make sure that actionBar is not null.
@@ -329,7 +498,7 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
                     shareIntent.setType("text/plain");
                     startActivity(Intent.createChooser(shareIntent, "Share URL"));
                 }
-                break;
+                return true;
 
             case R.id.addToHomescreen:
                 // Show the CreateHomeScreenShortcut AlertDialog and name this instance createShortcut.
@@ -337,7 +506,7 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
                 shortcutDialog.show(getSupportFragmentManager(), "createShortcut");
 
                 //Everything else will be handled by CreateHomeScreenShortcut and the associated listeners below.
-                break;
+                return true;
 
             case R.id.downloads:
                 // Launch the system Download Manager.
@@ -347,17 +516,36 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
                 downloadManangerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
                 startActivity(downloadManangerIntent);
-                break;
+                return true;
 
             case R.id.about:
                 // Show the AboutDialog AlertDialog and name this instance aboutDialog.
                 AppCompatDialogFragment aboutDialog = new AboutDialog();
                 aboutDialog.show(getSupportFragmentManager(), "aboutDialog");
+                return true;
 
-                break;
-        }
+            case R.id.exit:
+                // Clear DOM storage.
+                WebStorage domStorage = WebStorage.getInstance();
+                domStorage.deleteAllData();
+
+                // Clear cookies.
+                if (Build.VERSION.SDK_INT < 21) {
+                    cookieManager.removeAllCookie();
+                } else {
+                    cookieManager.removeAllCookies(null);
+                }
 
-        return super.onOptionsItemSelected(menuItem);
+                // Destroy the internal state of the webview.
+                mainWebView.destroy();
+
+                // Close Privacy Browser.
+                finish();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(menuItem);
+        }
     }
 
     @Override