import android.annotation.SuppressLint;
import android.app.Activity;
+import android.app.DialogFragment;
import android.app.DownloadManager;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Configuration;
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.DialogFragment;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
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;
import android.util.Patterns;
import android.view.KeyEvent;
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;
import android.webkit.WebViewClient;
+import android.webkit.WebViewDatabase;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
+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 {
- // favoriteIcon is public static so it can be accessed from CreateHomeScreenShortcut.
+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;
- // mainWebView is public static so it can be accessed from AboutDialog and SettingsFragment. It is also used in onCreate(), onOptionsItemSelected(), onNavigationItemSelected(), and loadUrlFromTextBox().
+
+ // `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;
- // mainMenu is public static so it can be accessed from SettingsFragment. It is also used in onCreateOptionsMenu() and onOptionsItemSelected().
+ // `formattedUrlString` is public static so it can be accessed from `BookmarksActivity`.
+ // It is also used in `onCreate()`, `onOptionsItemSelected()`, `onCreateHomeScreenShortcutCreate()`, and `loadUrlFromTextBox()`.
+ public static String formattedUrlString;
+
+ // `mainMenu` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreateOptionsMenu()` and `onOptionsItemSelected()`.
public static Menu mainMenu;
- // cookieManager is public static so it can be accessed from SettingsFragment. It is also used in onCreate(), onOptionsItemSelected(), and onNavigationItemSelected().
+
+ // `cookieManager` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`, `onOptionsItemSelected()`, and `onNavigationItemSelected()`.
public static CookieManager cookieManager;
- // javaScriptEnabled is public static so it can be accessed from SettingsFragment. It is also used in onCreate(), onCreateOptionsMenu(), onOptionsItemSelected(), and loadUrlFromTextBox().
+
+ // `javaScriptEnabled` is public static so it can be accessed from `SettingsFragment`.
+ // It is also used in `onCreate()`, `onCreateOptionsMenu()`, `onOptionsItemSelected()`, and `loadUrlFromTextBox()`.
public static boolean javaScriptEnabled;
- // firstPartyCookiesEnabled is public static so it can be accessed from SettingsFragment. It is also used in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected().
+
+ // `firstPartyCookiesEnabled` is public static so it can be accessed from `SettingsFragment`.
+ // It is also used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`.
public static boolean firstPartyCookiesEnabled;
- // thirdPartyCookiesEnabled is uesd in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected().
+
+ // `thridPartyCookiesEnables` 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().
+
+ // `domStorageEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`.
public static boolean domStorageEnabled;
- // javaScriptDisabledSearchURL is public static so it can be accessed from SettingsFragment. It is also used in onCreate() and loadURLFromTextBox().
+
+ // `saveFormDataEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`.
+ public static boolean saveFormDataEnabled;
+
+ // `javaScriptDisabledSearchURL` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()` and `loadURLFromTextBox()`.
public static String javaScriptDisabledSearchURL;
- // javaScriptEnabledSearchURL is public static so it can be accessed from SettingsFragment. It is also used in onCreate() and loadURLFromTextBox().
+
+ // `javaScriptEnabledSearchURL` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()` and `loadURLFromTextBox()`.
public static String javaScriptEnabledSearchURL;
- // homepage is public static so it can be accessed from SettingsFragment. It is also used in onCreate() and onOptionsItemSelected().
+
+ // `homepage` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()` and `onOptionsItemSelected()`.
public static String homepage;
- // swipeToRefresh is public static so it can be accessed from SettingsFragment. It is also used in onCreate().
+
+ // `swipeToRefresh` is public static so it can be accessed from SettingsFragment. It is also used in onCreate().
public static SwipeRefreshLayout swipeToRefresh;
- // swipeToRefreshEnabled is public static so it can be accessed from SettingsFragment. It is also used in onCreate().
+
+ // `swipeToRefreshEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`.
public static boolean swipeToRefreshEnabled;
- // drawerToggle is used in onCreate(), onPostCreate(), onConfigurationChanged(), onNewIntent(), and onNavigationItemSelected().
+ // `customHeader` is public static so it can be accessed from `BookmarksActivity`. It is also used in `onCreate()` and `loadUrlFromTextBox()`.
+ public static Map<String, String> customHeaders = new HashMap<String, String>();
+
+
+
+ // `drawerToggle` is used in `onCreate()`, `onPostCreate()`, `onConfigurationChanged()`, `onNewIntent()`, and `onNavigationItemSelected()`.
private ActionBarDrawerToggle drawerToggle;
- // drawerLayout is used in onCreate(), onNewIntent(), and onBackPressed().
+
+ // `drawerLayout` is used in `onCreate()`, `onNewIntent()`, and `onBackPressed()`.
private DrawerLayout drawerLayout;
- // formattedUrlString is used in onCreate(), onOptionsItemSelected(), onCreateHomeScreenShortcutCreate(), and loadUrlFromTextBox().
- private String formattedUrlString;
- // privacyIcon is used in onCreateOptionsMenu() and updatePrivacyIcon().
- private MenuItem privacyIcon;
- // urlTextBox is used in onCreate(), onOptionsItemSelected(), and loadUrlFromTextBox().
+
+ // `urlTextBox` is used in `onCreate()`, `onOptionsItemSelected()`, and `loadUrlFromTextBox()`.
private EditText urlTextBox;
- // adView is used in onCreate() and onConfigurationChanged().
+
+ // `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")
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.coordinator_layout);
+ 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);
+ final ActionBar appBar = getSupportActionBar();
- final FrameLayout fullScreenVideoFrameLayout = (FrameLayout) findViewById(R.id.fullScreenVideoFrameLayout);
+ // This is needed to get rid of the Android Studio warning that appBar might be null.
+ assert 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);
+
+ // Set the "go" button on the keyboard to load the URL in urlTextBox.
+ urlTextBox = (EditText) appBar.getCustomView().findViewById(R.id.urlTextBox);
+ urlTextBox.setOnKeyListener(new View.OnKeyListener() {
+ public boolean onKey(View v, int keyCode, KeyEvent event) {
+ // If the event is a key-down event on the "enter" button, load the URL.
+ if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
+ // Load the URL into the mainWebView and consume the event.
+ try {
+ loadUrlFromTextBox();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ // If the enter key was pressed, consume the event.
+ return true;
+ } else {
+ // If any other key was pressed, do not consume the event.
+ return false;
+ }
+ }
+ });
- // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21.
- final ActionBar appBar = getSupportActionBar();
+ final FrameLayout fullScreenVideoFrameLayout = (FrameLayout) findViewById(R.id.fullScreenVideoFrameLayout);
// Implement swipe to refresh
swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout);
+ assert swipeToRefresh != null; //This assert removes the incorrect warning on the following line that swipeToRefresh might be null.
swipeToRefresh.setColorSchemeResources(R.color.blue);
swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
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);
-
- // Set the "go" button on the keyboard to load the URL in urlTextBox.
- urlTextBox = (EditText) appBar.getCustomView().findViewById(R.id.urlTextBox);
- urlTextBox.setOnKeyListener(new View.OnKeyListener() {
- public boolean onKey(View v, int keyCode, KeyEvent event) {
- // If the event is a key-down event on the "enter" button, load the URL.
- if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
- // Load the URL into the mainWebView and consume the event.
- try {
- loadUrlFromTextBox();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- // If the enter key was pressed, consume the event.
- return true;
- } else {
- // If any other key was pressed, do not consume the event.
- return false;
- }
- }
- });
- }
-
// Create the navigation drawer.
drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout);
// The DrawerTitle identifies the drawer in accessibility mode.
// Listen for touches on the navigation menu.
final NavigationView navigationView = (NavigationView) findViewById(R.id.navigationView);
+ assert navigationView != null; // This assert removes the incorrect warning on the following line that navigationView might be null.
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);
+ // 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.
+ // shouldOverrideUrlLoading makes this `WebView` the default handler for URLs inside the app, so that links are not kicked out to other apps.
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
- mainWebView.loadUrl(url);
- return true;
+ // Use an external email program if the link begins with "mailto:".
+ if (url.startsWith("mailto:")) {
+ // We use `ACTION_SENDTO` instead of `ACTION_SEND` so that only email programs are launched.
+ Intent emailIntent = new Intent(Intent.ACTION_SENDTO);
+
+ // Parse the url and set it as the data for the `Intent`.
+ emailIntent.setData(Uri.parse(url));
+
+ // `FLAG_ACTIVITY_NEW_TASK` opens the email program in a new task instead as part of Privacy Browser.
+ emailIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+ // Make it so.
+ startActivity(emailIntent);
+ return true;
+ } else { // Load the URL in Privacy Browser.
+ mainWebView.loadUrl(url, customHeaders);
+ return true;
+ }
}
// Update the URL in urlTextBox when the page starts to load.
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() {
// Update the progress bar when a page is loading.
@Override
public void onProgressChanged(WebView view, int progress) {
- // Make sure that appBar is not null.
- if (appBar != null) {
- ProgressBar progressBar = (ProgressBar) appBar.getCustomView().findViewById(R.id.progressBar);
- progressBar.setProgress(progress);
- if (progress < 100) {
- progressBar.setVisibility(View.VISIBLE);
- } else {
- progressBar.setVisibility(View.GONE);
+ ProgressBar progressBar = (ProgressBar) appBar.getCustomView().findViewById(R.id.progressBar);
+ progressBar.setProgress(progress);
+ if (progress < 100) {
+ progressBar.setVisibility(View.VISIBLE);
+ } else {
+ progressBar.setVisibility(View.GONE);
- //Stop the SwipeToRefresh indicator if it is running
- swipeToRefresh.setRefreshing(false);
- }
+ //Stop the SwipeToRefresh indicator if it is running
+ swipeToRefresh.setRefreshing(false);
}
}
// Save a copy of the favorite icon for use if a shortcut is added to the home screen.
favoriteIcon = icon;
- // Place the favorite icon in the appBar if it is not null.
- if (appBar != null) {
- ImageView imageViewFavoriteIcon = (ImageView) appBar.getCustomView().findViewById(R.id.favoriteIcon);
- imageViewFavoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true));
- }
+ // Place the favorite icon in the appBar.
+ ImageView imageViewFavoriteIcon = (ImageView) appBar.getCustomView().findViewById(R.id.favoriteIcon);
+ imageViewFavoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true));
}
// Enter full screen video
@Override
public void onShowCustomView(View view, CustomViewCallback callback) {
- if (appBar != null) {
- appBar.hide();
- }
+ appBar.hide();
// Show the fullScreenVideoFrameLayout.
+ assert fullScreenVideoFrameLayout != null; //This assert removes the incorrect warning on the following line that fullScreenVideoFrameLayout might be null.
fullScreenVideoFrameLayout.addView(view);
fullScreenVideoFrameLayout.setVisibility(View.VISIBLE);
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.
- view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-
- // Set the two flags that are supported by API >= 16.
- if (Build.VERSION.SDK_INT >= 16) {
- view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN);
- }
-
- // Set all three flags that are supported by API >= 19.
- if (Build.VERSION.SDK_INT >= 19) {
- view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
- }
+ * 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.
+ */
+ view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
}
// Exit full screen video
public void onHideCustomView() {
- if (appBar != null) {
- appBar.show();
- }
+ appBar.show();
// Show the mainWebView.
mainWebView.setVisibility(View.VISIBLE);
BannerAd.showAd(adView);
// Hide the fullScreenVideoFrameLayout.
+ assert fullScreenVideoFrameLayout != null; //This assert removes the incorrect warning on the following line that fullScreenVideoFrameLayout might be null.
fullScreenVideoFrameLayout.removeAllViews();
fullScreenVideoFrameLayout.setVisibility(View.GONE);
}
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 = 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.
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 homepage initial status. The default value is "https://www.duckduckgo.com".
- homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com");
+ // Set the homepage initial status. The default value is `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 = sharedPreferences.getString("default_font_size", "100");
+ mainWebView.getSettings().setTextZoom(Integer.valueOf(defaultFontSizeString));
- // Set swipe to refresh initial status. The default is true.
- swipeToRefreshEnabled = savedPreferences.getBoolean("swipe_to_refresh_enabled", true);
+ // Set the swipe to refresh initial status. The default is `true`.
+ swipeToRefreshEnabled = sharedPreferences.getBoolean("swipe_to_refresh_enabled", true);
swipeToRefresh.setEnabled(swipeToRefreshEnabled);
}
// Load the initial website.
- mainWebView.loadUrl(formattedUrlString);
+ mainWebView.loadUrl(formattedUrlString, customHeaders);
+
+ // If the favorite icon is null, load the default.
+ if (favoriteIcon == null) {
+ // We have to use `ContextCompat` until API >= 21.
+ Drawable favoriteIconDrawable = ContextCompat.getDrawable(getApplicationContext(), R.drawable.world);
+ BitmapDrawable favoriteIconBitmapDrawable = (BitmapDrawable) favoriteIconDrawable;
+ favoriteIcon = favoriteIconBitmapDrawable.getBitmap();
+ }
// Initialize AdView for the free flavor and request an ad. If this is not the free flavor BannerAd.requestAd() does nothing.
adView = findViewById(R.id.adView);
@Override
protected void onNewIntent(Intent intent) {
- // Sets the new intent as the activity intent, so that any future getIntent()s pick up this one instead of creating a new activity.
+ // Sets the new intent as the activity intent, so that any future `getIntent()`s pick up this one instead of creating a new activity.
setIntent(intent);
if (intent.getData() != null) {
}
// Load the website.
- mainWebView.loadUrl(formattedUrlString);
+ mainWebView.loadUrl(formattedUrlString, customHeaders);
// 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_options, menu);
+ getMenuInflater().inflate(R.menu.webview_options_menu, menu);
// 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.
+ 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);
- /* toggleSaveFormData does nothing until database storage is implemented.
MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData);
- */
-
- // Set the initial status of the privacy icon.
- updatePrivacyIcon();
// 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);
- */
+
+ // 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;
}
toggleThirdPartyCookies.setEnabled(false);
}
+ // Enable DOM Storage if JavaScript is enabled.
+ MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage);
+ toggleDomStorage.setEnabled(javaScriptEnabled);
+
// Enable Clear Cookies if there are any.
MenuItem clearCookies = menu.findItem(R.id.clearCookies);
clearCookies.setEnabled(cookieManager.hasCookies());
+ // Enable Clear Form Data is there is any.
+ MenuItem clearFormData = menu.findItem(R.id.clearFormData);
+ WebViewDatabase mainWebViewDatabase = WebViewDatabase.getInstance(this);
+ clearFormData.setEnabled(mainWebViewDatabase.hasFormData());
+
+ // Initialize font size variables.
+ int fontSize = mainWebView.getSettings().getTextZoom();
+ String fontSizeTitle;
+ MenuItem selectedFontSizeMenuItem;
+
+ // Prepare the font size title and current size menu item.
+ switch (fontSize) {
+ case 50:
+ fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.fifty_percent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeFiftyPercent);
+ break;
+
+ case 75:
+ fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.seventy_five_percent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeSeventyFivePercent);
+ break;
+
+ case 100:
+ fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_percent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredPercent);
+ break;
+
+ case 125:
+ 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:
+ fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_fifty_percent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredFiftyPercent);
+ break;
+
+ case 175:
+ 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:
+ 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.
+ MenuItem refreshMenuItem = menu.findItem(R.id.refresh);
+ refreshMenuItem.setVisible(!swipeToRefreshEnabled);
+
// Run all the other default commands.
super.onPrepareOptionsMenu(menu);
- // return true displays the menu.
+ // `return true` displays the menu.
return true;
}
public boolean onOptionsItemSelected(MenuItem menuItem) {
int menuItemId = menuItem.getItemId();
- // Some options need to update the drawable for toggleJavaScript.
- MenuItem toggleJavaScript = mainMenu.findItem(R.id.toggleJavaScript);
-
// Set the commands that relate to the menu entries.
switch (menuItemId) {
case R.id.toggleJavaScript:
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 {
- if (domStorageEnabled || firstPartyCookiesEnabled) {
+ if (firstPartyCookiesEnabled) {
Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_disabled, Snackbar.LENGTH_SHORT).show();
} else {
Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show();
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();
// 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.
// Apply the new DOM Storage status.
mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled);
- // Update the privacy icon.
- updatePrivacyIcon();
+ // 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;
+
+ case R.id.toggleSaveFormData:
+ // Switch the status of saveFormDataEnabled.
+ saveFormDataEnabled = !saveFormDataEnabled;
+
+ // Update the menu checkbox.
+ menuItem.setChecked(saveFormDataEnabled);
+
+ // 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();
Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_deleted, Snackbar.LENGTH_SHORT).show();
return true;
+ case R.id.clearFormData:
+ WebViewDatabase mainWebViewDatabase = WebViewDatabase.getInstance(this);
+ mainWebViewDatabase.clearFormData();
+ mainWebView.reload();
+ return true;
+
+ case R.id.fontSizeFiftyPercent:
+ mainWebView.getSettings().setTextZoom(50);
+ return true;
+
+ case R.id.fontSizeSeventyFivePercent:
+ mainWebView.getSettings().setTextZoom(75);
+ return true;
+
+ case R.id.fontSizeOneHundredPercent:
+ mainWebView.getSettings().setTextZoom(100);
+ return true;
+
+ case R.id.fontSizeOneHundredTwentyFivePercent:
+ mainWebView.getSettings().setTextZoom(125);
+ return true;
+
+ case R.id.fontSizeOneHundredFiftyPercent:
+ mainWebView.getSettings().setTextZoom(150);
+ return true;
+
+ case R.id.fontSizeOneHundredSeventyFivePercent:
+ mainWebView.getSettings().setTextZoom(175);
+ return true;
+
+ case R.id.fontSizeTwoHundredPercent:
+ mainWebView.getSettings().setTextZoom(200);
+ return true;
+
case R.id.share:
Intent shareIntent = new Intent();
shareIntent.setAction(Intent.ACTION_SEND);
return true;
case R.id.addToHomescreen:
- // Show the CreateHomeScreenShortcut AlertDialog and name this instance createShortcut.
- AppCompatDialogFragment shortcutDialog = new CreateHomeScreenShortcut();
- shortcutDialog.show(getSupportFragmentManager(), "createShortcut");
+ // Show the `CreateHomeScreenShortcut` `AlertDialog` and name this instance `@string/create_shortcut`.
+ DialogFragment createHomeScreenShortcutDialogFragment = new CreateHomeScreenShortcut();
+ createHomeScreenShortcutDialogFragment.show(getFragmentManager(), getResources().getString(R.string.create_shortcut));
//Everything else will be handled by CreateHomeScreenShortcut and the associated listeners below.
return true;
switch (menuItemId) {
case R.id.home:
- mainWebView.loadUrl(homepage);
+ mainWebView.loadUrl(homepage, customHeaders);
break;
case R.id.back:
}
break;
+ case R.id.bookmarks:
+ // Launch BookmarksActivity.
+ Intent bookmarksIntent = new Intent(this, BookmarksActivity.class);
+ startActivity(bookmarksIntent);
+ break;
+
case R.id.downloads:
// Launch the system Download Manager.
Intent downloadManagerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS);
break;
case R.id.settings:
- // Launch PreferenceFragment.
- Intent intent = new Intent(this, SettingsActivity.class);
- startActivity(intent);
+ // Launch `SettingsActivity`.
+ Intent settingsIntent = new Intent(this, SettingsActivity.class);
+ startActivity(settingsIntent);
+ break;
+
+ case R.id.guide:
+ // Launch `GuideActivity`.
+ Intent guideIntent = new Intent(this, GuideActivity.class);
+ startActivity(guideIntent);
break;
case R.id.about:
- // Show the AboutDialog AlertDialog and name this instance aboutDialog.
- AppCompatDialogFragment aboutDialog = new AboutDialog();
- aboutDialog.show(getSupportFragmentManager(), "aboutDialog");
+ // Launch `AboutActivity`.
+ Intent aboutIntent = new Intent(this, AboutActivity.class);
+ startActivity(aboutIntent);
break;
case R.id.clearAndExit:
- // Clear DOM storage.
- WebStorage domStorage = WebStorage.getInstance();
- domStorage.deleteAllData();
-
// Clear cookies. The commands changed slightly in API 21.
if (Build.VERSION.SDK_INT >= 21) {
cookieManager.removeAllCookies(null);
cookieManager.removeAllCookie();
}
+ // Clear DOM storage.
+ WebStorage domStorage = WebStorage.getInstance();
+ domStorage.deleteAllData();
+
+ // Clear form data.
+ WebViewDatabase formData = WebViewDatabase.getInstance(this);
+ formData.clearFormData();
+
+ // Clear cache. The argument of "true" includes disk files.
+ mainWebView.clearCache(true);
+
+ // Clear the back/forward history.
+ mainWebView.clearHistory();
+
+ // Clear any SSL certificate preferences.
+ MainWebViewActivity.mainWebView.clearSslPreferences();
+
+ // Clear `formattedUrlString`.
+ formattedUrlString = null;
+
// Destroy the internal state of the webview.
mainWebView.destroy();
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
- // Update the status of the drawerToggle icon.
- drawerToggle.onConfigurationChanged(newConfig);
-
// Reload the ad if this is the free flavor.
BannerAd.reloadAfterRotate(adView, getApplicationContext(), getString(R.string.ad_id));
- // Reinitialize the adView variable, as the View will have been removed and readded.
+ // 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
- public void onCreateHomeScreenShortcutCancel(DialogFragment dialog) {
+ public void onCancelCreateHomeScreenShortcut(DialogFragment dialogFragment) {
// Do nothing because the user selected "Cancel".
}
@Override
- public void onCreateHomeScreenShortcutCreate(DialogFragment dialog) {
+ public void onCreateHomeScreenShortcut(DialogFragment dialogFragment) {
// Get shortcutNameEditText from the alert dialog.
- EditText shortcutNameEditText = (EditText) dialog.getDialog().findViewById(R.id.shortcutNameEditText);
+ EditText shortcutNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.shortcut_name_edittext);
// Create the bookmark shortcut based on formattedUrlString.
Intent bookmarkShortcut = new Intent();
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() {
drawerLayout.closeDrawer(GravityCompat.START);
} else {
// Load the previous URL if available.
+ assert mainWebView != null; //This assert removes the incorrect warning in Android Studio on the following line that mainWebView might be null.
if (mainWebView.canGoBack()) {
mainWebView.goBack();
} else {
}
private void loadUrlFromTextBox() throws UnsupportedEncodingException {
- // Get the text from urlTextBox and convert it to a string.
- String unformattedUrlString = urlTextBox.getText().toString();
+ // Get the text from urlTextBox and convert it to a string. trim() removes white spaces from the beginning and end of the string.
+ String unformattedUrlString = urlTextBox.getText().toString().trim();
+
URL unformattedUrl = null;
Uri.Builder formattedUri = new Uri.Builder();
}
}
- mainWebView.loadUrl(formattedUrlString);
+ mainWebView.loadUrl(formattedUrlString, customHeaders);
// Hides the keyboard so we can see the webpage.
InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE);
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 (domStorageEnabled || firstPartyCookiesEnabled) {
+ 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);
}
}