]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
Add the title when sharing a URL. Implements https://redmine.stoutner.com/issues...
[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / fragments / SettingsFragment.java
index 3710531751d1b1041ea468a1f45070669439757b..06fd18ec46a8d5b838bcf37ac75c3854f97efb34 100644 (file)
@@ -21,6 +21,7 @@ package com.stoutner.privacybrowser.fragments;
 
 import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
@@ -43,10 +44,14 @@ public class SettingsFragment extends PreferenceFragment {
         savedPreferences = getPreferenceScreen().getSharedPreferences();
 
         // Get handles for the preferences we need to modify.
-        final Preference domStorageEnabled = findPreference("dom_storage_enabled");
-        final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled");
+        final Preference javaScriptPreference = findPreference("javascript_enabled");
+        final Preference firstPartyCookiesPreference = findPreference("first_party_cookies_enabled");
+        final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies_enabled");
+        final Preference domStoragePreference = findPreference("dom_storage_enabled");
+        final Preference saveFormDataPreference = findPreference("save_form_data_enabled");
         final Preference userAgentPreference = findPreference("user_agent");
-        final Preference customUserAgent = findPreference("custom_user_agent");
+        final Preference customUserAgentPreference = findPreference("custom_user_agent");
+        final Preference doNotTrackPreference = findPreference("do_not_track");
         final Preference torHomepagePreference = findPreference("tor_homepage");
         final Preference torSearchPreference = findPreference("tor_search");
         final Preference torSearchCustomURLPreference = findPreference("tor_search_custom_url");
@@ -57,21 +62,23 @@ public class SettingsFragment extends PreferenceFragment {
         final Preference homepagePreference = findPreference("homepage");
         final Preference defaultFontSizePreference = findPreference("default_font_size");
 
-        // Get booleans from the preferences.
-        final boolean fullScreenBrowsingModeEnabled = savedPreferences.getBoolean("enable_full_screen_browsing_mode", false);
-        final boolean proxyThroughOrbot = savedPreferences.getBoolean("proxy_through_orbot", false);
+        // Set dependencies.
+        domStoragePreference.setDependency("javascript_enabled");
+        torHomepagePreference.setDependency("proxy_through_orbot");
+        torSearchPreference.setDependency("proxy_through_orbot");
+        hideSystemBarsPreference.setDependency("enable_full_screen_browsing_mode");
 
         // Get strings from the preferences.
         String torSearchString = savedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
         String searchString = savedPreferences.getString("search", "https://duckduckgo.com/html/?q=");
-        String defaultFontSizeString = savedPreferences.getString("default_font_size", "100");
-
-        // Allow the user to access "dom_storage_enabled" if "javascript_enabled" is enabled.  The default is false.
-        domStorageEnabled.setEnabled(savedPreferences.getBoolean("javascript_enabled", false));
 
-        // Allow the user to access "third_party_cookies_enabled" if "first_party_cookies_enabled" is enabled.  The default is false.
-        thirdPartyCookiesEnabled.setEnabled(savedPreferences.getBoolean("first_party_cookies_enabled", false));
+        // Get booleans from the preferences.
+        boolean javaScriptEnabledBoolean = savedPreferences.getBoolean("javascript_enabled", false);
+        boolean firstPartyCookiesEnabledBoolean = savedPreferences.getBoolean("first_party_cookies_enabled", false);
+        boolean thirdPartyCookiesEnabledBoolean = savedPreferences.getBoolean("third_party_cookies_enabled", false);
 
+        // Only enable `thirdPartyCookiesPreference` if `firstPartyCookiesEnabledBoolean` is `true` and API >= 21.
+        thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabledBoolean && (Build.VERSION.SDK_INT >= 21));
 
         // We need to inflated a `WebView` to get the default user agent.
         LayoutInflater inflater = getActivity().getLayoutInflater();
@@ -97,9 +104,9 @@ public class SettingsFragment extends PreferenceFragment {
                 break;
         }
 
-        // Set the summary text for "custom_user_agent" (the default is "PrivacyBrowser/1.0") and enable it if "user_agent" it set to "Custom user agent".
-        customUserAgent.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
-        customUserAgent.setEnabled(userAgentPreference.getSummary().equals("Custom user agent"));
+        // Set the summary text for "customUserAgentPreference" (the default is `PrivacyBrowser/1.0`) and enable it if `userAgentPreference` it set to `Custom user agent`.
+        customUserAgentPreference.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
+        customUserAgentPreference.setEnabled(userAgentPreference.getSummary().equals("Custom user agent"));
 
 
         // Set the Tor homepage URL as the summary text for the `tor_homepage` preference when the preference screen is loaded.  The default is DuckDuckGo: `https://3g2upl4pq6kufc4m.onion`.
@@ -115,15 +122,11 @@ public class SettingsFragment extends PreferenceFragment {
             torSearchPreference.setSummary(torSearchString);
         }
 
-        // Set the summary text for `torsearch_custom_url`.  The default is `""`.
+        // Set the summary text for `tor_search_custom_url`.  The default is `""`.
         torSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_search_custom_url", ""));
 
-        // Enable the Tor preferences only if `proxy_through_orbot` is enabled.  The default is `false`.
-        torHomepagePreference.setEnabled(proxyThroughOrbot);
-        torSearchPreference.setEnabled(proxyThroughOrbot);
-
-        // Enable the Tor custom URL search options only if `proxyThroughOrbot` is true and the search is set to `Custom URL`.
-        torSearchCustomURLPreference.setEnabled(proxyThroughOrbot && torSearchString.equals("Custom URL"));
+        // Enable the Tor custom URL search options only if proxying through Orbot and the search is set to `Custom URL`.
+        torSearchCustomURLPreference.setEnabled(savedPreferences.getBoolean("proxy_through_orbot", false) && torSearchString.equals("Custom URL"));
 
 
         // Set the search URL as the summary text for the search preference when the preference screen is loaded.  The default is `https://duckduckgo.com/html/?q=`.
@@ -140,23 +143,73 @@ public class SettingsFragment extends PreferenceFragment {
         searchCustomURLPreference.setEnabled(searchString.equals("Custom URL"));
 
 
-        // Enable the full screen options if full screen browsing mode is enabled.
-        if (!fullScreenBrowsingModeEnabled) {
-            // Disable the full screen options.
-            hideSystemBarsPreference.setEnabled(false);
-            translucentNavigationBarPreference.setEnabled(false);
-        } else {
-            // Disable `transparent_navigation_bar` if `hide_system_bars` is `true`.
-            translucentNavigationBarPreference.setEnabled(!savedPreferences.getBoolean("hide_system_bars", false));
-        }
+        // Enable `transparent_navigation_bar` only if full screen browsing mode is enabled and `hide_system_bars` is disabled.
+        translucentNavigationBarPreference.setEnabled(savedPreferences.getBoolean("enable_full_screen_browsing_mode", false) && !savedPreferences.getBoolean("hide_system_bars", false));
 
 
         // Set the homepage URL as the summary text for the `Homepage` preference when the preference screen is loaded.  The default is `https://duckduckgo.com`.
         homepagePreference.setSummary(savedPreferences.getString("homepage", "https://duckduckgo.com"));
 
         // Set the default font size as the summary text for the `Default Font Size` preference when the preference screen is loaded.  The default is `100`.
-        defaultFontSizePreference.setSummary(defaultFontSizeString + "%%");
+        defaultFontSizePreference.setSummary(savedPreferences.getString("default_font_size", "100") + "%%");
+
+
+        // Set the `javaScriptPreference` icon.
+        if (javaScriptEnabledBoolean) {
+            javaScriptPreference.setIcon(R.drawable.javascript_enabled);
+        } else {
+            javaScriptPreference.setIcon(R.drawable.privacy_mode);
+        }
+
+        // Set the `firstPartyCookiesPreference` icon.
+        if (firstPartyCookiesEnabledBoolean) {
+            firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled);
+        } else {
+            firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+        }
+
+        // Set the `thirdPartyCookiesPreference` icon.
+        if (firstPartyCookiesEnabledBoolean && Build.VERSION.SDK_INT >= 21) {
+            if (thirdPartyCookiesEnabledBoolean) {
+                thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
+            } else {
+                thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+            }
+        } else {
+            thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted);
+        }
+
+        // Set the `domStoragePreference` icon.
+        if (javaScriptEnabledBoolean) {
+            if (savedPreferences.getBoolean("dom_storage_enabled", false)) {
+                domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
+            } else {
+                domStoragePreference.setIcon(R.drawable.dom_storage_disabled);
+            }
+        } else {
+            domStoragePreference.setIcon(R.drawable.dom_storage_ghosted);
+        }
+
+        // Set the `saveFormDataPreference` icon.
+        if (savedPreferences.getBoolean("save_form_data_enabled", false)) {
+            saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
+        } else {
+            saveFormDataPreference.setIcon(R.drawable.form_data_disabled);
+        }
 
+        // Set the `customUserAgentPreference` icon.
+        if (customUserAgentPreference.isEnabled()) {
+            customUserAgentPreference.setIcon(R.drawable.user_agent_enabled);
+        } else {
+            customUserAgentPreference.setIcon(R.drawable.user_agent_ghosted);
+        }
+
+        // Set the `doNotTrackPreference` icon.
+        if (savedPreferences.getBoolean("do_not_track", false)) {
+            doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled);
+        } else {
+            doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled);
+        }
 
         // Listen for preference changes.
         preferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@@ -167,44 +220,126 @@ public class SettingsFragment extends PreferenceFragment {
 
                 switch (key) {
                     case "javascript_enabled":
-                        // Toggle the state of the `dom_storage_enabled` preference.  The default is `false`.
-                        final Preference domStorageEnabled = findPreference("dom_storage_enabled");
-                        domStorageEnabled.setEnabled(sharedPreferences.getBoolean("javascript_enabled", false));
+                        // Update the icons.
+                        if (sharedPreferences.getBoolean("javascript_enabled", false)) {
+                            // Update the icon for `javascript_enabled`.
+                            javaScriptPreference.setIcon(R.drawable.javascript_enabled);
+
+                            // Update the icon for `dom_storage_enabled`.
+                            if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+                                domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
+                            } else {
+                                domStoragePreference.setIcon(R.drawable.dom_storage_disabled);
+                            }
+                        } else {  // `javascript_enabled` is `false`.
+                            // Update the icon for `javascript_enabled`.
+                            javaScriptPreference.setIcon(R.drawable.privacy_mode);
+
+                            // Set the icon for `dom_storage_disabled` to be ghosted.
+                            domStoragePreference.setIcon(R.drawable.dom_storage_ghosted);
+                        }
                         break;
 
                     case "first_party_cookies_enabled":
-                        // Toggle the state of the `third_party_cookies_enabled` preference.  The default is `false`.
-                        final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled");
-                        thirdPartyCookiesEnabled.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false));
+                        // Update the icons for `first_party_cookies_enabled` and `third_party_cookies_enabled`.
+                        if (sharedPreferences.getBoolean("first_party_cookies_enabled", false)) {
+                            // Set the icon for `first_party_cookies_enabled`.
+                            firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled);
+
+                            // Update the icon for `third_party_cookies_enabled`.
+                            if (Build.VERSION.SDK_INT >= 21) {
+                                if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+                                    thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
+                                } else {
+                                    thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+                                }
+                            } else {
+                                thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted);
+                            }
+                        } else {  // `first_party_cookies_enabled` is `false`.
+                            // Update the icon for `first_party_cookies_enabled`.
+                            firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+
+                            // Set the icon for `third_party_cookies_enabled` to be ghosted.
+                            thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted);
+                        }
+
+                        // Enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21.
+                        thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21));
                         break;
 
+                    case "third_party_cookies_enabled":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+                            thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
+                        } else {
+                            thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+                        }
+                        break;
+
+                    case "dom_storage_enabled":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+                            domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
+                        } else {
+                            domStoragePreference.setIcon(R.drawable.dom_storage_disabled);
+                        }
+                        break;
+
+                    case "save_form_data_enabled":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("save_form_data_enabled", false)) {
+                            saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
+                        } else {
+                            saveFormDataPreference.setIcon(R.drawable.form_data_disabled);
+                        }
+
                     case "user_agent":
                         String userAgentString = sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0");
 
                         switch (userAgentString) {
                             case "WebView default user agent":
-                                // Display the user agent as the summary text for `userAgentPreference`, and disable `customUserAgent`.
+                                // Display the user agent as the summary text for `userAgentPreference`.
                                 userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString());
-                                customUserAgent.setEnabled(false);
+
+                                // Update `customUserAgentPreference`.
+                                customUserAgentPreference.setEnabled(false);
+                                customUserAgentPreference.setIcon(R.drawable.user_agent_ghosted);
                                 break;
 
                             case "Custom user agent":
-                                // Display "Custom user agent" as the summary text for userAgentPreference, and enable customUserAgent.
+                                // Display `Custom user agent` as the summary text for `userAgentPreference`.
                                 userAgentPreference.setSummary(R.string.custom_user_agent);
-                                customUserAgent.setEnabled(true);
+
+                                // Update `customUserAgentPreference`.
+                                customUserAgentPreference.setEnabled(true);
+                                customUserAgentPreference.setIcon(R.drawable.user_agent_enabled);
                                 break;
 
                             default:
-                                // Display the user agent as the summary text for userAgentPreference, and disable customUserAgent.
+                                // Display the user agent as the summary text for `userAgentPreference`.
                                 userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0"));
-                                customUserAgent.setEnabled(false);
+
+                                // Update `customUserAgentPreference`.
+                                customUserAgentPreference.setEnabled(false);
+                                customUserAgentPreference.setIcon(R.drawable.user_agent_ghosted);
                                 break;
                         }
                         break;
 
                     case "custom_user_agent":
                         // Set the new custom user agent as the summary text for `custom_user_agent`.  The default is `PrivacyBrowser/1.0`.
-                        customUserAgent.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
+                        customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
+                        break;
+
+                    case "do_not_track":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("do_not_track", false)) {
+                            doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled);
+                        } else {
+                            doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled);
+                        }
+
                         break;
 
                     case "proxy_through_orbot":
@@ -212,10 +347,6 @@ public class SettingsFragment extends PreferenceFragment {
                         boolean currentProxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false);
                         String currentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
 
-                        // Enable the Tor preferences only if `proxy_through_orbot` is enabled.  The default is `false`.
-                        torHomepagePreference.setEnabled(currentProxyThroughOrbot);
-                        torSearchPreference.setEnabled(currentProxyThroughOrbot);
-
                         // Enable the Tor custom URL search option only if `currentProxyThroughOrbot` is true and the search is set to `Custom URL`.
                         torSearchCustomURLPreference.setEnabled(currentProxyThroughOrbot && currentTorSearchString.equals("Custom URL"));
                         break;
@@ -265,18 +396,13 @@ public class SettingsFragment extends PreferenceFragment {
                         break;
 
                     case "enable_full_screen_browsing_mode":
-                        boolean newFullScreenBrowsingModeEnabled = sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false);
-                        if (newFullScreenBrowsingModeEnabled) {
-                            // Enable `hideSystemBarsPreference`.
-                            hideSystemBarsPreference.setEnabled(true);
+                        // Enable `transparent_navigation_bar` only if full screen browsing mode is enabled and `hide_system_bars` is disabled.
+                        translucentNavigationBarPreference.setEnabled(sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false) && !sharedPreferences.getBoolean("hide_system_bars", false));
+                        break;
 
-                            // Only enable `transparent_navigation_bar` if `hide_system_bars` is `false`.
-                            translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
-                        } else {
-                            // Disable the full screen options.
-                            hideSystemBarsPreference.setEnabled(false);
-                            translucentNavigationBarPreference.setEnabled(false);
-                        }
+                    case "hide_system_bars":
+                        // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled.
+                        translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
                         break;
 
                     case "homepage":
@@ -285,16 +411,8 @@ public class SettingsFragment extends PreferenceFragment {
                         break;
 
                     case "default_font_size":
-                        // Get the default font size as a string.  The default is `100`.
-                        String newDefaultFontSizeString = sharedPreferences.getString("default_font_size", "100");
-
                         // Update the summary text of `default_font_size`.
-                        defaultFontSizePreference.setSummary(newDefaultFontSizeString + "%%");
-                        break;
-
-                    case "hide_system_bars":
-                        // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled.
-                        translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
+                        defaultFontSizePreference.setSummary(sharedPreferences.getString("default_font_size", "100") + "%%");
                         break;
 
                     default: