]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
projects / PrivacyBrowserAndroid.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add X-Requested-With settings. https://redmine.stoutner.com/issues/819
[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / fragments / SettingsFragment.java
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
index 05b82dff6e8a2bddfb3b668a4f007acb0534cc95..9c80f5908138fef0b366ab0145ad772745c91f06 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
@@ -66,6 +66,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
     private Preference formDataPreference;  // The form data preference can be removed once the minimum API >= 26.
     private Preference userAgentPreference;
     private Preference customUserAgentPreference;
+    private Preference xRequestedWithHeaderPreference;
     private Preference incognitoModePreference;
     private Preference allowScreenshotsPreference;
     private Preference easyListPreference;
@@ -75,9 +76,8 @@ public class SettingsFragment extends PreferenceFragmentCompat {
     private Preference ultraListPreference;
     private Preference ultraPrivacyPreference;
     private Preference blockAllThirdPartyRequestsPreference;
-    private Preference googleAnalyticsPreference;
-    private Preference facebookClickIdsPreference;
-    private Preference twitterAmpRedirectsPreference;
+    private Preference trackingQueriesPreference;
+    private Preference ampRedirectsPreference;
     private Preference searchPreference;
     private Preference searchCustomURLPreference;
     private Preference proxyPreference;
@@ -133,6 +133,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         formDataPreference = findPreference("save_form_data");  // The form data preference can be removed once the minimum API >= 26.
         userAgentPreference = findPreference("user_agent");
         customUserAgentPreference = findPreference("custom_user_agent");
+        xRequestedWithHeaderPreference = findPreference(getString(R.string.x_requested_with_header_key));
         incognitoModePreference = findPreference("incognito_mode");
         allowScreenshotsPreference = findPreference(getString(R.string.allow_screenshots_key));
         easyListPreference = findPreference("easylist");
@@ -142,9 +143,8 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         ultraListPreference = findPreference("ultralist");
         ultraPrivacyPreference = findPreference("ultraprivacy");
         blockAllThirdPartyRequestsPreference = findPreference("block_all_third_party_requests");
-        googleAnalyticsPreference = findPreference("google_analytics");
-        facebookClickIdsPreference = findPreference("facebook_click_ids");
-        twitterAmpRedirectsPreference = findPreference("twitter_amp_redirects");
+        trackingQueriesPreference = findPreference(getString(R.string.tracking_queries_key));
+        ampRedirectsPreference = findPreference(getString(R.string.amp_redirects_key));
         searchPreference = findPreference("search");
         searchCustomURLPreference = findPreference("search_custom_url");
         proxyPreference = findPreference("proxy");
@@ -177,6 +177,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         assert formDataPreference != null;
         assert userAgentPreference != null;
         assert customUserAgentPreference != null;
+        assert xRequestedWithHeaderPreference != null;
         assert incognitoModePreference != null;
         assert allowScreenshotsPreference != null;
         assert easyListPreference != null;
@@ -186,9 +187,8 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         assert ultraListPreference != null;
         assert ultraPrivacyPreference != null;
         assert blockAllThirdPartyRequestsPreference != null;
-        assert googleAnalyticsPreference != null;
-        assert facebookClickIdsPreference != null;
-        assert twitterAmpRedirectsPreference != null;
+        assert trackingQueriesPreference != null;
+        assert ampRedirectsPreference != null;
         assert searchPreference != null;
         assert searchCustomURLPreference != null;
         assert proxyPreference != null;
@@ -434,47 +434,47 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 
         // 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 (sharedPreferences.getBoolean("save_form_data", false)) {
+            if (sharedPreferences.getBoolean("save_form_data", false))
                 formDataPreference.setIcon(R.drawable.form_data_enabled);
-            } else {
+            else
                 formDataPreference.setIcon(R.drawable.form_data_disabled);
-            }
         }
 
         // Set the custom user agent icon.
-        if (customUserAgentPreference.isEnabled()) {
+        if (customUserAgentPreference.isEnabled())
             customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled);
-        } else {
+        else
             customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted);
-        }
+
+        // Set the X-Requested With header icon.
+        if (sharedPreferences.getBoolean(getString(R.string.x_requested_with_header_key), true))
+            xRequestedWithHeaderPreference.setIcon(R.drawable.x_requested_with_header_enabled);
+        else
+            xRequestedWithHeaderPreference.setIcon(R.drawable.x_requested_with_header_disabled);
 
         // Set the incognito mode icon.
-        if (sharedPreferences.getBoolean("incognito_mode", false)) {
+        if (sharedPreferences.getBoolean("incognito_mode", false))
             incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled);
-        } else {
+        else
             incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled);
-        }
 
         // Set the allow screenshots icon.
-        if (sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) {
+        if (sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false))
             allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled);
-        } else {
+        else
             allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled);
-        }
 
         // Set the EasyList icon.
-        if (sharedPreferences.getBoolean("easylist", true)) {
+        if (sharedPreferences.getBoolean("easylist", true))
             easyListPreference.setIcon(R.drawable.block_ads_enabled);
-        } else {
+        else
             easyListPreference.setIcon(R.drawable.block_ads_disabled);
-        }
 
         // Set the EasyPrivacy icon.
-        if (sharedPreferences.getBoolean("easyprivacy", true)) {
+        if (sharedPreferences.getBoolean("easyprivacy", true))
             easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled);
-        } else {
+        else
             easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled);
-        }
 
         // Set the Fanboy lists icons.
         if (fanboyAnnoyanceListEnabled) {
@@ -516,25 +516,18 @@ public class SettingsFragment extends PreferenceFragmentCompat {
             blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled);
         }
 
-        // Set the Google Analytics icon.
-        if (sharedPreferences.getBoolean("google_analytics", true)) {
-            googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled);
-        } else {
-            googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled);
-        }
-
-        // Set the Facebook Click IDs icon.
-        if (sharedPreferences.getBoolean("facebook_click_ids", true)) {
-            facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled);
+        // Set the Tracking Queries icon.
+        if (sharedPreferences.getBoolean(getString(R.string.tracking_queries_key), true)) {
+            trackingQueriesPreference.setIcon(R.drawable.modify_url_enabled);
         } else {
-            facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled);
+            trackingQueriesPreference.setIcon(R.drawable.modify_url_disabled);
         }
 
-        // Set the Twitter AMP redirects icon.
-        if (sharedPreferences.getBoolean("twitter_amp_redirects", true)) {
-            twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled);
+        // Set the AMP Redirects icon.
+        if (sharedPreferences.getBoolean(getString(R.string.amp_redirects_key), true)) {
+            ampRedirectsPreference.setIcon(R.drawable.modify_url_enabled);
         } else {
-            twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled);
+            ampRedirectsPreference.setIcon(R.drawable.modify_url_disabled);
         }
 
         // Set the search custom URL icon.
@@ -850,22 +843,31 @@ public class SettingsFragment extends PreferenceFragmentCompat {
                     customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", context.getString(R.string.custom_user_agent_default_value)));
                     break;
 
+                case "x_requested_with_header":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean(context.getString(R.string.x_requested_with_header_key), true))
+                        xRequestedWithHeaderPreference.setIcon(R.drawable.x_requested_with_header_enabled);
+                    else
+                        xRequestedWithHeaderPreference.setIcon(R.drawable.x_requested_with_header_disabled);
+
+                    // Restart Privacy Browser.
+                    restartPrivacyBrowser();
+                    break;
+
                 case "incognito_mode":
                     // Update the icon.
-                    if (sharedPreferences.getBoolean("incognito_mode", false)) {
+                    if (sharedPreferences.getBoolean("incognito_mode", false))
                         incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled);
-                    } else {
+                    else
                         incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled);
-                    }
                     break;
 
                 case "allow_screenshots":
                     // Update the icon.
-                    if (sharedPreferences.getBoolean(context.getString(R.string.allow_screenshots_key), false)) {
+                    if (sharedPreferences.getBoolean(context.getString(R.string.allow_screenshots_key), false))
                         allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled);
-                    } else {
+                    else
                         allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled);
-                    }
 
                     // Restart Privacy Browser.
                     restartPrivacyBrowser();
@@ -873,20 +875,18 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 
                 case "easylist":
                     // Update the icon.
-                    if (sharedPreferences.getBoolean("easylist", true)) {
+                    if (sharedPreferences.getBoolean("easylist", true))
                         easyListPreference.setIcon(R.drawable.block_ads_enabled);
-                    } else {
+                    else
                         easyListPreference.setIcon(R.drawable.block_ads_disabled);
-                    }
                     break;
 
                 case "easyprivacy":
                     // Update the icon.
-                    if (sharedPreferences.getBoolean("easyprivacy", true)) {
+                    if (sharedPreferences.getBoolean("easyprivacy", true))
                         easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled);
-                    } else {
+                    else
                         easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled);
-                    }
                     break;
 
                 case "fanboys_annoyance_list":
@@ -952,30 +952,21 @@ public class SettingsFragment extends PreferenceFragmentCompat {
                     }
                     break;
 
-                case "google_analytics":
+                case "tracking_queries":
                     // Update the icon.
-                    if (sharedPreferences.getBoolean("google_analytics", true)) {
-                        googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled);
+                    if (sharedPreferences.getBoolean(context.getString(R.string.tracking_queries_key), true)) {
+                        trackingQueriesPreference.setIcon(R.drawable.modify_url_enabled);
                     } else {
-                        googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled);
+                        trackingQueriesPreference.setIcon(R.drawable.modify_url_disabled);
                     }
                     break;
 
-                case "facebook_click_ids":
+                case "amp_redirects":
                     // Update the icon.
-                    if (sharedPreferences.getBoolean("facebook_click_ids", true)) {
-                        facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled);
+                    if (sharedPreferences.getBoolean(context.getString(R.string.amp_redirects_key), true)) {
+                        ampRedirectsPreference.setIcon(R.drawable.modify_url_enabled);
                     } else {
-                        facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled);
-                    }
-                    break;
-
-                case "twitter_amp_redirects":
-                    // Update the icon.
-                    if (sharedPreferences.getBoolean("twitter_amp_redirects", true)) {
-                        twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled);
-                    } else {
-                        twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled);
+                        ampRedirectsPreference.setIcon(R.drawable.modify_url_disabled);
                     }
                     break;
 
@@ -1230,20 +1221,15 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 
                 case "scroll_app_bar":
                     // Update the icon.
-                    if (sharedPreferences.getBoolean(context.getString(R.string.scroll_app_bar_key), true)) {
-                        scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled);
-                    } else {
-                        scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled);
-                    }
+                    if (sharedPreferences.getBoolean(context.getString(R.string.scroll_app_bar_key), true)) scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled);
+                    else scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled);
+
                     break;
 
                 case "bottom_app_bar":
                     // Update the icon.
-                    if (sharedPreferences.getBoolean(context.getString(R.string.bottom_app_bar_key), false)) {
-                        bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_enabled);
-                    } else {
-                        bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_disabled);
-                    }
+                    if (sharedPreferences.getBoolean(context.getString(R.string.bottom_app_bar_key), false)) bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_enabled);
+                    else bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_disabled);
 
                     // Restart Privacy Browser.
                     restartPrivacyBrowser();
A web browser that respects your privacy.