Create Clear Dom Storage and Exit menu items and set launchMode="SingleTask".

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bf5b63b059d2e90f9b39941a5599220a449be143..61a4c6f209724dbd96c7f9f8a2b65ece45e6edc4 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,11 +34,14 @@
         android:theme="@style/AppTheme" >
 
         <!-- android:configChanges="orientation|screenSize" makes the app not reload when the orientation changes. -->
-        <!-- android:windowSoftInputMode="stateAlwaysHidden" hides the keyboard when the app starts. -->
+        <!-- android:launchMode="singleTask" makes the app launch in a new task instead of inside the task of the program that sends it an intent.
+            It also makes it reuse an existing Privacy Browser activity if available instead of launching a new one. -->
         <activity
             android:name=".Webview"
             android:configChanges="orientation|screenSize"
-            android:label="@string/privacy_browser" >
+            android:label="@string/privacy_browser"
+            android:launchMode="singleTask">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
index d2631c48100863646ea04d6a5fd983e6870f309f..53311f7adb6f5c51e9c8a86193a74ee2e4d3bc2f 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
@@ -44,6 +44,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.webkit.CookieManager;
 import android.webkit.DownloadListener;
 import android.webkit.WebChromeClient;
+import android.webkit.WebStorage;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.EditText;
@@ -78,16 +79,15 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
 
     // cookieManager is used in onCreate and onOptionsItemSelected.
     private CookieManager cookieManager;
-    //enableCookies is used in onCreate, onCreateOptionsMenu, and onOptionsItemSelected.
+    // 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")
-
-    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_webview);
@@ -268,11 +268,11 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
         }
 
         // Set JavaScript initial status.
-        enableJavaScript = true;
+        enableJavaScript = false;
         mainWebView.getSettings().setJavaScriptEnabled(enableJavaScript);
 
         // Set DOM Storage initial status.
-        enableDomStorage = true;
+        enableDomStorage = false;
         mainWebView.getSettings().setDomStorageEnabled(enableDomStorage);
 
         /* Save Form Data does nothing until database storage is implemented.
@@ -282,8 +282,8 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
         */
 
         // Set Cookies initial status.
+        enableCookies = false;
         cookieManager = CookieManager.getInstance();
-        enableCookies = true;
         cookieManager.setAcceptCookie(enableCookies);
 
         // Get the intent information that started the app.
@@ -304,6 +304,21 @@ 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.
@@ -316,7 +331,6 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
         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);
@@ -421,6 +435,12 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
                 }
                 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();
@@ -504,6 +524,25 @@ public class Webview extends AppCompatActivity implements CreateHomeScreenShortc
                 aboutDialog.show(getSupportFragmentManager(), "aboutDialog");
                 return true;
 
+            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);
+                }
+
+                // Destroy the internal state of the webview.
+                mainWebView.destroy();
+
+                // Close Privacy Browser.
+                finish();
+                return true;
+
             default:
                 return super.onOptionsItemSelected(menuItem);
         }

diff --git a/app/src/main/res/menu/menu_webview.xml b/app/src/main/res/menu/menu_webview.xml
index 18130e28e52088cea8eb2704216bc9acc4979862..d0042d9853e6f55e0f96dc42e3d1601231f38d8a 100644 (file)
--- a/app/src/main/res/menu/menu_webview.xml
+++ b/app/src/main/res/menu/menu_webview.xml
@@ -53,10 +53,16 @@
         android:checkable="true"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/clearDomStorage"
+        android:title="@string/clearDomStorage"
+        android:orderInCategory="5"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/clearCookies"
         android:title="@string/clearCookies"
-        android:orderInCategory="5"
+        android:orderInCategory="6"
         app:showAsAction="never" />
 
     <item
@@ -125,4 +131,10 @@
         android:title="@string/about"
         android:orderInCategory="100"
         app:showAsAction="never" />
+
+    <item
+        android:id="@+id/exit"
+        android:title="@string/exit"
+        android:orderInCategory="110"
+        app:showAsAction="never" />
 </menu>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 348063830ce463100ddb095726f76f6f0030505b..8c2c531bab556ab98ff946f57157df4806bec75c 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,6 +28,7 @@
     <string name="domStorage">DOM Storage</string>
     <string name="saveFormData">Save Form Data</string>
     <string name="cookies">Cookies</string>
+    <string name="clearDomStorage">Clear DOM Storage</string>
     <string name="clearCookies">Clear Cookies</string>
     <string name="home">Home</string>
     <string name="refresh">Refresh</string>
@@ -39,6 +40,7 @@
     <string name="add_to_home_screen">Add to Home Screen</string>
     <string name="downloads">Downloads</string>
     <string name="about">About</string>
+    <string name="exit">Exit</string>
 
     <!-- Create Home Screen Shorcut Alert Dialog. -->
     <string name="shortcut_name">Shortcut name</string>