X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMainWebViewActivity.java;h=2720a8ac95c48474ffa33db27b54a1793dc05f25;hb=d649575d732610b57a2b35cbbb8ac9557b068005;hp=5d2307338092869f09aa82b47f3a7f3273772dfd;hpb=81aeaac4229700db3255a6d6c02a8bda18b403e6;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java index 5d230733..2720a8ac 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -1,7 +1,7 @@ /** * Copyright 2015-2016 Soren Stoutner . * - * This file is part of Privacy Browser. + * This file is part of Privacy Browser . * * Privacy Browser is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,18 +20,24 @@ package com.stoutner.privacybrowser; import android.annotation.SuppressLint; -import android.annotation.TargetApi; import android.app.Activity; import android.app.DownloadManager; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.design.widget.NavigationView; +import android.support.design.widget.Snackbar; import android.support.v4.app.DialogFragment; +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatDialogFragment; import android.support.v7.widget.Toolbar; @@ -40,7 +46,6 @@ import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.Window; import android.view.inputmethod.InputMethodManager; import android.webkit.CookieManager; import android.webkit.DownloadListener; @@ -52,19 +57,23 @@ import android.widget.EditText; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ProgressBar; -import android.widget.Toast; + import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; // We need to use AppCompatActivity from android.support.v7.app.AppCompatActivity to have access to the SupportActionBar until the minimum API is >= 21. -public class MainWebViewActivity extends AppCompatActivity implements CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener { +public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener { // favoriteIcon is public static so it can be accessed from CreateHomeScreenShortcut. public static Bitmap favoriteIcon; - // mainWebView is public static so it can be accessed from AboutDialog. It is also used in onCreate(), onOptionsItemSelected(), and loadUrlFromTextBox(). + // mainWebView is public static so it can be accessed from AboutDialog. It is also used in onCreate(), onOptionsItemSelected(), onNavigationItemSelected(), and loadUrlFromTextBox(). public static WebView mainWebView; + // drawerToggle is used in onCreate(), onPostCreate(), onConfigurationChanged(), onNewIntent(), and onNavigationItemSelected(). + private ActionBarDrawerToggle drawerToggle; + // drawerLayout is used in onCreate(), onNewIntent(), and onBackPressed(). + private DrawerLayout drawerLayout; // mainMenu is used in onCreateOptionsMenu() and onOptionsItemSelected(). private Menu mainMenu; // formattedUrlString is used in onCreate(), onOptionsItemSelected(), onCreateHomeScreenShortcutCreate(), and loadUrlFromTextBox(). @@ -81,48 +90,48 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome private boolean saveFormDataEnabled; */ - // cookieManager is used in onCreate() and onOptionsItemSelected(). + // cookieManager is used in onCreate(), onOptionsItemSelected(), and onNavigationItemSelected(). private CookieManager cookieManager; - // cookiesEnabled is used in onCreate(), onCreateOptionsMenu(), and onOptionsItemSelected(). - private boolean cookiesEnabled; + // firstPartyCookiesEnabled is used in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected(). + private boolean firstPartyCookiesEnabled; + // thirdPartyCookiesEnabled is uesd in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected(). + private boolean thirdPartyCookiesEnabled; // urlTextBox is used in onCreate(), onOptionsItemSelected(), and loadUrlFromTextBox(). private EditText urlTextBox; @Override - // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. + // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. The whole premise of Privacy Browser is built around an understanding of these dangers. @SuppressLint("SetJavaScriptEnabled") protected void onCreate(Bundle savedInstanceState) { - // Window.FEATURE_ACTION_BAR_OVERLAY must be enabled to set the app bar to HideOnContentScroll. It must be set before any content is added to the activity. - if (Build.VERSION.SDK_INT >= 11) { - requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY); - } - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_webview); + setContentView(R.layout.coordinator_layout); // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21. Toolbar supportAppBar = (Toolbar) findViewById(R.id.appBar); setSupportActionBar(supportAppBar); final FrameLayout fullScreenVideoFrameLayout = (FrameLayout) findViewById(R.id.fullScreenVideoFrameLayout); - final Activity mainWebViewActivity = this; + // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21. final ActionBar appBar = getSupportActionBar(); - mainWebView = (WebView) findViewById(R.id.mainWebView); + // Setup AdView for the free flavor. + final View adView = findViewById(R.id.adView); - if (appBar != null) { - /* TODO Enable app bar scrolling. - // Scroll the app bar, but only if the API supports overlay mode (>= 11). - if (Build.VERSION.SDK_INT >= 11) { - appBar.setHideOnContentScrollEnabled(true); + // Implement swipe to refresh + final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout); + swipeToRefresh.setColorSchemeResources(R.color.blue); + swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { + @Override + public void onRefresh() { + mainWebView.reload(); } - */ + }); - // Remove the title from the app bar. - appBar.setDisplayShowTitleEnabled(false); + mainWebView = (WebView) findViewById(R.id.mainWebView); + if (appBar != null) { // Add the custom url_bar layout, which shows the favoriteIcon, urlTextBar, and progressBar. appBar.setCustomView(R.layout.url_bar); appBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); @@ -149,6 +158,18 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome }); } + // Create the navigation drawer. + drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout); + // The DrawerTitle identifies the drawer in accessibility mode. + drawerLayout.setDrawerTitle(GravityCompat.START, getString(R.string.navigation_drawer)); + + // Listen for touches on the navigation menu. + final NavigationView navigationView = (NavigationView) findViewById(R.id.navigationView); + navigationView.setNavigationItemSelectedListener(this); + + // drawerToggle creates the hamburger icon at the start of the AppBar. + drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, supportAppBar, R.string.open_navigation, R.string.close_navigation); + mainWebView.setWebViewClient(new WebViewClient() { // shouldOverrideUrlLoading makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps. @Override @@ -157,12 +178,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome 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_SHORT).show(); - } - */ - // Update the URL in urlTextBox when the page starts to load. @Override public void onPageStarted(WebView view, String url, Bitmap favicon) { @@ -173,7 +188,11 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome @Override public void onPageFinished(WebView view, String url) { formattedUrlString = url; - urlTextBox.setText(formattedUrlString); + + // Only update urlTextBox if the user is not typing in it. + if (!urlTextBox.hasFocus()) { + urlTextBox.setText(formattedUrlString); + } } }); @@ -189,6 +208,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome progressBar.setVisibility(View.VISIBLE); } else { progressBar.setVisibility(View.GONE); + + //Stop the SwipeToRefresh indicator if it is running + swipeToRefresh.setRefreshing(false); } } } @@ -213,20 +235,23 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome appBar.hide(); } + // Show the fullScreenVideoFrameLayout. fullScreenVideoFrameLayout.addView(view); fullScreenVideoFrameLayout.setVisibility(View.VISIBLE); + // Hide the mainWebView. mainWebView.setVisibility(View.GONE); + // Hide the ad if this is the free flavor. + BannerAd.hideAd(adView); + /* SYSTEM_UI_FLAG_HIDE_NAVIGATION hides the navigation bars on the bottom or right of the screen. ** SYSTEM_UI_FLAG_FULLSCREEN hides the status bar across the top of the screen. ** SYSTEM_UI_FLAG_IMMERSIVE_STICKY makes the navigation and status bars ghosted overlays and automatically rehides them. */ // Set the one flag supported by API >= 14. - if (Build.VERSION.SDK_INT >= 14) { - view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); - } + view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); // Set the two flags that are supported by API >= 16. if (Build.VERSION.SDK_INT >= 16) { @@ -245,8 +270,13 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome appBar.show(); } + // Show the mainWebView. mainWebView.setVisibility(View.VISIBLE); + // Show the ad if this is the free flavor. + BannerAd.showAd(adView); + + // Hide the fullScreenVideoFrameLayout. fullScreenVideoFrameLayout.removeAllViews(); fullScreenVideoFrameLayout.setVisibility(View.GONE); } @@ -263,23 +293,20 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome // Add the URL as the description for the download. requestUri.setDescription(url); - // Show the download notification after the download is completed if the API is 11 or greater. - if (Build.VERSION.SDK_INT >= 11) { - requestUri.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); - } + // Show the download notification after the download is completed. + requestUri.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); + // Initiate the download and display a Snackbar. downloadManager.enqueue(requestUri); - Toast.makeText(mainWebViewActivity, "Download started", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.download_started, Snackbar.LENGTH_SHORT).show(); } }); // Allow pinch to zoom. mainWebView.getSettings().setBuiltInZoomControls(true); - // Hide zoom controls if the API is 11 or greater. - if (Build.VERSION.SDK_INT >= 11) { - mainWebView.getSettings().setDisplayZoomControls(false); - } + // Hide zoom controls. + mainWebView.getSettings().setDisplayZoomControls(false); // Initialize the default preference values the first time the program is run. PreferenceManager.setDefaultValues(this, R.xml.preferences, false); @@ -291,22 +318,24 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false); mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); + // Initialize cookieManager. + cookieManager = CookieManager.getInstance(); + + // Set cookies initial status. + firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies_enabled", false); + cookieManager.setAcceptCookie(firstPartyCookiesEnabled); + + // Set third-party cookies initial status if API >= 21. + if (Build.VERSION.SDK_INT >= 21) { + thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies_enabled", false); + cookieManager.setAcceptThirdPartyCookies(mainWebView, thirdPartyCookiesEnabled); + } + // Set DOM storage initial status. domStorageEnabled = savedPreferences.getBoolean("dom_storage_enabled", false); mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled); - /* Save Form Data does nothing until database storage is implemented. - // Set Save Form Data initial status. - saveFormDataEnabled = true; - mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); - */ - - // Set cookies initial status. - cookiesEnabled = savedPreferences.getBoolean("cookies_enabled", false); - cookieManager = CookieManager.getInstance(); - cookieManager.setAcceptCookie(cookiesEnabled); - - // Set hompage initial status. + // Set homepage initial status. homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com"); // Get the intent information that started the app. @@ -325,6 +354,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome // Load the initial website. mainWebView.loadUrl(formattedUrlString); + + // Load the ad if this is the free flavor. + BannerAd.requestAd(adView); } @Override @@ -338,31 +370,40 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome formattedUrlString = intentUriData.toString(); } + // Close the navigation drawer if it is open. + if (drawerLayout.isDrawerVisible(GravityCompat.START)) { + drawerLayout.closeDrawer(GravityCompat.START); + } + // Load the website. mainWebView.loadUrl(formattedUrlString); + + // Clear the keyboard if displayed and remove the focus on the urlTextBar if it has it. + mainWebView.requestFocus(); } @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); + getMenuInflater().inflate(R.menu.menu_options, menu); // Set mainMenu so it can be used by onOptionsItemSelected. mainMenu = menu; // Get MenuItems for checkable menu items. MenuItem toggleJavaScript = menu.findItem(R.id.toggleJavaScript); + MenuItem toggleFirstPartyCookies = menu.findItem(R.id.toggleFirstPartyCookies); + MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies); 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 icon for toggleJavaScript if (javaScriptEnabled) { toggleJavaScript.setIcon(R.drawable.javascript_enabled); } else { - if (domStorageEnabled || cookiesEnabled) { + if (domStorageEnabled || firstPartyCookiesEnabled) { toggleJavaScript.setIcon(R.drawable.warning); } else { toggleJavaScript.setIcon(R.drawable.privacy_mode); @@ -370,29 +411,30 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome } // Set the initial status of the menu item checkboxes. + toggleFirstPartyCookies.setChecked(firstPartyCookiesEnabled); + toggleThirdPartyCookies.setChecked(thirdPartyCookiesEnabled); toggleDomStorage.setChecked(domStorageEnabled); /* toggleSaveFormData does nothing until database storage is implemented. toggleSaveFormData.setChecked(saveFormDataEnabled); */ - toggleCookies.setChecked(cookiesEnabled); return true; } @Override public boolean onPrepareOptionsMenu(Menu menu) { + // Only enable Third-Party Cookies if SDK >= 21 and First-Party Cookies are enabled. + MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies); + if ((Build.VERSION.SDK_INT >= 21) && firstPartyCookiesEnabled) { + toggleThirdPartyCookies.setEnabled(true); + } else { + toggleThirdPartyCookies.setEnabled(false); + } + // 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); @@ -401,8 +443,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome } @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. @@ -421,100 +461,100 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome mainWebView.getSettings().setJavaScriptEnabled(false); mainWebView.reload(); - // Update the toggleJavaScript icon and display a toast message. - if (domStorageEnabled || cookiesEnabled) { + // Update the toggleJavaScript icon and display a snackbar. + if (domStorageEnabled || firstPartyCookiesEnabled) { menuItem.setIcon(R.drawable.warning); - if (domStorageEnabled && cookiesEnabled) { - Toast.makeText(getApplicationContext(), "JavaScript disabled, DOM Storage and Cookies still enabled", Toast.LENGTH_SHORT).show(); - } else { - if (domStorageEnabled) { - Toast.makeText(getApplicationContext(), "JavaScript disabled, DOM Storage still enabled", Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getApplicationContext(), "JavaScript disabled, Cookies still enabled", Toast.LENGTH_SHORT).show(); - } - } + Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_disabled, Snackbar.LENGTH_SHORT).show(); } else { menuItem.setIcon(R.drawable.privacy_mode); - Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); } } else { javaScriptEnabled = true; menuItem.setIcon(R.drawable.javascript_enabled); mainWebView.getSettings().setJavaScriptEnabled(true); mainWebView.reload(); - Toast.makeText(getApplicationContext(), "JavaScript enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_enabled, Snackbar.LENGTH_SHORT).show(); } return true; - case R.id.toggleDomStorage: - if (domStorageEnabled) { - domStorageEnabled = false; + case R.id.toggleFirstPartyCookies: + if (firstPartyCookiesEnabled) { + firstPartyCookiesEnabled = false; menuItem.setChecked(false); - mainWebView.getSettings().setDomStorageEnabled(false); + cookieManager.setAcceptCookie(false); mainWebView.reload(); - // Update the toggleJavaScript icon and display a toast message if appropriate. - if (!javaScriptEnabled && !cookiesEnabled) { - toggleJavaScript.setIcon(R.drawable.privacy_mode); - Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show(); - } else { - if (cookiesEnabled) { + // Update the toggleJavaScript icon if appropriate and display a snackbar. + if (!javaScriptEnabled) { + if (domStorageEnabled) { toggleJavaScript.setIcon(R.drawable.warning); - Toast.makeText(getApplicationContext(), "Cookies still enabled", Toast.LENGTH_SHORT).show(); - } // Else Do nothing because JavaScript is enabled. + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } else { + toggleJavaScript.setIcon(R.drawable.privacy_mode); + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); + } + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); } } else { - domStorageEnabled = true; + firstPartyCookiesEnabled = true; menuItem.setChecked(true); - mainWebView.getSettings().setDomStorageEnabled(true); + cookieManager.setAcceptCookie(true); mainWebView.reload(); // Update the toggleJavaScript icon if appropriate. if (!javaScriptEnabled) { toggleJavaScript.setIcon(R.drawable.warning); - } // Else Do nothing because JavaScript is enabled. + } // Else do nothing because JavaScript is enabled. - Toast.makeText(getApplicationContext(), "DOM Storage enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); } return true; - /* toggleSaveFormData does nothing until database storage is implemented. - case R.id.toggleSaveFormData: - if (saveFormDataEnabled) { - saveFormDataEnabled = false; - menuItem.setChecked(false); - mainWebView.getSettings().setSaveFormData(false); - mainWebView.reload(); - } else { - saveFormDataEnabled = true; - menuItem.setChecked(true); - mainWebView.getSettings().setSaveFormData(true); - mainWebView.reload(); - } + case R.id.toggleThirdPartyCookies: + if (Build.VERSION.SDK_INT >= 21) { + if (thirdPartyCookiesEnabled) { + thirdPartyCookiesEnabled = false; + menuItem.setChecked(false); + cookieManager.setAcceptThirdPartyCookies(mainWebView, false); + mainWebView.reload(); + + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } else { + thirdPartyCookiesEnabled = true; + menuItem.setChecked(true); + cookieManager.setAcceptThirdPartyCookies(mainWebView, true); + mainWebView.reload(); + + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); + } + } // Else do nothing because SDK < 21. return true; - */ - case R.id.toggleCookies: - if (cookiesEnabled) { - cookiesEnabled = false; + case R.id.toggleDomStorage: + if (domStorageEnabled) { + domStorageEnabled = false; menuItem.setChecked(false); - cookieManager.setAcceptCookie(false); + mainWebView.getSettings().setDomStorageEnabled(false); mainWebView.reload(); - // Update the toggleJavaScript icon and display a toast message if appropriate. - if (!javaScriptEnabled && !domStorageEnabled) { - toggleJavaScript.setIcon(R.drawable.privacy_mode); - Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show(); - } else { - if (domStorageEnabled) { + // Update the toggleJavaScript icon if appropriate and display a snackbar. + if (!javaScriptEnabled) { + if (firstPartyCookiesEnabled) { toggleJavaScript.setIcon(R.drawable.warning); - Toast.makeText(getApplicationContext(), "DOM Storage still enabled", Toast.LENGTH_SHORT).show(); - } // Else Do nothing because JavaScript is enabled. + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_disabled, Snackbar.LENGTH_SHORT).show(); + } else { + toggleJavaScript.setIcon(R.drawable.privacy_mode); + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); + } + }else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_disabled, Snackbar.LENGTH_SHORT).show(); } } else { - cookiesEnabled = true; + domStorageEnabled = true; menuItem.setChecked(true); - cookieManager.setAcceptCookie(true); + mainWebView.getSettings().setDomStorageEnabled(true); mainWebView.reload(); // Update the toggleJavaScript icon if appropriate. @@ -522,23 +562,31 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome toggleJavaScript.setIcon(R.drawable.warning); } // Else Do nothing because JavaScript is enabled. - Toast.makeText(getApplicationContext(), "Cookies enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_enabled, Snackbar.LENGTH_SHORT).show(); } 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(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.cookies_deleted, Snackbar.LENGTH_SHORT).show(); + return true; + + case R.id.clearDomStorage: + WebStorage webStorage = WebStorage.getInstance(); + webStorage.deleteAllData(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_deleted, Snackbar.LENGTH_SHORT).show(); + return true; + + case R.id.share: + Intent shareIntent = new Intent(); + shareIntent.setAction(Intent.ACTION_SEND); + shareIntent.putExtra(Intent.EXTRA_TEXT, urlTextBox.getText().toString()); + shareIntent.setType("text/plain"); + startActivity(Intent.createChooser(shareIntent, "Share URL")); return true; case R.id.addToHomescreen: @@ -549,51 +597,55 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome //Everything else will be handled by CreateHomeScreenShortcut and the associated listeners below. return true; - case R.id.downloads: - // Launch the system Download Manager. - Intent downloadManangerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS); - - // Launch as a new task so that Download Manager and Privacy Browser show as separate windows in the recent tasks list. - downloadManangerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + default: + return super.onOptionsItemSelected(menuItem); + } + } - startActivity(downloadManangerIntent); - return true; + @Override + // removeAllCookies is deprecated, but it is required for API < 21. + @SuppressWarnings("deprecation") + public boolean onNavigationItemSelected(MenuItem menuItem) { + int menuItemId = menuItem.getItemId(); + switch (menuItemId) { case R.id.home: mainWebView.loadUrl(homepage); - return true; - - case R.id.refresh: - mainWebView.reload(); - return true; + break; case R.id.back: - mainWebView.goBack(); - return true; + if (mainWebView.canGoBack()) { + mainWebView.goBack(); + } + break; case R.id.forward: - mainWebView.goForward(); - return true; + if (mainWebView.canGoForward()) { + mainWebView.goForward(); + } + break; - case R.id.share: - Intent shareIntent = new Intent(); - shareIntent.setAction(Intent.ACTION_SEND); - shareIntent.putExtra(Intent.EXTRA_TEXT, urlTextBox.getText().toString()); - shareIntent.setType("text/plain"); - startActivity(Intent.createChooser(shareIntent, "Share URL")); - return true; + case R.id.downloads: + // Launch the system Download Manager. + Intent downloadManagerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS); + + // Launch as a new task so that Download Manager and Privacy Browser show as separate windows in the recent tasks list. + downloadManagerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + + startActivity(downloadManagerIntent); + break; case R.id.settings: - // Launch SettingsActivity. + // Launch PreferenceFragment. Intent intent = new Intent(this, SettingsActivity.class); startActivity(intent); - return true; + break; 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.clearAndExit: // Clear DOM storage. @@ -616,11 +668,31 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome } else { finish(); } - return true; + break; default: - return super.onOptionsItemSelected(menuItem); + break; } + + // Close the navigation drawer. + drawerLayout.closeDrawer(GravityCompat.START); + return true; + } + + @Override + public void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + + // Sync the state of the DrawerToggle after onRestoreInstanceState has finished. + drawerToggle.syncState(); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + + // Update the status of the drawerToggle icon. + drawerToggle.onConfigurationChanged(newConfig); } @Override @@ -647,19 +719,26 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome sendBroadcast(placeBookmarkShortcut); } - // Override onBackPressed so that if mainWebView can go back it does when the system back button is pressed. + // Override onBackPressed to handle the navigation drawer and mainWebView. @Override public void onBackPressed() { final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); - if (mainWebView.canGoBack()) { - mainWebView.goBack(); + // Close the navigation drawer if it is available. GravityCompat.START is the drawer on the left on Left-to-Right layout text. + if (drawerLayout.isDrawerVisible(GravityCompat.START)) { + drawerLayout.closeDrawer(GravityCompat.START); } else { - super.onBackPressed(); + // Load the previous URL if available. + if (mainWebView.canGoBack()) { + mainWebView.goBack(); + } else { + // Pass onBackPressed to the system. + super.onBackPressed(); + } } } - public void loadUrlFromTextBox() throws UnsupportedEncodingException { + private void loadUrlFromTextBox() throws UnsupportedEncodingException { // Get the text from urlTextBox and convert it to a string. String unformattedUrlString = urlTextBox.getText().toString(); URL unformattedUrl = null;