Preference firstPartyCookiesPreference = findPreference("first_party_cookies");
Preference thirdPartyCookiesPreference = findPreference("third_party_cookies");
Preference domStoragePreference = findPreference("dom_storage");
- Preference saveFormDataPreference = findPreference("save_form_data"); // The form data preference can be removed once the minimum API >= 26.
+ Preference formDataPreference = findPreference("save_form_data"); // The form data preference can be removed once the minimum API >= 26.
Preference userAgentPreference = findPreference("user_agent");
Preference customUserAgentPreference = findPreference("custom_user_agent");
Preference incognitoModePreference = findPreference("incognito_mode");
Preference easyPrivacyPreference = findPreference("easyprivacy");
Preference fanboyAnnoyanceListPreference = findPreference("fanboys_annoyance_list");
Preference fanboySocialBlockingListPreference = findPreference("fanboys_social_blocking_list");
+ Preference ultraListPreference = findPreference("ultralist");
Preference ultraPrivacyPreference = findPreference("ultraprivacy");
Preference blockAllThirdPartyRequestsPreference = findPreference("block_all_third_party_requests");
+ Preference googleAnalyticsPreference = findPreference("google_analytics");
+ Preference facebookClickIdsPreference = findPreference("facebook_click_ids");
+ Preference twitterAmpRedirectsPreference = findPreference("twitter_amp_redirects");
Preference proxyThroughOrbotPreference = findPreference("proxy_through_orbot");
Preference torHomepagePreference = findPreference("tor_homepage");
Preference torSearchPreference = findPreference("tor_search");
Preference downloadWithExternalAppPreference = findPreference("download_with_external_app");
Preference darkThemePreference = findPreference("dark_theme");
Preference nightModePreference = findPreference("night_mode");
+ Preference wideViewportPreference = findPreference("wide_viewport");
Preference displayWebpageImagesPreference = findPreference("display_webpage_images");
// Set dependencies.
PreferenceCategory clearAndExitCategory = (PreferenceCategory) findPreference("clear_and_exit");
// Remove the form data preferences.
- privacyCategory.removePreference(saveFormDataPreference);
+ privacyCategory.removePreference(formDataPreference);
clearAndExitCategory.removePreference(clearFormDataPreference);
}
// Set the save form data icon if API < 26. Save form data has no effect on API >= 26.
if (Build.VERSION.SDK_INT < 26) {
if (savedPreferences.getBoolean("save_form_data", false)) {
- saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
+ formDataPreference.setIcon(R.drawable.form_data_enabled);
} else {
if (darkTheme) {
- saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark);
+ formDataPreference.setIcon(R.drawable.form_data_disabled_dark);
} else {
- saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light);
+ formDataPreference.setIcon(R.drawable.form_data_disabled_light);
}
}
}
}
}
+ // Set the UltraList icon.
+ if (savedPreferences.getBoolean("ultralist", true)){
+ if (darkTheme) {
+ ultraListPreference.setIcon(R.drawable.block_ads_enabled_dark);
+ } else {
+ ultraListPreference.setIcon(R.drawable.block_ads_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ ultraListPreference.setIcon(R.drawable.block_ads_disabled_dark);
+ } else {
+ ultraListPreference.setIcon(R.drawable.block_ads_disabled_light);
+ }
+ }
+
// Set the UltraPrivacy icon.
if (savedPreferences.getBoolean("ultraprivacy", true)) {
if (darkTheme) {
}
}
+ // Set the Google Analytics icon according to the theme.
+ if (savedPreferences.getBoolean("google_analytics", true)) {
+ if (darkTheme) {
+ googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_dark);
+ } else {
+ googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_dark);
+ } else {
+ googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_light);
+ }
+ }
+
+ // Set the Facebook Click IDs icon according to the theme.
+ if (savedPreferences.getBoolean("facebook_click_ids", true)) {
+ if (darkTheme) {
+ facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_dark);
+ } else {
+ facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_dark);
+ } else {
+ facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_light);
+ }
+ }
+
+ // Set the Twitter AMP redirects icon according to the theme.
+ if (savedPreferences.getBoolean("twitter_amp_redirects", true)) {
+ if (darkTheme) {
+ twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_dark);
+ } else {
+ twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_dark);
+ } else {
+ twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_light);
+ }
+ }
+
// Set the Tor icons according to the theme.
if (proxyThroughOrbot) { // Proxying is enabled.
if (darkTheme) {
}
}
+ // Set the wide viewport preference icon.
+ if (savedPreferences.getBoolean("wide_viewport", true)) {
+ if (darkTheme) {
+ wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_dark);
+ } else {
+ wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_dark);
+ } else {
+ wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_light);
+ }
+ }
+
// Set the display webpage images preference icon.
if (savedPreferences.getBoolean("display_webpage_images", true)) {
if (darkTheme) {
case "save_form_data":
// Update the icon.
if (sharedPreferences.getBoolean("save_form_data", false)) {
- saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
+ formDataPreference.setIcon(R.drawable.form_data_enabled);
} else {
if (darkTheme) {
- saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark);
+ formDataPreference.setIcon(R.drawable.form_data_disabled_dark);
} else {
- saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light);
+ formDataPreference.setIcon(R.drawable.form_data_disabled_light);
}
}
break;
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);
+ // Restart the activity after 150 milliseconds, so that the app has enough time to save the change to the preference.
+ allowScreenshotsRestartHandler.postDelayed(allowScreenshotsRestartRunnable, 150);
break;
case "easylist":
}
break;
+ case "ultralist":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("ultralist", true)) {
+ if (darkTheme) {
+ ultraListPreference.setIcon(R.drawable.block_ads_enabled_dark);
+ } else {
+ ultraListPreference.setIcon(R.drawable.block_ads_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ ultraListPreference.setIcon(R.drawable.block_ads_disabled_dark);
+ } else {
+ ultraListPreference.setIcon(R.drawable.block_ads_disabled_light);
+ }
+ }
+ break;
+
case "ultraprivacy":
// Update the icon.
if (sharedPreferences.getBoolean("ultraprivacy", true)) {
}
break;
+ case "google_analytics":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("google_analytics", true)) {
+ if (darkTheme) {
+ googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_dark);
+ } else {
+ googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_dark);
+ } else {
+ googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_light);
+ }
+ }
+ break;
+
+ case "facebook_click_ids":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("facebook_click_ids", true)) {
+ if (darkTheme) {
+ facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_dark);
+ } else {
+ facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_dark);
+ } else {
+ facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_light);
+ }
+ }
+ break;
+
+ case "twitter_amp_redirects":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("twitter_amp_redirects", true)) {
+ if (darkTheme) {
+ twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_dark);
+ } else {
+ twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_dark);
+ } else {
+ twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_light);
+ }
+ }
+ break;
+
case "proxy_through_orbot":
// Get current settings.
boolean currentProxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false);
System.exit(0);
};
- // Restart the activity after 100 milliseconds, so that the app has enough time to save the change to the preference.
- changeThemeRestartHandler.postDelayed(changeThemeRestartRunnable, 100);
+ // Restart the activity after 150 milliseconds, so that the app has enough time to save the change to the preference.
+ changeThemeRestartHandler.postDelayed(changeThemeRestartRunnable, 150);
break;
case "night_mode":
}
break;
+ case "wide_viewport":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("wide_viewport", true)) {
+ if (darkTheme) {
+ wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_dark);
+ } else {
+ wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_light);
+ }
+ } else {
+ if (darkTheme) {
+ wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_dark);
+ } else {
+ wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_light);
+ }
+ }
+ break;
+
case "display_webpage_images":
+ // Update the icon.
if (sharedPreferences.getBoolean("display_webpage_images", true)) {
- // Update the icon.
if (darkTheme) {
displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_dark);
} else {
displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_light);
}
} else {
- // Update the icon.
if (darkTheme) {
displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_dark);
} else {
super.onResume();
savedPreferences.registerOnSharedPreferenceChangeListener(preferencesListener);
}
-}
+}
\ No newline at end of file