/*
- * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
+import android.os.Looper;
import android.view.LayoutInflater;
import android.view.View;
import android.webkit.WebView;
import com.stoutner.privacybrowser.R;
import com.stoutner.privacybrowser.activities.MainWebViewActivity;
-import com.stoutner.privacybrowser.helpers.DownloadLocationHelper;
import com.stoutner.privacybrowser.helpers.ProxyHelper;
public class SettingsFragment extends PreferenceFragmentCompat {
Preference userAgentPreference = findPreference("user_agent");
Preference customUserAgentPreference = findPreference("custom_user_agent");
Preference incognitoModePreference = findPreference("incognito_mode");
- Preference doNotTrackPreference = findPreference("do_not_track");
- Preference allowScreenshotsPreference = findPreference("allow_screenshots");
+ Preference allowScreenshotsPreference = findPreference(getString(R.string.allow_screenshots_key));
Preference easyListPreference = findPreference("easylist");
Preference easyPrivacyPreference = findPreference("easyprivacy");
Preference fanboyAnnoyanceListPreference = findPreference("fanboys_annoyance_list");
Preference clearCookiesPreference = findPreference("clear_cookies");
Preference clearDomStoragePreference = findPreference("clear_dom_storage");
Preference clearFormDataPreference = findPreference("clear_form_data"); // The clear form data preference can be removed once the minimum API >= 26.
+ Preference clearLogcatPreference = findPreference(getString(R.string.clear_logcat_key));
Preference clearCachePreference = findPreference("clear_cache");
Preference homepagePreference = findPreference("homepage");
- Preference downloadLocationPreference = findPreference("download_location");
- Preference downloadCustomLocationPreference = findPreference("download_custom_location");
Preference fontSizePreference = findPreference("font_size");
Preference openIntentsInNewTabPreference = findPreference("open_intents_in_new_tab");
Preference swipeToRefreshPreference = findPreference("swipe_to_refresh");
assert userAgentPreference != null;
assert customUserAgentPreference != null;
assert incognitoModePreference != null;
- assert doNotTrackPreference != null;
assert allowScreenshotsPreference != null;
assert easyListPreference != null;
assert easyPrivacyPreference != null;
assert clearCookiesPreference != null;
assert clearDomStoragePreference != null;
assert clearFormDataPreference != null;
+ assert clearLogcatPreference != null;
assert clearCachePreference != null;
assert homepagePreference != null;
- assert downloadLocationPreference != null;
- assert downloadCustomLocationPreference != null;
assert fontSizePreference != null;
assert openIntentsInNewTabPreference != null;
assert swipeToRefreshPreference != null;
String userAgentName = savedPreferences.getString("user_agent", getString(R.string.user_agent_default_value));
String searchString = savedPreferences.getString("search", getString(R.string.search_default_value));
String proxyString = savedPreferences.getString("proxy", getString(R.string.proxy_default_value));
- String downloadLocationString = savedPreferences.getString("download_location", getString(R.string.download_location_default_value));
// Get booleans that are used in multiple places from the preferences.
boolean javaScriptEnabled = savedPreferences.getBoolean("javascript", false);
proxyCustomUrlPreference.setEnabled(proxyString.equals("Custom"));
- // Set the status of the Clear and Exit preferences.
+ // Set the status of the clear and exit preferences.
clearCookiesPreference.setEnabled(!clearEverything);
clearDomStoragePreference.setEnabled(!clearEverything);
clearFormDataPreference.setEnabled(!clearEverything); // The form data line can be removed once the minimum API is >= 26.
+ clearLogcatPreference.setEnabled(!clearEverything);
clearCachePreference.setEnabled(!clearEverything);
homepagePreference.setSummary(savedPreferences.getString("homepage", getString(R.string.homepage_default_value)));
- // Get the download location string arrays.
- String[] downloadLocationEntriesStringArray = resources.getStringArray(R.array.download_location_entries);
- String[] downloadLocationEntryValuesStringArray = resources.getStringArray(R.array.download_location_entry_values);
-
- // Instantiate the download location helper.
- DownloadLocationHelper downloadLocationHelper = new DownloadLocationHelper();
-
- // Check to see if a download custom location is selected.
- if (downloadLocationString.equals(downloadLocationEntryValuesStringArray[3])) { // A download custom location is selected.
- // Set the download location summary text to be `Custom`.
- downloadLocationPreference.setSummary(downloadLocationEntriesStringArray[3]);
- } else { // A custom download location is not selected.
- // Set the download location summary text to be the download location.
- downloadLocationPreference.setSummary(downloadLocationHelper.getDownloadLocation(context));
-
- // Disable the download custom location preference.
- downloadCustomLocationPreference.setEnabled(false);
- }
-
- // Set the summary text for the download custom location (the default is `"`).
- downloadCustomLocationPreference.setSummary(savedPreferences.getString("download_custom_location", getString(R.string.download_custom_location_default_value)));
-
-
// Set the font size as the summary text for the preference.
fontSizePreference.setSummary(savedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%");
String[] webViewThemeEntriesStringArray = resources.getStringArray(R.array.webview_theme_entries);
String[] webViewThemeEntryValuesStringArray = resources.getStringArray(R.array.webview_theme_entry_values);
- // Hide the WebView theme preference if the API < 21.
+ // Get the current WebView theme.
+ String currentWebViewTheme = savedPreferences.getString("webview_theme", getString(R.string.webview_theme_default_value));
+
+ // Define a WebView theme entry number.
+ int webViewThemeEntryNumber;
+
+ // Get the WebView theme entry number that matches the current WebView theme. A switch statement cannot be used because the WebView theme entry values string array is not a compile time constant.
+ if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[1])) { // The light theme is selected.
+ // Store the WebView theme entry number.
+ webViewThemeEntryNumber = 1;
+ } else if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[2])) { // The dark theme is selected.
+ // Store the WebView theme entry number.
+ webViewThemeEntryNumber = 2;
+ } else { // The system default theme is selected.
+ // Store the WebView theme entry number.
+ webViewThemeEntryNumber = 0;
+ }
+
+ // Set the visibility of the WebView theme preference.
if (Build.VERSION.SDK_INT < 21) { // The device is running API 19.
// Get a handle for the general category.
PreferenceCategory generalCategory = findPreference("general");
// Remove the WebView theme preference.
generalCategory.removePreference(webViewThemePreference);
} else { // The device is running API >= 21
- // Get the current WebView theme.
- String currentWebViewTheme = savedPreferences.getString("webview_theme", getString(R.string.webview_theme_default_value));
-
- // Define a WebView theme entry number.
- int webViewThemeEntryNumber;
-
- // Get the WebView theme entry number that matches the current WebView theme. A switch statement cannot be used because the theme entry values string array is not a compile time constant.
- if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[1])) { // The light theme is selected.
- // Store the WebView theme entry number.
- webViewThemeEntryNumber = 1;
- } else if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[2])) { // The dark theme is selected.
- // Store the WebView theme entry number.
- webViewThemeEntryNumber = 2;
- } else { // The system default theme is selected.
- // Store the WebView theme entry number.
- webViewThemeEntryNumber = 0;
- }
-
// Set the current theme as the summary text for the preference.
webViewThemePreference.setSummary(webViewThemeEntriesStringArray[webViewThemeEntryNumber]);
}
}
}
- // Set the Do Not Track icon.
- if (savedPreferences.getBoolean("do_not_track", false)) {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_night);
- } else {
- doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_day);
- }
- } else {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_night);
- } else {
- doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_day);
- }
- }
-
// Set the allow screenshots icon.
- if (savedPreferences.getBoolean("allow_screenshots", false)) {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night);
- } else {
+ if (savedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) {
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day);
+ } else {
+ allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night);
}
} else {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night);
- } else {
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day);
+ } else {
+ allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night);
}
}
}
}
- // Set the clear cache preference icon.
- if (clearEverything || savedPreferences.getBoolean("clear_cache", true)) {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- clearCachePreference.setIcon(R.drawable.cache_cleared_night);
+ // Set the clear logcat preference icon.
+ if (clearEverything || savedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) {
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ clearLogcatPreference.setIcon(R.drawable.bug_cleared_day);
} else {
- clearCachePreference.setIcon(R.drawable.cache_cleared_day);
+ clearLogcatPreference.setIcon(R.drawable.bug_cleared_night);
}
} else {
- clearCachePreference.setIcon(R.drawable.cache_warning);
+ clearLogcatPreference.setIcon(R.drawable.bug_warning);
}
- // Set the download custom location icon.
- if (downloadCustomLocationPreference.isEnabled()) {
+ // Set the clear cache preference icon.
+ if (clearEverything || savedPreferences.getBoolean("clear_cache", true)) {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_night);
+ clearCachePreference.setIcon(R.drawable.cache_cleared_night);
} else {
- downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_day);
+ clearCachePreference.setIcon(R.drawable.cache_cleared_day);
}
} else {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_night);
- } else {
- downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_day);
- }
+ clearCachePreference.setIcon(R.drawable.cache_warning);
}
// Set the open intents in new tab preference icon.
}
}
+ // Set the WebView theme preference icon.
+ switch (webViewThemeEntryNumber) {
+ case 0: // The system default WebView theme is selected.
+ // Set the icon according to the app theme.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ webViewThemePreference.setIcon(R.drawable.webview_light_theme_day);
+ } else {
+ webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night);
+ }
+ break;
+
+ case 1: // The light WebView theme is selected.
+ // Set the icon according to the app theme.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ webViewThemePreference.setIcon(R.drawable.webview_light_theme_day);
+ } else {
+ webViewThemePreference.setIcon(R.drawable.webview_light_theme_night);
+ }
+ break;
+
+ case 2: // The dark WebView theme is selected.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ webViewThemePreference.setIcon(R.drawable.webview_dark_theme_day);
+ } else {
+ webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night);
+ }
+ break;
+ }
+
// Set the wide viewport preference icon.
if (savedPreferences.getBoolean("wide_viewport", true)) {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
}
break;
- case "do_not_track":
- // Update the icon.
- if (sharedPreferences.getBoolean("do_not_track", false)) {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_night);
- } else {
- doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_day);
- }
- } else {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_night);
- } else {
- doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_day);
- }
- }
-
- break;
-
case "allow_screenshots":
// Update the icon.
- if (sharedPreferences.getBoolean("allow_screenshots", false)) {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night);
- } else {
+ if (sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) {
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day);
+ } else {
+ allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night);
}
} else {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night);
- } else {
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day);
+ } else {
+ allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night);
}
}
allowScreenshotsRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
// Create a handler to restart the activity.
- Handler allowScreenshotsRestartHandler = new Handler();
+ Handler allowScreenshotsRestartHandler = new Handler(Looper.getMainLooper());
// Create a runnable to restart the activity.
Runnable allowScreenshotsRestartRunnable = () -> {
break;
case "clear_everything":
- // Store the new `clear_everything` status
+ // Store the new clear everything status
boolean newClearEverythingBoolean = sharedPreferences.getBoolean("clear_everything", true);
- // Update the status of the `Clear and Exit` preferences.
+ // Update the status of the clear and exit preferences.
clearCookiesPreference.setEnabled(!newClearEverythingBoolean);
clearDomStoragePreference.setEnabled(!newClearEverythingBoolean);
clearFormDataPreference.setEnabled(!newClearEverythingBoolean); // This line can be removed once the minimum API >= 26.
+ clearLogcatPreference.setEnabled(!newClearEverythingBoolean);
clearCachePreference.setEnabled(!newClearEverythingBoolean);
- // Update the `clearEverythingPreference` icon.
+ // Update the clear everything preference icon.
if (newClearEverythingBoolean) {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_night);
clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled);
}
- // Update the `clearCookiesPreference` icon.
+ // Update the clear cookies preference icon.
if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cookies", true)) {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
clearCookiesPreference.setIcon(R.drawable.cookies_cleared_night);
clearCookiesPreference.setIcon(R.drawable.cookies_warning);
}
- // Update the `clearDomStoragePreference` icon.
+ // Update the clear dom storage preference icon.
if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_dom_storage", true)) {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_night);
}
}
- // Update the `clearCachePreference` icon.
+ // Update the clear logcat preference icon.
+ if (newClearEverythingBoolean || sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) {
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ clearLogcatPreference.setIcon(R.drawable.bug_cleared_day);
+ } else {
+ clearLogcatPreference.setIcon(R.drawable.bug_cleared_night);
+ }
+ } else {
+ clearLogcatPreference.setIcon(R.drawable.cache_warning);
+ }
+
+ // Update the clear cache preference icon.
if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cache", true)) {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
clearCachePreference.setIcon(R.drawable.cache_cleared_night);
}
break;
+ case "clear_logcat":
+ // Update the icon.
+ if (sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) {
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ clearLogcatPreference.setIcon(R.drawable.bug_cleared_day);
+ } else {
+ clearLogcatPreference.setIcon(R.drawable.bug_cleared_night);
+ }
+ } else {
+ clearLogcatPreference.setIcon(R.drawable.bug_warning);
+ }
+ break;
+
case "clear_cache":
// Update the icon.
if (sharedPreferences.getBoolean("clear_cache", true)) {
homepagePreference.setSummary(sharedPreferences.getString("homepage", getString(R.string.homepage_default_value)));
break;
- case "download_location":
- // Get the new download location.
- String newDownloadLocationString = sharedPreferences.getString("download_location", getString(R.string.download_location_default_value));
-
- // Check to see if a download custom location is selected.
- if (newDownloadLocationString.equals(downloadLocationEntryValuesStringArray[3])) { // A download custom location is selected.
- // Set the download location summary text to be `Custom`.
- downloadLocationPreference.setSummary(downloadLocationEntriesStringArray[3]);
-
- // Enable the download custom location preference.
- downloadCustomLocationPreference.setEnabled(true);
- } else { // A download custom location is not selected.
- // Set the download location summary text to be the download location.
- downloadLocationPreference.setSummary(downloadLocationHelper.getDownloadLocation(context));
-
- // Disable the download custom location.
- downloadCustomLocationPreference.setEnabled(newDownloadLocationString.equals(downloadLocationEntryValuesStringArray[3]));
- }
-
- // Update the download custom location icon.
- if (downloadCustomLocationPreference.isEnabled()) {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_night);
- } else {
- downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_day);
- }
- } else {
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_night);
- } else {
- downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_day);
- }
- }
- break;
-
- case "download_custom_location":
- // Set the new download custom location as the summary text for the preference.
- downloadCustomLocationPreference.setSummary(sharedPreferences.getString("download_custom_location", getString(R.string.download_custom_location_default_value)));
- break;
-
case "font_size":
// Update the font size summary text.
fontSizePreference.setSummary(sharedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%");
newWebViewThemeEntryNumber = 0;
}
+ // Update the icon.
+ switch (newWebViewThemeEntryNumber) {
+ case 0: // The system default WebView theme is selected.
+ // Set the icon according to the app theme.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ webViewThemePreference.setIcon(R.drawable.webview_light_theme_day);
+ } else {
+ webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night);
+ }
+ break;
+
+ case 1: // The system default WebView theme is selected.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ webViewThemePreference.setIcon(R.drawable.webview_light_theme_day);
+ } else {
+ webViewThemePreference.setIcon(R.drawable.webview_light_theme_night);
+ }
+ break;
+
+ case 2: // The system default WebView theme is selected.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ webViewThemePreference.setIcon(R.drawable.webview_dark_theme_day);
+ } else {
+ webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night);
+ }
+ break;
+ }
+
// Set the current theme as the summary text for the preference.
webViewThemePreference.setSummary(webViewThemeEntriesStringArray[newWebViewThemeEntryNumber]);
break;
projects / PrivacyBrowserAndroid.git / blobdiff