// `webViewTitle` is public static so it can be accessed from `CreateBookmarkDialog` and `CreateHomeScreenShortcutDialog`. It is also used in `onCreate()`.
public static String webViewTitle;
+ // `displayWebpageImagesBoolean` is public static so it can be accessed from `DomainSettingsFragment`. It is also used in `applyAppSettings` and `applyDomainSettings()`.
+ public static boolean displayWebpageImagesBoolean;
+
// `navigatingHistory` is used in `onCreate()`, `onNavigationItemSelected()`, and `applyDomainSettings()`.
private boolean navigatingHistory;
// `rootCoordinatorLayout` is used in `onCreate()` and `applyAppSettings()`.
private CoordinatorLayout rootCoordinatorLayout;
- // 'mainWebView' is used in `onCreate()`, `onOptionsItemSelected()`, `onNavigationItemSelected()`, `onRestart()`, `onCreateContextMenu()`, `findPreviousOnPage()`, `findNextOnPage()`, `closeFindOnPage()`, and `loadUrlFromTextBox()`.
+ // `mainWebView` is used in `onCreate()`, `onPrepareOptionsMenu()`, `onOptionsItemSelected()`, `onNavigationItemSelected()`, `onRestart()`, `onCreateContextMenu()`, `findPreviousOnPage()`, `findNextOnPage()`, `closeFindOnPage()`, `loadUrlFromTextBox()`
+ // and `setDisplayWebpageImages()`.
private WebView mainWebView;
// `fullScreenVideoFrameLayout` is used in `onCreate()` and `onConfigurationChanged()`.
// `translucentNavigationBarOnFullscreen` is used in `onCreate()` and `applyAppSettings()`.
private boolean translucentNavigationBarOnFullscreen;
- // `currentDomainName` is used in `onCreate(), `onNavigationItemSelected()`, and `applyDomainSettings()`.
+ // `currentDomainName` is used in `onCreate()`, `onNavigationItemSelected()`, and `applyDomainSettings()`.
private String currentDomainName;
// `waitingForOrbot` is used in `onCreate()` and `applyAppSettings()`.
private boolean waitingForOrbot;
+ // `domainSettingsApplied` is used in `applyDomainSettings()` and `setDisplayWebpageImages()`.
+ private boolean domainSettingsApplied;
+
+ // `displayWebpageImagesInt` is used in `applyDomainSettings()` and `setDisplayWebpageImages()`.
+ private int displayWebpageImagesInt;
+
+ // `onTheFlyDisplayImagesSet` is used in `applyDomainSettings()` and `setDisplayWebpageImages()`.
+ private boolean onTheFlyDisplayImagesSet;
+
// `waitingForOrbotData` is used in `onCreate()` and `applyAppSettings()`.
private String waitingForOrbotHTMLString;
}
}
+ @Override
+ public void onRestart() {
+ super.onRestart();
+
+ // Apply the app settings, which may have been changed in `SettingsActivity`.
+ applyAppSettings();
+
+ // Update the privacy icon. `true` runs `invalidateOptionsMenu` as the last step.
+ updatePrivacyIcons(true);
+
+ // Set the display webpage images mode.
+ setDisplayWebpageImages();
+
+ // Reload the webpage to remove images if `setDisplayWebpageImages` has turned them off.
+ mainWebView.reload();
+ }
+
+ // `onResume()` runs after `onStart()`, which runs after `onCreate()` and `onRestart()`.
+ @Override
+ public void onResume() {
+ super.onResume();
+
+ // Resume JavaScript (if enabled).
+ mainWebView.resumeTimers();
+
+ // Resume `mainWebView`.
+ mainWebView.onResume();
+
+ // Resume the adView for the free flavor.
+ if (BuildConfig.FLAVOR.contentEquals("free")) {
+ BannerAd.resumeAd(adView);
+ }
+ }
+
+ @Override
+ public void onPause() {
+ // Pause `mainWebView`.
+ mainWebView.onPause();
+
+ // Stop all JavaScript.
+ mainWebView.pauseTimers();
+
+ // Pause the adView or it will continue to consume resources in the background on the free flavor.
+ if (BuildConfig.FLAVOR.contentEquals("free")) {
+ BannerAd.pauseAd(adView);
+ }
+
+ super.onPause();
+ }
@Override
protected void onNewIntent(Intent intent) {
updatePrivacyIcons(false);
// 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);
- MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData);
+ MenuItem toggleFirstPartyCookiesMenuItem = menu.findItem(R.id.toggle_first_party_cookies);
+ MenuItem toggleThirdPartyCookiesMenuItem = menu.findItem(R.id.toggle_third_party_cookies);
+ MenuItem toggleDomStorageMenuItem = menu.findItem(R.id.toggle_dom_storage);
+ MenuItem toggleSaveFormDataMenuItem = menu.findItem(R.id.toggle_save_form_data);
// Only display third-party cookies if SDK >= 21
- toggleThirdPartyCookies.setVisible(Build.VERSION.SDK_INT >= 21);
+ toggleThirdPartyCookiesMenuItem.setVisible(Build.VERSION.SDK_INT >= 21);
// Get the shared preference values. `this` references the current context.
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
// 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);
- toggleDomStorage.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
- toggleSaveFormData.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+ toggleFirstPartyCookiesMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+ toggleDomStorageMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+ toggleSaveFormDataMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
} else { //Do not display the additional icons.
- toggleFirstPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- toggleDomStorage.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- toggleSaveFormData.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ toggleFirstPartyCookiesMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ toggleDomStorageMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ toggleSaveFormDataMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
}
return true;
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
// 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);
- MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData);
- MenuItem clearCookies = menu.findItem(R.id.clearCookies);
- MenuItem clearFormData = menu.findItem(R.id.clearFormData);
+ MenuItem toggleFirstPartyCookiesMenuItem = menu.findItem(R.id.toggle_first_party_cookies);
+ MenuItem toggleThirdPartyCookiesMenuItem = menu.findItem(R.id.toggle_third_party_cookies);
+ MenuItem toggleDomStorageMenuItem = menu.findItem(R.id.toggle_dom_storage);
+ MenuItem toggleSaveFormDataMenuItem = menu.findItem(R.id.toggle_save_form_data);
+ MenuItem clearCookiesMenuItem = menu.findItem(R.id.clear_cookies);
+ MenuItem clearFormDataMenuItem = menu.findItem(R.id.clear_form_data);
+ MenuItem fontSizeMenuItem = menu.findItem(R.id.font_size);
+ MenuItem displayImagesMenuItem = menu.findItem(R.id.display_images);
MenuItem refreshMenuItem = menu.findItem(R.id.refresh);
// Set the status of the menu item checkboxes.
- toggleFirstPartyCookies.setChecked(firstPartyCookiesEnabled);
- toggleThirdPartyCookies.setChecked(thirdPartyCookiesEnabled);
- toggleDomStorage.setChecked(domStorageEnabled);
- toggleSaveFormData.setChecked(saveFormDataEnabled);
+ toggleFirstPartyCookiesMenuItem.setChecked(firstPartyCookiesEnabled);
+ toggleThirdPartyCookiesMenuItem.setChecked(thirdPartyCookiesEnabled);
+ toggleDomStorageMenuItem.setChecked(domStorageEnabled);
+ toggleSaveFormDataMenuItem.setChecked(saveFormDataEnabled);
+ displayImagesMenuItem.setChecked(mainWebView.getSettings().getLoadsImagesAutomatically());
// Enable third-party cookies if first-party cookies are enabled.
- toggleThirdPartyCookies.setEnabled(firstPartyCookiesEnabled);
+ toggleThirdPartyCookiesMenuItem.setEnabled(firstPartyCookiesEnabled);
// Enable DOM Storage if JavaScript is enabled.
- toggleDomStorage.setEnabled(javaScriptEnabled);
+ toggleDomStorageMenuItem.setEnabled(javaScriptEnabled);
// Enable Clear Cookies if there are any.
- clearCookies.setEnabled(cookieManager.hasCookies());
+ clearCookiesMenuItem.setEnabled(cookieManager.hasCookies());
// Enable Clear Form Data is there is any.
WebViewDatabase mainWebViewDatabase = WebViewDatabase.getInstance(this);
- clearFormData.setEnabled(mainWebViewDatabase.hasFormData());
-
- // Only show `Refresh` if `swipeToRefresh` is disabled.
- refreshMenuItem.setVisible(!swipeToRefreshEnabled);
+ clearFormDataMenuItem.setEnabled(mainWebViewDatabase.hasFormData());
// Initialize font size variables.
int fontSize = mainWebView.getSettings().getTextZoom();
switch (fontSize) {
case 25:
fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.twenty_five_percent);
- selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeTwentyFivePercent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.font_size_twenty_five_percent);
break;
case 50:
fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.fifty_percent);
- selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeFiftyPercent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.font_size_fifty_percent);
break;
case 75:
fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.seventy_five_percent);
- selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeSeventyFivePercent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.font_size_seventy_five_percent);
break;
case 100:
fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_percent);
- selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredPercent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.font_size_one_hundred_percent);
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);
+ selectedFontSizeMenuItem = menu.findItem(R.id.font_size_one_hundred_twenty_five_percent);
break;
case 150:
fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_fifty_percent);
- selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredFiftyPercent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.font_size_one_hundred_fifty_percent);
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);
+ selectedFontSizeMenuItem = menu.findItem(R.id.font_size_one_hundred_seventy_five_percent);
break;
case 200:
fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.two_hundred_percent);
- selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeTwoHundredPercent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.font_size_two_hundred_percent);
break;
default:
fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_percent);
- selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredPercent);
+ selectedFontSizeMenuItem = menu.findItem(R.id.font_size_one_hundred_percent);
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.
+ refreshMenuItem.setVisible(!swipeToRefreshEnabled);
+
// Run all the other default commands.
super.onPrepareOptionsMenu(menu);
// Set the commands that relate to the menu entries.
switch (menuItemId) {
- case R.id.toggleJavaScript:
+ case R.id.toggle_javascript:
// Switch the status of javaScriptEnabled.
javaScriptEnabled = !javaScriptEnabled;
mainWebView.reload();
return true;
- case R.id.toggleFirstPartyCookies:
+ case R.id.toggle_first_party_cookies:
// Switch the status of firstPartyCookiesEnabled.
firstPartyCookiesEnabled = !firstPartyCookiesEnabled;
mainWebView.reload();
return true;
- case R.id.toggleThirdPartyCookies:
+ case R.id.toggle_third_party_cookies:
if (Build.VERSION.SDK_INT >= 21) {
// Switch the status of thirdPartyCookiesEnabled.
thirdPartyCookiesEnabled = !thirdPartyCookiesEnabled;
} // Else do nothing because SDK < 21.
return true;
- case R.id.toggleDomStorage:
+ case R.id.toggle_dom_storage:
// Switch the status of domStorageEnabled.
domStorageEnabled = !domStorageEnabled;
mainWebView.reload();
return true;
- case R.id.toggleSaveFormData:
+ case R.id.toggle_save_form_data:
// Switch the status of saveFormDataEnabled.
saveFormDataEnabled = !saveFormDataEnabled;
mainWebView.reload();
return true;
- case R.id.clearCookies:
+ case R.id.clear_cookies:
if (Build.VERSION.SDK_INT < 21) {
cookieManager.removeAllCookie();
} else {
Snackbar.make(findViewById(R.id.main_webview), R.string.cookies_deleted, Snackbar.LENGTH_SHORT).show();
return true;
- case R.id.clearDomStorage:
+ case R.id.clear_dom_storage:
WebStorage webStorage = WebStorage.getInstance();
webStorage.deleteAllData();
Snackbar.make(findViewById(R.id.main_webview), R.string.dom_storage_deleted, Snackbar.LENGTH_SHORT).show();
return true;
- case R.id.clearFormData:
+ case R.id.clear_form_data:
WebViewDatabase mainWebViewDatabase = WebViewDatabase.getInstance(this);
mainWebViewDatabase.clearFormData();
Snackbar.make(findViewById(R.id.main_webview), R.string.form_data_deleted, Snackbar.LENGTH_SHORT).show();
return true;
- case R.id.fontSizeTwentyFivePercent:
+ case R.id.font_size_twenty_five_percent:
mainWebView.getSettings().setTextZoom(25);
return true;
- case R.id.fontSizeFiftyPercent:
+ case R.id.font_size_fifty_percent:
mainWebView.getSettings().setTextZoom(50);
return true;
- case R.id.fontSizeSeventyFivePercent:
+ case R.id.font_size_seventy_five_percent:
mainWebView.getSettings().setTextZoom(75);
return true;
- case R.id.fontSizeOneHundredPercent:
+ case R.id.font_size_one_hundred_percent:
mainWebView.getSettings().setTextZoom(100);
return true;
- case R.id.fontSizeOneHundredTwentyFivePercent:
+ case R.id.font_size_one_hundred_twenty_five_percent:
mainWebView.getSettings().setTextZoom(125);
return true;
- case R.id.fontSizeOneHundredFiftyPercent:
+ case R.id.font_size_one_hundred_fifty_percent:
mainWebView.getSettings().setTextZoom(150);
return true;
- case R.id.fontSizeOneHundredSeventyFivePercent:
+ case R.id.font_size_one_hundred_seventy_five_percent:
mainWebView.getSettings().setTextZoom(175);
return true;
- case R.id.fontSizeTwoHundredPercent:
+ case R.id.font_size_two_hundred_percent:
mainWebView.getSettings().setTextZoom(200);
return true;
+ case R.id.display_images:
+ if (mainWebView.getSettings().getLoadsImagesAutomatically()) { // Images are currently loaded automatically.
+ mainWebView.getSettings().setLoadsImagesAutomatically(false);
+ mainWebView.reload();
+ } else { // Images are not currently loaded automatically.
+ mainWebView.getSettings().setLoadsImagesAutomatically(true);
+ }
+
+ // Set `onTheFlyDisplayImagesSet`.
+ onTheFlyDisplayImagesSet = true;
+ return true;
+
case R.id.share:
// Setup the share string.
String shareString;
printManager.print(getResources().getString(R.string.privacy_browser_web_page), printDocumentAdapter, null);
return true;
- case R.id.addToHomescreen:
+ case R.id.add_to_homescreen:
// Show the `CreateHomeScreenShortcutDialog` `AlertDialog` and name this instance `R.string.create_shortcut`.
AppCompatDialogFragment createHomeScreenShortcutDialogFragment = new CreateHomeScreenShortcutDialog();
createHomeScreenShortcutDialogFragment.show(getSupportFragmentManager(), getResources().getString(R.string.create_shortcut));
}
}
- @Override
- public void onPause() {
- // Pause `mainWebView`.
- mainWebView.onPause();
-
- // Stop all JavaScript.
- mainWebView.pauseTimers();
-
- // Pause the adView or it will continue to consume resources in the background on the free flavor.
- if (BuildConfig.FLAVOR.contentEquals("free")) {
- BannerAd.pauseAd(adView);
- }
-
- super.onPause();
- }
-
- @Override
- public void onResume() { // `onResume()` also runs every time the app starts after `onCreate()` and `onStart()`.
- super.onResume();
-
- // Resume JavaScript (if enabled).
- mainWebView.resumeTimers();
-
- // Resume `mainWebView`.
- mainWebView.onResume();
-
- // Resume the adView for the free flavor.
- if (BuildConfig.FLAVOR.contentEquals("free")) {
- BannerAd.resumeAd(adView);
- }
- }
-
- @Override
- public void onRestart() {
- super.onRestart();
-
- // Apply the settings from shared preferences, which might have been changed in `SettingsActivity`.
- applyAppSettings();
-
- // Update the privacy icon. `true` runs `invalidateOptionsMenu` as the last step.
- updatePrivacyIcons(true);
-
- }
-
private void loadUrlFromTextBox() throws UnsupportedEncodingException {
// 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();
mainWebView.loadUrl(url, customHeaders);
}
+ public void findPreviousOnPage(View view) {
+ // Go to the previous highlighted phrase on the page. `false` goes backwards instead of forwards.
+ mainWebView.findNext(false);
+ }
+
+ public void findNextOnPage(View view) {
+ // Go to the next highlighted phrase on the page. `true` goes forwards instead of backwards.
+ mainWebView.findNext(true);
+ }
+
+ public void closeFindOnPage(View view) {
+ // Delete the contents of `find_on_page_edittext`.
+ findOnPageEditText.setText(null);
+
+ // Clear the highlighted phrases.
+ mainWebView.clearMatches();
+
+ // Hide the Find on Page `RelativeLayout`.
+ findOnPageLinearLayout.setVisibility(View.GONE);
+
+ // Show the URL app bar.
+ supportAppBar.setVisibility(View.VISIBLE);
+
+ // Hide the keyboard so we can see the webpage. `0` indicates no additional flags.
+ inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0);
+ }
+
+ private void applyAppSettings() {
+ // Get the shared preference values. `this` references the current context.
+ SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ // Store the values from `sharedPreferences` in variables.
+ String homepageString = sharedPreferences.getString("homepage", "https://duckduckgo.com");
+ String torHomepageString = sharedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion");
+ String torSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
+ String torSearchCustomURLString = sharedPreferences.getString("tor_search_custom_url", "");
+ String searchString = sharedPreferences.getString("search", "https://duckduckgo.com/html/?q=");
+ String searchCustomURLString = sharedPreferences.getString("search_custom_url", "");
+ adBlockerEnabled = sharedPreferences.getBoolean("block_ads", true);
+ incognitoModeEnabled = sharedPreferences.getBoolean("incognito_mode", false);
+ boolean doNotTrackEnabled = sharedPreferences.getBoolean("do_not_track", false);
+ boolean proxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false);
+ fullScreenBrowsingModeEnabled = sharedPreferences.getBoolean("full_screen_browsing_mode", false);
+ hideSystemBarsOnFullscreen = sharedPreferences.getBoolean("hide_system_bars", false);
+ translucentNavigationBarOnFullscreen = sharedPreferences.getBoolean("translucent_navigation_bar", true);
+ swipeToRefreshEnabled = sharedPreferences.getBoolean("swipe_to_refresh", false);
+ displayWebpageImagesBoolean = sharedPreferences.getBoolean("display_webpage_images", true);
+
+ // Set the homepage, search, and proxy options.
+ if (proxyThroughOrbot) { // Set the Tor options.
+ // Set `torHomepageString` as `homepage`.
+ homepage = torHomepageString;
+
+ // If formattedUrlString is null assign the homepage to it.
+ if (formattedUrlString == null) {
+ formattedUrlString = homepage;
+ }
+
+ // Set the search URL.
+ if (torSearchString.equals("Custom URL")) { // Get the custom URL string.
+ searchURL = torSearchCustomURLString;
+ } else { // Use the string from the pre-built list.
+ searchURL = torSearchString;
+ }
+
+ // Set the proxy. `this` refers to the current activity where an `AlertDialog` might be displayed.
+ OrbotProxyHelper.setProxy(getApplicationContext(), this, "localhost", "8118");
+
+ // Display a message to the user if we are waiting on Orbot.
+ if (!orbotStatus.equals("ON")) {
+ // Set `waitingForOrbot`.
+ waitingForOrbot = true;
+
+ // Load a waiting page. `null` specifies no encoding, which defaults to ASCII.
+ mainWebView.loadData(waitingForOrbotHTMLString, "text/html", null);
+ }
+ } else { // Set the non-Tor options.
+ // Set `homepageString` as `homepage`.
+ homepage = homepageString;
+
+ // If formattedUrlString is null assign the homepage to it.
+ if (formattedUrlString == null) {
+ formattedUrlString = homepage;
+ }
+
+ // Set the search URL.
+ if (searchString.equals("Custom URL")) { // Get the custom URL string.
+ searchURL = searchCustomURLString;
+ } else { // Use the string from the pre-built list.
+ searchURL = searchString;
+ }
+
+ // Reset the proxy to default. The host is `""` and the port is `"0"`.
+ OrbotProxyHelper.setProxy(getApplicationContext(), this, "", "0");
+
+ // Reset `waitingForOrbot.
+ waitingForOrbot = false;
+ }
+
+ // Set swipe to refresh.
+ swipeRefreshLayout.setEnabled(swipeToRefreshEnabled);
+
+ // Set Do Not Track status.
+ if (doNotTrackEnabled) {
+ customHeaders.put("DNT", "1");
+ } else {
+ customHeaders.remove("DNT");
+ }
+
+ // Apply the appropriate full screen mode the `SYSTEM_UI` flags.
+ if (fullScreenBrowsingModeEnabled && inFullScreenBrowsingMode) {
+ if (hideSystemBarsOnFullscreen) { // Hide everything.
+ // Remove the translucent navigation setting if it is currently flagged.
+ getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+
+ // Remove the translucent status bar overlay.
+ getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+
+ // Remove the translucent status bar overlay on the `Drawer Layout`, which is special and needs its own command.
+ drawerLayout.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+
+ /* SYSTEM_UI_FLAG_FULLSCREEN hides the status bar at the top of the screen.
+ * SYSTEM_UI_FLAG_HIDE_NAVIGATION hides the navigation bar on the bottom or right of the screen.
+ * SYSTEM_UI_FLAG_IMMERSIVE_STICKY makes the status and navigation bars translucent and automatically rehides them after they are shown.
+ */
+ rootCoordinatorLayout.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+ } else { // Hide everything except the status and navigation bars.
+ // Add the translucent status flag if it is unset.
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+
+ if (translucentNavigationBarOnFullscreen) {
+ // Set the navigation bar to be translucent.
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+ } else {
+ // Set the navigation bar to be black.
+ getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+ }
+ }
+ } else { // Switch to normal viewing mode.
+ // Reset `inFullScreenBrowsingMode` to `false`.
+ inFullScreenBrowsingMode = false;
+
+ // Show the `appBar` if `findOnPageLinearLayout` is not visible.
+ if (findOnPageLinearLayout.getVisibility() == View.GONE) {
+ appBar.show();
+ }
+
+ // Show the `BannerAd` in the free flavor.
+ if (BuildConfig.FLAVOR.contentEquals("free")) {
+ // Reload the ad. Because the screen may have rotated, we need to use `reloadAfterRotate`.
+ BannerAd.reloadAfterRotate(adView, getApplicationContext(), getString(R.string.ad_id));
+
+ // Reinitialize the `adView` variable, as the `View` will have been removed and re-added by `BannerAd.reloadAfterRotate()`.
+ adView = findViewById(R.id.adview);
+ }
+
+ // Remove the translucent navigation bar flag if it is set.
+ getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+
+ // Add the translucent status flag if it is unset. This also resets `drawerLayout's` `View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN`.
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+
+ // Remove any `SYSTEM_UI` flags from `rootCoordinatorLayout`.
+ rootCoordinatorLayout.setSystemUiVisibility(0);
+
+ // Constrain `rootCoordinatorLayout` inside the status and navigation bars.
+ rootCoordinatorLayout.setFitsSystemWindows(true);
+ }
+ }
+
// We have to use the deprecated `.getDrawable()` until the minimum API >= 21.
@SuppressWarnings("deprecation")
private void applyDomainSettings(String url) {
// Close `domainNameCursor.
domainNameCursor.close();
- // Initialize variables to track if this domain has stored domain settings, and if so, under which name.
- boolean hostHasDomainSettings = false;
+ // Initialize variables to track if domain settings will be applied and, if so, under which name.
+ domainSettingsApplied = false;
String domainNameInDatabase = null;
// Check the hostname.
if (domainSettingsSet.contains(hostName)) {
- hostHasDomainSettings = true;
+ domainSettingsApplied = true;
domainNameInDatabase = hostName;
}
// If `hostName` is not `null`, check all the subdomains of `hostName` against wildcard domains in `domainCursor`.
if (hostName != null) {
- while (hostName.contains(".") && !hostHasDomainSettings) { // Stop checking if we run out of `.` or if we already know that `hostHasDomainSettings` is `true`.
+ while (hostName.contains(".") && !domainSettingsApplied) { // Stop checking if we run out of `.` or if we already know that `domainSettingsApplied` is `true`.
if (domainSettingsSet.contains("*." + hostName)) { // Check the host name prepended by `*.`.
- hostHasDomainSettings = true;
+ domainSettingsApplied = true;
domainNameInDatabase = "*." + hostName;
}
}
}
- if (hostHasDomainSettings) { // The url we are loading has custom domain settings.
+ // Get a handle for the shared preference. `this` references the current context.
+ SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ if (domainSettingsApplied) { // The url we are loading has custom domain settings.
// Get a cursor for the current host and move it to the first position.
Cursor currentHostDomainSettingsCursor = domainsDatabaseHelper.getCursorForDomainName(domainNameInDatabase);
currentHostDomainSettingsCursor.moveToFirst();
thirdPartyCookiesEnabled = (currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.ENABLE_THIRD_PARTY_COOKIES)) == 1);
domStorageEnabled = (currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.ENABLE_DOM_STORAGE)) == 1);
saveFormDataEnabled = (currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.ENABLE_FORM_DATA)) == 1);
- String userAgentString = (currentHostDomainSettingsCursor.getString(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.USER_AGENT)));
- int fontSize = (currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.FONT_SIZE)));
+ String userAgentString = currentHostDomainSettingsCursor.getString(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.USER_AGENT));
+ int fontSize = currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.FONT_SIZE));
+ displayWebpageImagesInt = currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.DISPLAY_IMAGES));
// Close `currentHostDomainSettingsCursor`.
currentHostDomainSettingsCursor.close();
// Set a green background on `urlTextBox` to indicate that custom domain settings are being used. We have to use the deprecated `.getDrawable()` until the minimum API >= 21.
urlAppBarRelativeLayout.setBackground(getResources().getDrawable(R.drawable.url_bar_background_green));
} else { // The URL we are loading does not have custom domain settings. Load the defaults.
- // Get the shared preference values. `this` references the current context.
- SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-
// Store the values from `sharedPreferences` in variables.
javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false);
firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies_enabled", false);
// Close `domainsDatabaseHelper`.
domainsDatabaseHelper.close();
+ // Remove the `onTheFlyDisplayImagesSet` flag and set the display webpage images mode. `true` indicates that custom domain settings are applied.
+ onTheFlyDisplayImagesSet = false;
+ setDisplayWebpageImages();
+
// Update the privacy icons, but only if `mainMenu` has already been populated.
if (mainMenu != null) {
updatePrivacyIcons(true);
}
}
- public void findPreviousOnPage(View view) {
- // Go to the previous highlighted phrase on the page. `false` goes backwards instead of forwards.
- mainWebView.findNext(false);
- }
-
- public void findNextOnPage(View view) {
- // Go to the next highlighted phrase on the page. `true` goes forwards instead of backwards.
- mainWebView.findNext(true);
- }
-
- public void closeFindOnPage(View view) {
- // Delete the contents of `find_on_page_edittext`.
- findOnPageEditText.setText(null);
-
- // Clear the highlighted phrases.
- mainWebView.clearMatches();
-
- // Hide the Find on Page `RelativeLayout`.
- findOnPageLinearLayout.setVisibility(View.GONE);
-
- // Show the URL app bar.
- supportAppBar.setVisibility(View.VISIBLE);
-
- // Hide the keyboard so we can see the webpage. `0` indicates no additional flags.
- inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0);
- }
-
- private void applyAppSettings() {
- // Get the shared preference values. `this` references the current context.
- SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-
- // Store the values from `sharedPreferences` in variables.
- String homepageString = sharedPreferences.getString("homepage", "https://duckduckgo.com");
- String torHomepageString = sharedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion");
- String torSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
- String torSearchCustomURLString = sharedPreferences.getString("tor_search_custom_url", "");
- String searchString = sharedPreferences.getString("search", "https://duckduckgo.com/html/?q=");
- String searchCustomURLString = sharedPreferences.getString("search_custom_url", "");
- adBlockerEnabled = sharedPreferences.getBoolean("block_ads", true);
- incognitoModeEnabled = sharedPreferences.getBoolean("incognito_mode", false);
- boolean doNotTrackEnabled = sharedPreferences.getBoolean("do_not_track", false);
- boolean proxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false);
- fullScreenBrowsingModeEnabled = sharedPreferences.getBoolean("full_screen_browsing_mode", false);
- hideSystemBarsOnFullscreen = sharedPreferences.getBoolean("hide_system_bars", false);
- translucentNavigationBarOnFullscreen = sharedPreferences.getBoolean("translucent_navigation_bar", true);
- swipeToRefreshEnabled = sharedPreferences.getBoolean("swipe_to_refresh", false);
-
- // Set the homepage, search, and proxy options.
- if (proxyThroughOrbot) { // Set the Tor options.
- // Set `torHomepageString` as `homepage`.
- homepage = torHomepageString;
-
- // If formattedUrlString is null assign the homepage to it.
- if (formattedUrlString == null) {
- formattedUrlString = homepage;
- }
-
- // Set the search URL.
- if (torSearchString.equals("Custom URL")) { // Get the custom URL string.
- searchURL = torSearchCustomURLString;
- } else { // Use the string from the pre-built list.
- searchURL = torSearchString;
- }
-
- // Set the proxy. `this` refers to the current activity where an `AlertDialog` might be displayed.
- OrbotProxyHelper.setProxy(getApplicationContext(), this, "localhost", "8118");
-
- // Display a message to the user if we are waiting on Orbot.
- if (!orbotStatus.equals("ON")) {
- // Set `waitingForOrbot`.
- waitingForOrbot = true;
-
- // Load a waiting page. `null` specifies no encoding, which defaults to ASCII.
- mainWebView.loadData(waitingForOrbotHTMLString, "text/html", null);
- }
- } else { // Set the non-Tor options.
- // Set `homepageString` as `homepage`.
- homepage = homepageString;
-
- // If formattedUrlString is null assign the homepage to it.
- if (formattedUrlString == null) {
- formattedUrlString = homepage;
- }
-
- // Set the search URL.
- if (searchString.equals("Custom URL")) { // Get the custom URL string.
- searchURL = searchCustomURLString;
- } else { // Use the string from the pre-built list.
- searchURL = searchString;
- }
-
- // Reset the proxy to default. The host is `""` and the port is `"0"`.
- OrbotProxyHelper.setProxy(getApplicationContext(), this, "", "0");
-
- // Reset `waitingForOrbot.
- waitingForOrbot = false;
- }
-
- // Set swipe to refresh.
- swipeRefreshLayout.setEnabled(swipeToRefreshEnabled);
-
- // Set Do Not Track status.
- if (doNotTrackEnabled) {
- customHeaders.put("DNT", "1");
- } else {
- customHeaders.remove("DNT");
- }
-
- // Apply the appropriate full screen mode the `SYSTEM_UI` flags.
- if (fullScreenBrowsingModeEnabled && inFullScreenBrowsingMode) {
- if (hideSystemBarsOnFullscreen) { // Hide everything.
- // Remove the translucent navigation setting if it is currently flagged.
- getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-
- // Remove the translucent status bar overlay.
- getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-
- // Remove the translucent status bar overlay on the `Drawer Layout`, which is special and needs its own command.
- drawerLayout.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+ private void setDisplayWebpageImages() {
+ if (!onTheFlyDisplayImagesSet) {
+ if (domainSettingsApplied) { // Custom domain settings are applied.
+ switch (displayWebpageImagesInt) {
+ case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_SYSTEM_DEFAULT:
+ mainWebView.getSettings().setLoadsImagesAutomatically(displayWebpageImagesBoolean);
+ break;
- /* SYSTEM_UI_FLAG_FULLSCREEN hides the status bar at the top of the screen.
- * SYSTEM_UI_FLAG_HIDE_NAVIGATION hides the navigation bar on the bottom or right of the screen.
- * SYSTEM_UI_FLAG_IMMERSIVE_STICKY makes the status and navigation bars translucent and automatically rehides them after they are shown.
- */
- rootCoordinatorLayout.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
- } else { // Hide everything except the status and navigation bars.
- // Add the translucent status flag if it is unset.
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+ case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_ENABLED:
+ mainWebView.getSettings().setLoadsImagesAutomatically(true);
+ break;
- if (translucentNavigationBarOnFullscreen) {
- // Set the navigation bar to be translucent.
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
- } else {
- // Set the navigation bar to be black.
- getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+ case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_DISABLED:
+ mainWebView.getSettings().setLoadsImagesAutomatically(false);
+ break;
}
+ } else { // Default settings are applied.
+ mainWebView.getSettings().setLoadsImagesAutomatically(displayWebpageImagesBoolean);
}
- } else { // Switch to normal viewing mode.
- // Reset `inFullScreenBrowsingMode` to `false`.
- inFullScreenBrowsingMode = false;
-
- // Show the `appBar` if `findOnPageLinearLayout` is not visible.
- if (findOnPageLinearLayout.getVisibility() == View.GONE) {
- appBar.show();
- }
-
- // Show the `BannerAd` in the free flavor.
- if (BuildConfig.FLAVOR.contentEquals("free")) {
- // Reload the ad. Because the screen may have rotated, we need to use `reloadAfterRotate`.
- BannerAd.reloadAfterRotate(adView, getApplicationContext(), getString(R.string.ad_id));
-
- // Reinitialize the `adView` variable, as the `View` will have been removed and re-added by `BannerAd.reloadAfterRotate()`.
- adView = findViewById(R.id.adview);
- }
-
- // Remove the translucent navigation bar flag if it is set.
- getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-
- // Add the translucent status flag if it is unset. This also resets `drawerLayout's` `View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN`.
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-
- // Remove any `SYSTEM_UI` flags from `rootCoordinatorLayout`.
- rootCoordinatorLayout.setSystemUiVisibility(0);
-
- // Constrain `rootCoordinatorLayout` inside the status and navigation bars.
- rootCoordinatorLayout.setFitsSystemWindows(true);
}
}
private void updatePrivacyIcons(boolean runInvalidateOptionsMenu) {
// Get handles for the icons.
- MenuItem privacyIcon = mainMenu.findItem(R.id.toggleJavaScript);
- MenuItem firstPartyCookiesIcon = mainMenu.findItem(R.id.toggleFirstPartyCookies);
- MenuItem domStorageIcon = mainMenu.findItem(R.id.toggleDomStorage);
- MenuItem formDataIcon = mainMenu.findItem(R.id.toggleSaveFormData);
+ MenuItem privacyIconMenuItem = mainMenu.findItem(R.id.toggle_javascript);
+ MenuItem firstPartyCookiesIconMenuItem = mainMenu.findItem(R.id.toggle_first_party_cookies);
+ MenuItem domStorageIconMenuItem = mainMenu.findItem(R.id.toggle_dom_storage);
+ MenuItem formDataIconMenuItem = mainMenu.findItem(R.id.toggle_save_form_data);
// Update `privacyIcon`.
if (javaScriptEnabled) { // JavaScript is enabled.
- privacyIcon.setIcon(R.drawable.javascript_enabled);
+ privacyIconMenuItem.setIcon(R.drawable.javascript_enabled);
} else if (firstPartyCookiesEnabled) { // JavaScript is disabled but cookies are enabled.
- privacyIcon.setIcon(R.drawable.warning);
+ privacyIconMenuItem.setIcon(R.drawable.warning);
} else { // All the dangerous features are disabled.
- privacyIcon.setIcon(R.drawable.privacy_mode);
+ privacyIconMenuItem.setIcon(R.drawable.privacy_mode);
}
// Update `firstPartyCookiesIcon`.
if (firstPartyCookiesEnabled) { // First-party cookies are enabled.
- firstPartyCookiesIcon.setIcon(R.drawable.cookies_enabled);
+ firstPartyCookiesIconMenuItem.setIcon(R.drawable.cookies_enabled);
} else { // First-party cookies are disabled.
- firstPartyCookiesIcon.setIcon(R.drawable.cookies_disabled);
+ firstPartyCookiesIconMenuItem.setIcon(R.drawable.cookies_disabled);
}
// Update `domStorageIcon`.
if (javaScriptEnabled && domStorageEnabled) { // Both JavaScript and DOM storage are enabled.
- domStorageIcon.setIcon(R.drawable.dom_storage_enabled);
+ domStorageIconMenuItem.setIcon(R.drawable.dom_storage_enabled);
} else if (javaScriptEnabled) { // JavaScript is enabled but DOM storage is disabled.
- domStorageIcon.setIcon(R.drawable.dom_storage_disabled);
+ domStorageIconMenuItem.setIcon(R.drawable.dom_storage_disabled);
} else { // JavaScript is disabled, so DOM storage is ghosted.
- domStorageIcon.setIcon(R.drawable.dom_storage_ghosted);
+ domStorageIconMenuItem.setIcon(R.drawable.dom_storage_ghosted);
}
// Update `formDataIcon`.
if (saveFormDataEnabled) { // Form data is enabled.
- formDataIcon.setIcon(R.drawable.form_data_enabled);
+ formDataIconMenuItem.setIcon(R.drawable.form_data_enabled);
} else { // Form data is disabled.
- formDataIcon.setIcon(R.drawable.form_data_disabled);
+ formDataIconMenuItem.setIcon(R.drawable.form_data_disabled);
}
// `invalidateOptionsMenu` calls `onPrepareOptionsMenu()` and redraws the icons in the `AppBar`. `this` references the current activity.
projects / PrivacyBrowserAndroid.git / commitdiff
