X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMainWebViewActivity.java;h=2af787eb8788138f75bd0765807b681448096112;hb=826776d415157b99701dd19d2713a60db6fefe2c;hp=4cad1873faf00f8c275ee0c1c8bf31d09214b406;hpb=4a527702ad11865c2a53b01c398b507cd488276c;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 4cad1873..2af787eb 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -30,11 +30,13 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.net.http.SslError; 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.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; @@ -51,6 +53,7 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.webkit.CookieManager; import android.webkit.DownloadListener; +import android.webkit.SslErrorHandler; import android.webkit.WebChromeClient; import android.webkit.WebStorage; import android.webkit.WebView; @@ -69,11 +72,15 @@ import java.util.HashMap; import java.util.Map; // 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 NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener { +public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener, SslCertificateError.SslCertificateErrorListener { // `favoriteIcon` is public static so it can be accessed from `CreateHomeScreenShortcut`, `BookmarksActivity`, `CreateBookmark`, `CreateBookmarkFolder`, and `EditBookmark`. // It is also used in `onCreate()` and `onCreateHomeScreenShortcutCreate()`. public static Bitmap favoriteIcon; + // `privacyBrowserActivity` is public static so it can be accessed from `SettingsFragment`. + // It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`, + public static Activity privacyBrowserActivity; + // `mainWebView` is public static so it can be accessed from `SettingsFragment`. // It is also used in `onCreate()`, `onOptionsItemSelected()`, `onNavigationItemSelected()`, and `loadUrlFromTextBox()`. public static WebView mainWebView; @@ -96,7 +103,8 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // It is also used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`. public static boolean firstPartyCookiesEnabled; - // `thirdPartyCookiesEnabled` is used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`. + // `thirdPartyCookiesEnables` is public static so it can be accessed from `SettingsFragment`. + // It is also used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`. public static boolean thirdPartyCookiesEnabled; // `domStorageEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`. @@ -120,7 +128,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // `swipeToRefreshEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`. public static boolean swipeToRefreshEnabled; - // `customHeader` is public static so it can be accessed from `BookmarksActivity`. It is also used in `onCreate()` and `loadUrlFromTextBox()`. + // `customHeader` is public static so it can be accessed from `BookmarksActivity`. It is also used in `onCreate()`, `onOptionsItemSelected()`, and `loadUrlFromTextBox()`. public static Map customHeaders = new HashMap(); @@ -131,15 +139,18 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // `drawerLayout` is used in `onCreate()`, `onNewIntent()`, and `onBackPressed()`. private DrawerLayout drawerLayout; - // `privacyIcon` is used in `onCreateOptionsMenu()` and `updatePrivacyIcon()`. - private MenuItem privacyIcon; - // `urlTextBox` is used in `onCreate()`, `onOptionsItemSelected()`, and `loadUrlFromTextBox()`. private EditText urlTextBox; // `adView` is used in `onCreate()` and `onConfigurationChanged()`. private View adView; + // `sslErrorHandler` is used in `onCreate()`, `onSslErrorCancel()`, and `onSslErrorProceed`. + private SslErrorHandler sslErrorHandler; + + // `sharedPreferences` is used in `onCreate()` and `onCreateOptionsMenu()`. + SharedPreferences sharedPreferences; + @Override // 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") @@ -147,6 +158,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation super.onCreate(savedInstanceState); setContentView(R.layout.main_coordinatorlayout); + // We need a handle for the activity, which is accessed from `SettingsFragment` and fed into `updatePrivacyIcons()`. + privacyBrowserActivity = this; + // 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); @@ -208,9 +222,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // 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); - // Replace the header that `WebView` creates for `X-Requested-With` with a null value. The default value is the application ID (com.stoutner.privacybrowser.standard). - customHeaders.put("X-Requested-With", ""); - 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 @@ -251,6 +262,17 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation urlTextBox.setText(formattedUrlString); } } + + // Handle SSL Certificate errors. + @Override + public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { + // Store `handler` so it can be accesses from `onSslErrorCancel()` and `onSslErrorProceed()`. + sslErrorHandler = handler; + + // Display the SSL error `AlertDialog`. + DialogFragment sslCertificateErrorDialogFragment = SslCertificateError.displayDialog(error); + sslCertificateErrorDialogFragment.show(getFragmentManager(), getResources().getString(R.string.ssl_certificate_error)); + } }); mainWebView.setWebChromeClient(new WebChromeClient() { @@ -351,35 +373,35 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation PreferenceManager.setDefaultValues(this, R.xml.preferences, false); // Get the shared preference values. - SharedPreferences savedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); // Set JavaScript initial status. The default value is false. - javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false); + javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false); mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); // Initialize cookieManager. cookieManager = CookieManager.getInstance(); // Set cookies initial status. The default value is false. - firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies_enabled", false); + firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies_enabled", false); cookieManager.setAcceptCookie(firstPartyCookiesEnabled); // Set third-party cookies initial status if API >= 21. The default value is false. if (Build.VERSION.SDK_INT >= 21) { - thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies_enabled", false); + thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies_enabled", false); cookieManager.setAcceptThirdPartyCookies(mainWebView, thirdPartyCookiesEnabled); } // Set DOM storage initial status. The default value is false. - domStorageEnabled = savedPreferences.getBoolean("dom_storage_enabled", false); + domStorageEnabled = sharedPreferences.getBoolean("dom_storage_enabled", false); mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled); // Set the saved form data initial status. The default is false. - saveFormDataEnabled = savedPreferences.getBoolean("save_form_data_enabled", false); + saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data_enabled", false); mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); // Set the user agent initial status. - String userAgentString = savedPreferences.getString("user_agent", "Default user agent"); + String userAgentString = sharedPreferences.getString("user_agent", "Default user agent"); switch (userAgentString) { case "Default user agent": // Do nothing. @@ -387,46 +409,55 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation case "Custom user agent": // Set the custom user agent on mainWebView, The default is "PrivacyBrowser/1.0". - mainWebView.getSettings().setUserAgentString(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); + mainWebView.getSettings().setUserAgentString(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); break; default: // Set the selected user agent on mainWebView. The default is "PrivacyBrowser/1.0". - mainWebView.getSettings().setUserAgentString(savedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); + mainWebView.getSettings().setUserAgentString(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); break; } // Set the initial string for JavaScript disabled search. - if (savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=").equals("Custom URL")) { + if (sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=").equals("Custom URL")) { // Get the custom URL string. The default is "". - javaScriptDisabledSearchURL = savedPreferences.getString("javascript_disabled_search_custom_url", ""); + javaScriptDisabledSearchURL = sharedPreferences.getString("javascript_disabled_search_custom_url", ""); } else { // Use the string from javascript_disabled_search. - javaScriptDisabledSearchURL = savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); + javaScriptDisabledSearchURL = sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); } // Set the initial string for JavaScript enabled search. - if (savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=").equals("Custom URL")) { + if (sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=").equals("Custom URL")) { // Get the custom URL string. The default is "". - javaScriptEnabledSearchURL = savedPreferences.getString("javascript_enabled_search_custom_url", ""); + javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_search_custom_url", ""); } else { // Use the string from javascript_enabled_search. - javaScriptEnabledSearchURL = savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); + javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); } // Set the homepage initial status. The default value is `https://www.duckduckgo.com`. - homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com"); + homepage = sharedPreferences.getString("homepage", "https://www.duckduckgo.com"); // Set the font size initial status. the default value is `100`. - String defaultFontSizeString = savedPreferences.getString("default_font_size", "100"); + String defaultFontSizeString = sharedPreferences.getString("default_font_size", "100"); mainWebView.getSettings().setTextZoom(Integer.valueOf(defaultFontSizeString)); // Set the swipe to refresh initial status. The default is `true`. - swipeToRefreshEnabled = savedPreferences.getBoolean("swipe_to_refresh_enabled", true); + swipeToRefreshEnabled = sharedPreferences.getBoolean("swipe_to_refresh_enabled", true); swipeToRefresh.setEnabled(swipeToRefreshEnabled); + // Replace the header that `WebView` creates for `X-Requested-With` with a null value. The default value is the application ID (com.stoutner.privacybrowser.standard). + customHeaders.put("X-Requested-With", ""); + + // Set Do Not Track. The default is true. + if (sharedPreferences.getBoolean("do_not_track", true)) { + customHeaders.put("DNT", "1"); + } + + // Get the intent information that started the app. final Intent intent = getIntent(); @@ -489,13 +520,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Set mainMenu so it can be used by onOptionsItemSelected. mainMenu = menu; - // Initialize privacyIcon - privacyIcon = menu.findItem(R.id.toggleJavaScript); - // Set the initial status of the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(privacyBrowserActivity); - // Get MenuItems for checkable menu items. + // Get handles for the menu items. MenuItem toggleFirstPartyCookies = menu.findItem(R.id.toggleFirstPartyCookies); MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies); MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage); @@ -507,6 +535,19 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation toggleDomStorage.setChecked(domStorageEnabled); toggleSaveFormData.setChecked(saveFormDataEnabled); + // Set the status of the additional app bar icons. The default is `false`. + if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) { + toggleFirstPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + toggleThirdPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + toggleDomStorage.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + toggleSaveFormData.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + } else { //Do not display the additional icons. + toggleFirstPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + toggleThirdPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + toggleDomStorage.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + toggleSaveFormData.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + } + return true; } @@ -533,50 +574,57 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation WebViewDatabase mainWebViewDatabase = WebViewDatabase.getInstance(this); clearFormData.setEnabled(mainWebViewDatabase.hasFormData()); - // Select the current font size. + // Initialize font size variables. int fontSize = mainWebView.getSettings().getTextZoom(); - MenuItem fontSizeMenuItem = menu.findItem(R.id.fontSize); + String fontSizeTitle; MenuItem selectedFontSizeMenuItem; + + // Prepare the font size title and current size menu item. switch (fontSize) { case 50: - fontSizeMenuItem.setTitle(R.string.font_size_fifty_percent); + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.fifty_percent); selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeFiftyPercent); break; case 75: - fontSizeMenuItem.setTitle(R.string.font_size_seventy_five_percent); + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.seventy_five_percent); selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeSeventyFivePercent); break; case 100: - fontSizeMenuItem.setTitle(R.string.font_size_one_hundred_percent); + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_percent); selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredPercent); break; case 125: - fontSizeMenuItem.setTitle(R.string.font_size_one_hundred_twenty_five_percent); + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_twenty_five_percent); selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredTwentyFivePercent); break; case 150: - fontSizeMenuItem.setTitle(R.string.font_size_one_hundred_fifty_percent); + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_fifty_percent); selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredFiftyPercent); break; case 175: - fontSizeMenuItem.setTitle(R.string.font_size_one_hundred_seventy_five_percent); + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_seventy_five_percent); selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredSeventyFivePercent); break; case 200: - fontSizeMenuItem.setTitle(R.string.font_size_two_hundred_percent); + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.two_hundred_percent); selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeTwoHundredPercent); break; default: + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_percent); selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredPercent); break; } + + // Set the font size title and select the current size menu item. + MenuItem fontSizeMenuItem = menu.findItem(R.id.fontSize); + fontSizeMenuItem.setTitle(fontSizeTitle); selectedFontSizeMenuItem.setChecked(true); // Only show `Refresh` if `swipeToRefresh` is disabled. @@ -608,9 +656,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); // Update the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(privacyBrowserActivity); - // Display a Snackbar. + // Display a `Snackbar`. if (javaScriptEnabled) { Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_enabled, Snackbar.LENGTH_SHORT).show(); } else { @@ -636,7 +684,18 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation cookieManager.setAcceptCookie(firstPartyCookiesEnabled); // Update the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(privacyBrowserActivity); + + // Display a `Snackbar`. + if (firstPartyCookiesEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + if (javaScriptEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); + } + } // Reload the WebView. mainWebView.reload(); @@ -653,6 +712,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new cookie status. cookieManager.setAcceptThirdPartyCookies(mainWebView, thirdPartyCookiesEnabled); + // Display a `Snackbar`. + if (thirdPartyCookiesEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } + // Reload the WebView. mainWebView.reload(); } // Else do nothing because SDK < 21. @@ -668,6 +734,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new DOM Storage status. mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled); + // Display a `Snackbar`. + if (domStorageEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_disabled, Snackbar.LENGTH_SHORT).show(); + } + // Reload the WebView. mainWebView.reload(); return true; @@ -682,6 +755,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new form data status. mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); + // Display a `Snackbar`. + if (saveFormDataEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.form_data_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.form_data_disabled, Snackbar.LENGTH_SHORT).show(); + } + // Reload the WebView. mainWebView.reload(); return true; @@ -744,7 +824,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation return true; case R.id.addToHomescreen: - // Show the CreateHomeScreenShortcut AlertDialog and name this instance "@string/create_shortcut". + // Show the `CreateHomeScreenShortcut` `AlertDialog` and name this instance `@string/create_shortcut`. DialogFragment createHomeScreenShortcutDialogFragment = new CreateHomeScreenShortcut(); createHomeScreenShortcutDialogFragment.show(getFragmentManager(), getResources().getString(R.string.create_shortcut)); @@ -840,8 +920,15 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Clear the back/forward history. mainWebView.clearHistory(); + // Clear any SSL certificate preferences. + MainWebViewActivity.mainWebView.clearSslPreferences(); + + // Clear `formattedUrlString`. formattedUrlString = null; + // Clear `customHeaders`. + customHeaders.clear(); + // Destroy the internal state of the webview. mainWebView.destroy(); @@ -879,6 +966,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Reinitialize the adView variable, as the View will have been removed and re-added in the free flavor by BannerAd.reloadAfterRotate(). adView = findViewById(R.id.adView); + + // `invalidateOptionsMenu` should recalculate the number of action buttons from the menu to display on the app bar, but it doesn't because of the this bug: https://code.google.com/p/android/issues/detail?id=20493#c8 + invalidateOptionsMenu(); } @Override @@ -905,6 +995,22 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation sendBroadcast(placeBookmarkShortcut); } + public void viewSslCertificate(View view) { + // Show the `ViewSslCertificate` `AlertDialog` and name this instance `@string/view_ssl_certificate`. + DialogFragment viewSslCertificateDialogFragment = new ViewSslCertificate(); + viewSslCertificateDialogFragment.show(getFragmentManager(), getResources().getString(R.string.view_ssl_certificate)); + } + + @Override + public void onSslErrorCancel() { + sslErrorHandler.cancel(); + } + + @Override + public void onSslErrorProceed() { + sslErrorHandler.proceed(); + } + // Override onBackPressed to handle the navigation drawer and mainWebView. @Override public void onBackPressed() { @@ -990,15 +1096,70 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); } - private void updatePrivacyIcon() { + public static void updatePrivacyIcons(Activity activity) { + // Get handles for the icons. + MenuItem privacyIcon = mainMenu.findItem(R.id.toggleJavaScript); + MenuItem firstPartyCookiesIcon = mainMenu.findItem(R.id.toggleFirstPartyCookies); + MenuItem thirdPartyCookiesIcon = mainMenu.findItem(R.id.toggleThirdPartyCookies); + MenuItem domStorageIcon = mainMenu.findItem(R.id.toggleDomStorage); + MenuItem formDataIcon = mainMenu.findItem(R.id.toggleSaveFormData); + + // Update `privacyIcon`. if (javaScriptEnabled) { + // `JavaScript` is enabled. privacyIcon.setIcon(R.drawable.javascript_enabled); } else { if (firstPartyCookiesEnabled) { + // `JavaScript` is disabled but cookies are enabled. privacyIcon.setIcon(R.drawable.warning); } else { + // All the dangerous features are disabled. privacyIcon.setIcon(R.drawable.privacy_mode); } } + + // Update `firstPartyCookiesIcon`. + if (firstPartyCookiesEnabled) { + // First-party cookies are enabled. + firstPartyCookiesIcon.setIcon(R.drawable.cookies_warning); + } else { + // First-party cookies are disabled. + firstPartyCookiesIcon.setIcon(R.drawable.cookies_disabled); + } + + // Update `thirdPartyCookiesIcon`. + if (firstPartyCookiesEnabled) { + if (thirdPartyCookiesEnabled) { + // Third-party cookies are enabled. Bad! + thirdPartyCookiesIcon.setIcon(R.drawable.cookies_critical); + } else { + // Third-party cookies are disabled. + thirdPartyCookiesIcon.setIcon(R.drawable.cookies_disabled); + } + } else { + // First-party cookies are disabled, so third-party cookies are ghosted. + thirdPartyCookiesIcon.setIcon(R.drawable.cookies_ghosted); + } + + // Update `domStorageIcon`. + if (javaScriptEnabled) { + if (domStorageEnabled) { + domStorageIcon.setIcon(R.drawable.dom_storage_enabled); + } else { + domStorageIcon.setIcon(R.drawable.dom_storage_disabled); + } + } else { + domStorageIcon.setIcon(R.drawable.dom_storage_ghosted); + } + + // Update `formDataIcon`. + if (saveFormDataEnabled) { + formDataIcon.setIcon(R.drawable.form_data_enabled); + } else { + formDataIcon.setIcon(R.drawable.form_data_disabled); + } + + // `invalidateOptionsMenu` calls `onPrepareOptionsMenu()` and redraws the icons in the `AppBar`. + ActivityCompat.invalidateOptionsMenu(activity); } }