X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FSettingsFragment.java;h=bf864c114dbd9779fdc21b9ade87802bce8d572e;hp=05b82dff6e8a2bddfb3b668a4f007acb0534cc95;hb=0b2da52fc661cf302cd94105620e54340d269f1d;hpb=1b27ac6f2b7c046945fc97e2aff9adbde8a152ce

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 05b82dff..bf864c11 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
@@ -75,9 +75,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;
@@ -142,9 +141,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");
@@ -186,9 +184,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;
@@ -516,25 +513,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);
+        // Set the Tracking Queries icon.
+        if (sharedPreferences.getBoolean(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);
         }
 
-        // Set the Facebook Click IDs icon.
-        if (sharedPreferences.getBoolean("facebook_click_ids", true)) {
-            facebookClickIdsPreference.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 {
-            facebookClickIdsPreference.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);
-        } else {
-            twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled);
+            ampRedirectsPreference.setIcon(R.drawable.modify_url_disabled);
         }
 
         // Set the search custom URL icon.
@@ -952,30 +942,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 +1211,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();