Fix crash when adding domain settings with null domain. https://redmine.stoutner...

[PrivacyBrowserAndroid.git] / app / src / main / res / xml / preferences.xml

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 4f3b1ff10b6fa2736210b72b6d7ce220b6a9b2c9..4957727ce100643c1ffe067d966a12902c1470d3 100644 (file)
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -18,7 +18,9 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+
     <PreferenceCategory
         android:key="privacy"
         android:title="@string/privacy" >
@@ -30,7 +32,7 @@
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="cookies"
+            android:key="@string/cookies_key"
             android:title="@string/cookies"
             android:summary="@string/cookies_preference_summary"
             android:defaultValue="false" />
@@ -49,20 +51,26 @@
             android:defaultValue="false" />
 
         <ListPreference
-            android:key="user_agent"
+            android:key="@string/user_agent_key"
             android:title="@string/user_agent"
             android:entries="@array/translated_user_agent_names"
             android:entryValues="@array/user_agent_names"
             android:defaultValue="@string/user_agent_default_value"
-            android:icon="?attr/userAgentIcon" />
+            android:icon="@drawable/user_agent" />
 
         <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
         <EditTextPreference
-            android:key="custom_user_agent"
+            android:key="@string/custom_user_agent_key"
             android:title="@string/custom_user_agent"
             android:defaultValue="@string/custom_user_agent_default_value"
             android:inputType="textVisiblePassword|textMultiLine" />
 
+        <SwitchPreference
+            android:key="@string/x_requested_with_header_key"
+            android:title="@string/x_requested_with_header"
+            android:summary="@string/x_requested_with_header_summary"
+            android:defaultValue="true" />
+
         <SwitchPreference
             android:key="incognito_mode"
             android:title="@string/incognito_mode"
@@ -70,7 +78,7 @@
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="allow_screenshots"
+            android:key="@string/allow_screenshots_key"
             android:title="@string/allow_screenshots"
             android:summary="@string/allow_screenshots_summary"
             android:defaultValue="false" />
@@ -128,21 +136,15 @@
         android:title="@string/url_modification" >
 
         <SwitchPreference
-            android:key="google_analytics"
-            android:title="@string/google_analytics"
-            android:summary="@string/google_analytics_summary"
-            android:defaultValue="true" />
-
-        <SwitchPreference
-            android:key="facebook_click_ids"
-            android:title="@string/facebook_click_ids"
-            android:summary="@string/facebook_click_ids_summary"
+            android:key="@string/tracking_queries_key"
+            android:title="@string/tracking_queries"
+            android:summary="@string/tracking_queries_summary"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="twitter_amp_redirects"
-            android:title="@string/twitter_amp_redirects"
-            android:summary="@string/twitter_amp_redirects_summary"
+            android:key="@string/amp_redirects_key"
+            android:title="@string/amp_redirects"
+            android:summary="@string/amp_redirects_summary"
             android:defaultValue="true" />
     </PreferenceCategory>
 
@@ -156,7 +158,7 @@
             android:entries="@array/search_entries"
             android:entryValues="@array/search_entry_values"
             android:defaultValue="@string/search_default_value"
-            android:icon="?attr/searchIcon" />
+            android:icon="@drawable/search" />
 
         <EditTextPreference
             android:key="search_custom_url"
@@ -177,7 +179,7 @@
             android:defaultValue="@string/proxy_default_value" />
 
         <EditTextPreference
-            android:key="proxy_custom_url"
+            android:key="@string/proxy_custom_url_key"
             android:title="@string/proxy_custom_url"
             android:defaultValue="@string/proxy_custom_url_default_value"
             android:inputType="textUri" />
@@ -230,8 +232,8 @@
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="clear_logcat"
-            android:title="@string/clear_logcat_preference"
+            android:key="@string/clear_logcat_key"
+            android:title="@string/clear_logcat"
             android:summary="@string/clear_logcat_summary"
             android:defaultValue="true" />
 
@@ -251,15 +253,15 @@
             android:title="@string/homepage"
             android:defaultValue="@string/homepage_default_value"
             android:inputType="textUri"
-            android:icon="?attr/homepageIcon" />
+            android:icon="@drawable/home" />
 
         <!-- `android:inputType="number"` currently doesn't work with AndroidX. -->
         <EditTextPreference
-            android:key="font_size"
+            android:key="@string/font_size_key"
             android:title="@string/font_size_preference"
             android:defaultValue="@string/font_size_default_value"
             android:inputType="number"
-            android:icon="?attr/fontSizeIcon" />
+            android:icon="@drawable/font_size" />
 
         <SwitchPreference
             android:key="open_intents_in_new_tab"
@@ -268,31 +270,31 @@
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="swipe_to_refresh"
+            android:key="@string/swipe_to_refresh_key"
             android:title="@string/swipe_to_refresh"
             android:summary="@string/swipe_to_refresh_summary"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="download_with_external_app"
+            android:key="@string/download_with_external_app_key"
             android:title="@string/download_with_external_app"
             android:summary="@string/download_with_external_app_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="scroll_app_bar"
+            android:key="@string/scroll_app_bar_key"
             android:title="@string/scroll_app_bar"
             android:summary="@string/scroll_app_bar_summary"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="bottom_app_bar"
+            android:key="@string/bottom_app_bar_key"
             android:title="@string/bottom_app_bar"
             android:summary="@string/bottom_app_bar_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="display_additional_app_bar_icons"
+            android:key="@string/display_additional_app_bar_icons_key"
             android:title="@string/display_additional_app_bar_icons"
             android:summary="@string/display_additional_app_bar_icons_summary"
             android:defaultValue="false" />
@@ -303,23 +305,23 @@
             android:entries="@array/app_theme_entries"
             android:entryValues="@array/app_theme_entry_values"
             android:defaultValue="@string/app_theme_default_value"
-            android:icon="?attr/appThemeIcon" />
+            android:icon="@drawable/app_theme" />
 
         <ListPreference
-            android:key="webview_theme"
+            android:key="@string/webview_theme_key"
             android:title="@string/webview_theme"
             android:entries="@array/webview_theme_entries"
             android:entryValues="@array/webview_theme_entry_values"
             android:defaultValue="@string/webview_theme_default_value" />
 
         <SwitchPreference
-            android:key="wide_viewport"
+            android:key="@string/wide_viewport_key"
             android:title="@string/wide_viewport_preference"
             android:summary="@string/wide_viewport_summary"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="display_webpage_images"
+            android:key="@string/display_webpage_images_key"
             android:title="@string/display_webpage_images"
             android:summary="@string/display_webpage_images_summary"
             android:defaultValue="true" />