import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
+import android.os.Handler;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment;
boolean proxyThroughOrbot = savedPreferences.getBoolean("proxy_through_orbot", false);
boolean fullScreenBrowsingMode = savedPreferences.getBoolean("full_screen_browsing_mode", false);
boolean clearEverything = savedPreferences.getBoolean("clear_everything", true);
+ boolean darkTheme = savedPreferences.getBoolean("dark_theme", false);
final boolean nightMode = savedPreferences.getBoolean("night_mode", false);
// Only enable the third-party cookies preference if first-party cookies are enabled and API >= 21.
if (firstPartyCookiesEnabled) {
firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled);
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark);
} else {
firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light);
if (thirdPartyCookiesEnabled) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark);
} else {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light);
}
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark);
} else {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light);
if (savedPreferences.getBoolean("dom_storage", false)) { // DOM storage is enabled.
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else { // DOM storage is disabled.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark);
} else {
domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light);
}
}
} else { // The preference is disabled. The icon should be ghosted.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark);
} else {
domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light);
if (savedPreferences.getBoolean("save_form_data", false)) {
saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark);
} else {
saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light);
// Set the custom user agent icon.
if (customUserAgentPreference.isEnabled()) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark);
} else {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark);
} else {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light);
// Set the incognito mode icon.
if (savedPreferences.getBoolean("incognito_mode", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark);
} else {
incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark);
} else {
incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light);
// Set the Do Not Track icon.
if (savedPreferences.getBoolean("do_not_track", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_dark);
} else {
doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_dark);
} else {
doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_light);
// Set the allow screenshots icon.
if (savedPreferences.getBoolean("allow_screenshots", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark);
} else {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark);
} else {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light);
// Set the EasyList icon.
if (savedPreferences.getBoolean("easylist", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
easyListPreference.setIcon(R.drawable.block_ads_enabled_dark);
} else {
easyListPreference.setIcon(R.drawable.block_ads_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
easyListPreference.setIcon(R.drawable.block_ads_disabled_dark);
} else {
easyListPreference.setIcon(R.drawable.block_ads_disabled_light);
// Set the EasyPrivacy icon.
if (savedPreferences.getBoolean("easyprivacy", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark);
} else {
easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark);
} else {
easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light);
// Set the Fanboy lists icons.
if (fanboyAnnoyanceListEnabled) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
// Set the Fanboy annoyance list icon.
fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark);
fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
// Set the Fanboy annoyance list icon.
fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark);
// Set the UltraPrivacy icon.
if (savedPreferences.getBoolean("ultraprivacy", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark);
} else {
ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark);
} else {
ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light);
// Set the block all third-party requests icon.
if (savedPreferences.getBoolean("block_all_third_party_requests", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark);
} else {
blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark);
} else {
blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light);
// Set the Tor icons according to the theme.
if (proxyThroughOrbot) { // Proxying is enabled.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled_dark);
torHomepagePreference.setIcon(R.drawable.home_enabled_dark);
torSearchPreference.setIcon(R.drawable.search_enabled_dark);
}
}
} else { // Proxying is disabled.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled_dark);
torHomepagePreference.setIcon(R.drawable.home_ghosted_dark);
torSearchPreference.setIcon(R.drawable.search_ghosted_dark);
// Set the search custom URL icon.
if (searchCustomURLPreference.isEnabled()) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark);
} else {
searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark);
} else {
searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light);
// Set the full screen browsing mode icons.
if (fullScreenBrowsingMode) { // Full screen browsing mode is enabled.
// Set the `fullScreenBrowsingModePreference` icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_dark);
} else {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light);
// Set the hide app bar icon.
if (savedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled.
// Set the icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
} else { // Hide app bar is disabled.
// Set the icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
} else {
hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
}
} else { // Full screen browsing mode is disabled.
// Set the icons according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark);
hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_dark);
} else {
// Set the clear everything preference icon.
if (clearEverything) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_dark);
} else {
clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_light);
// Set the clear cookies preference icon.
if (clearEverything || savedPreferences.getBoolean("clear_cookies", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark);
} else {
clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light);
// Set the clear DOM storage preference icon.
if (clearEverything || savedPreferences.getBoolean("clear_dom_storage", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark);
} else {
clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light);
// Set the clear form data preference icon if the API < 26. It has no effect on newer versions of Android.
if (Build.VERSION.SDK_INT < 26) {
if (clearEverything || savedPreferences.getBoolean("clear_form_data", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark);
} else {
clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light);
// Set the clear cache preference icon.
if (clearEverything || savedPreferences.getBoolean("clear_cache", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearCachePreference.setIcon(R.drawable.cache_cleared_dark);
} else {
clearCachePreference.setIcon(R.drawable.cache_cleared_light);
// Set the swipe to refresh preference icon.
if (savedPreferences.getBoolean("swipe_to_refresh", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_dark);
} else {
swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_dark);
} else {
swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_light);
// Set the scroll app bar preference icon.
if (savedPreferences.getBoolean("scroll_app_bar", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
} else {
scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
// Set the display additional app bar icons preference icon.
if (savedPreferences.getBoolean("display_additional_app_bar_icons", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_dark);
} else {
displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_dark);
} else {
displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_light);
// Set the download with external app preference icon.
if (savedPreferences.getBoolean("download_with_external_app", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark);
} else {
downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark);
} else {
downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light);
// Set the night mode preference icon.
if (nightMode) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
nightModePreference.setIcon(R.drawable.night_mode_enabled_dark);
} else {
nightModePreference.setIcon(R.drawable.night_mode_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
nightModePreference.setIcon(R.drawable.night_mode_disabled_dark);
} else {
nightModePreference.setIcon(R.drawable.night_mode_disabled_light);
// Set the display webpage images preference icon.
if (savedPreferences.getBoolean("display_webpage_images", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_dark);
} else {
displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_dark);
} else {
displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_light);
if (sharedPreferences.getBoolean("dom_storage", false)) {
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark);
} else {
domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light);
domStoragePreference.setEnabled(false);
// Set the icon for DOM storage preference to be ghosted.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark);
} else {
domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light);
if (sharedPreferences.getBoolean("third_party_cookies", false)) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark);
} else {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light);
}
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark);
} else {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light);
}
} else { // `first_party_cookies` is `false`.
// Update the icon for `first_party_cookies`.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark);
} else {
firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light);
}
// Set the icon for `third_party_cookies` to be ghosted.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark);
} else {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light);
if (sharedPreferences.getBoolean("third_party_cookies", false)) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark);
} else {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light);
if (sharedPreferences.getBoolean("dom_storage", false)) {
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark);
} else {
domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light);
if (sharedPreferences.getBoolean("save_form_data", false)) {
saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark);
} else {
saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light);
customUserAgentPreference.setEnabled(false);
// Set the custom user agent preference icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark);
} else {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light);
customUserAgentPreference.setEnabled(true);
// Set the custom user agent preference icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark);
} else {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_light);
customUserAgentPreference.setEnabled(false);
// Set the custom user agent preference icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark);
} else {
customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light);
case "incognito_mode":
// Update the icon.
if (sharedPreferences.getBoolean("incognito_mode", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark);
} else {
incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark);
} else {
incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light);
case "do_not_track":
// Update the icon.
if (sharedPreferences.getBoolean("do_not_track", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_dark);
} else {
doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_dark);
} else {
doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_light);
case "allow_screenshots":
// Update the icon.
if (sharedPreferences.getBoolean("allow_screenshots", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark);
} else {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark);
} else {
allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light);
// Assert that the intent is not null to remove the lint error below.
assert allowScreenshotsRestartIntent != null;
- // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. TODO.
+ // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`.
allowScreenshotsRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
- // Make it so.
- startActivity(allowScreenshotsRestartIntent);
+ // Create a handler to restart the activity.
+ Handler allowScreenshotsRestartHandler = new Handler();
+
+ // Create a runnable to restart the activity.
+ Runnable allowScreenshotsRestartRunnable = () -> {
+ // Restart the activity.
+ startActivity(allowScreenshotsRestartIntent);
+
+ // Kill this instance of Privacy Browser. Otherwise, the app exhibits sporadic behavior after the restart.
+ System.exit(0);
+ };
+
+ // Restart the activity after 100 milliseconds, so that the app has enough time to save the change to the preference.
+ allowScreenshotsRestartHandler.postDelayed(allowScreenshotsRestartRunnable, 100);
break;
case "easylist":
// Update the icon.
if (sharedPreferences.getBoolean("easylist", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
easyListPreference.setIcon(R.drawable.block_ads_enabled_dark);
} else {
easyListPreference.setIcon(R.drawable.block_ads_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
easyListPreference.setIcon(R.drawable.block_ads_disabled_dark);
} else {
easyListPreference.setIcon(R.drawable.block_ads_disabled_light);
case "easyprivacy":
// Update the icon.
if (sharedPreferences.getBoolean("easyprivacy", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark);
} else {
easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark);
} else {
easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light);
// Update the Fanboy icons.
if (currentFanboyAnnoyanceList) { // Fanboy's annoyance list is enabled.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
// Update the Fanboy's annoyance list icon.
fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark);
fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_light);
}
} else { // Fanboy's annoyance list is disabled.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
// Update the Fanboy's annoyance list icon.
fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark);
case "fanboys_social_blocking_list":
// Update the icon.
if (sharedPreferences.getBoolean("fanboys_social_blocking_list", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark);
} else {
fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_dark);
} else {
fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_light);
case "ultraprivacy":
// Update the icon.
if (sharedPreferences.getBoolean("ultraprivacy", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark);
} else {
ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark);
} else {
ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light);
case "block_all_third_party_requests":
// Update the icon.
if (sharedPreferences.getBoolean("block_all_third_party_requests", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark);
} else {
blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark);
} else {
blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light);
// Update the icons.
if (currentProxyThroughOrbot) {
// Set the Tor icons according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled_dark);
torHomepagePreference.setIcon(R.drawable.home_enabled_dark);
torSearchPreference.setIcon(R.drawable.search_enabled_dark);
}
}
} else { // Proxy through Orbot is disabled.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled_dark);
torHomepagePreference.setIcon(R.drawable.home_ghosted_dark);
torSearchPreference.setIcon(R.drawable.search_ghosted_dark);
torSearchCustomURLPreference.setEnabled(true);
// Update the `torSearchCustomURLPreference` icon.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark);
} else {
torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light);
torSearchCustomURLPreference.setEnabled(false);
// Update the `torSearchCustomURLPreference` icon.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark);
} else {
torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light);
searchCustomURLPreference.setEnabled(true);
// Set the `searchCustomURLPreference` according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark);
} else {
searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light);
searchCustomURLPreference.setEnabled(false);
// Set the `searchCustomURLPreference` according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark);
} else {
searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light);
case "full_screen_browsing_mode":
if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) { // Full screen browsing is enabled.
// Set the full screen browsing mode preference icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_dark);
} else {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light);
// Set the hide app bar preference icon.
if (sharedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled.
// Set the icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
} else { // Hide app bar is disabled.
// Set the icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
} else {
hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
}
} else { // Full screen browsing is disabled.
// Update the icons according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark);
hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_dark);
} else {
// Update the icon.
if (sharedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled.
// Set the icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
} else { // Hide app bar is disabled.
// Set the icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
} else {
hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
// Update the `clearEverythingPreference` icon.
if (newClearEverythingBoolean) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_dark);
} else {
clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_light);
// Update the `clearCookiesPreference` icon.
if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cookies", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark);
} else {
clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light);
// Update the `clearDomStoragePreference` icon.
if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_dom_storage", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark);
} else {
clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light);
// Update the clear form data preference icon if the API < 26.
if (Build.VERSION.SDK_INT < 26) {
if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark);
} else {
clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light);
// Update the `clearCachePreference` icon.
if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cache", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearCachePreference.setIcon(R.drawable.cache_cleared_dark);
} else {
clearCachePreference.setIcon(R.drawable.cache_cleared_light);
case "clear_cookies":
// Update the icon.
if (sharedPreferences.getBoolean("clear_cookies", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark);
} else {
clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light);
case "clear_dom_storage":
// Update the icon.
if (sharedPreferences.getBoolean("clear_dom_storage", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark);
} else {
clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light);
case "clear_form_data":
// Update the icon.
if (sharedPreferences.getBoolean("clear_form_data", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark);
} else {
clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light);
case "clear_cache":
// Update the icon.
if (sharedPreferences.getBoolean("clear_cache", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
clearCachePreference.setIcon(R.drawable.cache_cleared_dark);
} else {
clearCachePreference.setIcon(R.drawable.cache_cleared_light);
case "swipe_to_refresh":
// Update the icon.
if (sharedPreferences.getBoolean("swipe_to_refresh", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_dark);
} else {
swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_dark);
} else {
swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_light);
case "scroll_app_bar":
// Update the icon.
if (sharedPreferences.getBoolean("scroll_app_bar", true)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
} else {
scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
case "display_additional_app_bar_icons":
// Update the icon.
if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_dark);
} else {
displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_dark);
} else {
displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_light);
case "download_with_external_app":
// Update the icon.
if (sharedPreferences.getBoolean("download_with_external_app", false)) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark);
} else {
downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark);
} else {
downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light);
// Assert that the intent is not null to remove the lint error below.
assert changeThemeRestartIntent != null;
- // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. TODO.
+ // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`.
changeThemeRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
- // Make it so.
- startActivity(changeThemeRestartIntent);
+ // Create a handler to restart the activity.
+ Handler changeThemeRestartHandler = new Handler();
+
+ // Create a runnable to restart the activity.
+ Runnable changeThemeRestartRunnable = () -> {
+ // Restart the activity.
+ startActivity(changeThemeRestartIntent);
+
+ // Kill this instance of Privacy Browser. Otherwise, the app exhibits sporadic behavior after the restart.
+ System.exit(0);
+ };
+
+ // Restart the activity after 100 milliseconds, so that the app has enought time to save the change to the preference.
+ changeThemeRestartHandler.postDelayed(changeThemeRestartRunnable, 100);
break;
case "night_mode":
- // Set the URL to be reloaded on restart to apply the new night mode setting.
- MainWebViewActivity.reloadOnRestart = true;
-
// Store the current night mode status.
boolean currentNightModeBoolean = sharedPreferences.getBoolean("night_mode", false);
boolean currentJavaScriptBoolean = sharedPreferences.getBoolean("javascript", false);
// Update the icon.
if (currentNightModeBoolean) {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
nightModePreference.setIcon(R.drawable.night_mode_enabled_dark);
} else {
nightModePreference.setIcon(R.drawable.night_mode_enabled_light);
}
} else {
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
nightModePreference.setIcon(R.drawable.night_mode_disabled_dark);
} else {
nightModePreference.setIcon(R.drawable.night_mode_disabled_light);
if (sharedPreferences.getBoolean("dom_storage", false)) { // DOM storage is enabled.
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else { // DOM storage is disabled.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark);
} else {
domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light);
}
}
} else { // The preference is disabled. The icon should be ghosted.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark);
} else {
domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light);
case "display_webpage_images":
if (sharedPreferences.getBoolean("display_webpage_images", true)) {
// Update the icon.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_dark);
} else {
displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_light);
}
-
- // `mainWebView` does not need to be reloaded because unloaded images will load automatically.
- MainWebViewActivity.reloadOnRestart = false;
} else {
// Update the icon.
- if (MainWebViewActivity.darkTheme) {
+ if (darkTheme) {
displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_dark);
} else {
displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_light);
}
-
- // Set `mainWebView` to reload on restart to remove the current images.
- MainWebViewActivity.reloadOnRestart = true;
}
break;
}