From aa50f8da9dd1d0759ed336faa2aae94621f6e26d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Nov 2019 14:14:28 +0100
Subject: [PATCH] move foreground setting and backup setting to main settings
 screen

---
 .../conversations/utils/Compatibility.java    |  2 +-
 src/main/res/values/strings.xml               |  2 ++
 src/main/res/xml/preferences.xml              | 31 ++++++++++---------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/utils/Compatibility.java b/src/main/java/eu/siacs/conversations/utils/Compatibility.java
index 9e63ee3c37c8f9f15b035f892aa13d0089c22845..4a2a14111220f81192242a855f7af1b8970565d8 100644
--- a/src/main/java/eu/siacs/conversations/utils/Compatibility.java
+++ b/src/main/java/eu/siacs/conversations/utils/Compatibility.java
@@ -93,7 +93,7 @@ public class Compatibility {
     public static void removeUnusedPreferences(SettingsFragment settingsFragment) {
         List<PreferenceCategory> categories = Arrays.asList(
                 (PreferenceCategory) settingsFragment.findPreference("notification_category"),
-                (PreferenceCategory) settingsFragment.findPreference("other_expert_category"));
+                (PreferenceCategory) settingsFragment.findPreference("advanced"));
         for (String key : (runsTwentySix() ? UNUSED_SETTINGS_POST_TWENTYSIX : UNUESD_SETTINGS_PRE_TWENTYSIX)) {
             Preference preference = settingsFragment.findPreference(key);
             if (preference != null) {
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 75a929e3fe33a73b3943b2b65c479e22cace523d..d9b957ec175c92a2a70521ab44a8f3894962e788 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -880,4 +880,6 @@
     <string name="local_server">Local server</string>
     <string name="pref_channel_discovery_summary">Most users should choose ‘jabber.network’ for better suggestions from the entirety of the public XMPP ecosystem.</string>
     <string name="pref_channel_discovery">Channel discovery method</string>
+    <string name="backup">Backup</string>
+    <string name="category_about">About</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index b071233aa19bca8f2ae1fa4ed8faca5360ea5553..31c2f8b08c9a62314d2cc311f18b6b049affd130 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -184,6 +184,14 @@
             android:summary="@string/pref_font_size_summary"
             android:title="@string/pref_font_size" />
     </PreferenceCategory>
+    <PreferenceCategory
+        android:key="backup_category"
+        android:title="@string/backup">
+        <Preference
+            android:key="create_backup"
+            android:summary="@string/pref_create_backup_summary"
+            android:title="@string/pref_create_backup" />
+    </PreferenceCategory>
     <PreferenceCategory
         android:key="advanced"
         android:title="@string/pref_advanced_options">
@@ -193,6 +201,12 @@
             android:summary="@string/pref_never_send_crash_summary"
             android:title="@string/pref_never_send_crash" />
 
+        <CheckBoxPreference
+            android:defaultValue="@bool/enable_foreground_service"
+            android:key="enable_foreground_service"
+            android:summary="@string/pref_keep_foreground_service_summary"
+            android:title="@string/pref_keep_foreground_service" />
+
         <PreferenceScreen
             android:key="expert"
             android:summary="@string/pref_expert_options_summary"
@@ -320,19 +334,6 @@
                     android:summary="@string/pref_channel_discovery_summary"
                     android:title="@string/pref_channel_discovery" />
             </PreferenceCategory>
-            <PreferenceCategory
-                android:key="other_expert_category"
-                android:title="@string/pref_expert_options_other">
-                <CheckBoxPreference
-                    android:defaultValue="@bool/enable_foreground_service"
-                    android:key="enable_foreground_service"
-                    android:summary="@string/pref_keep_foreground_service_summary"
-                    android:title="@string/pref_keep_foreground_service" />
-                <Preference
-                    android:key="create_backup"
-                    android:summary="@string/pref_create_backup_summary"
-                    android:title="@string/pref_create_backup" />
-            </PreferenceCategory>
             <intent
                 android:action="android.intent.action.VIEW"
                 android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
@@ -343,5 +344,7 @@
             </intent>
         </PreferenceScreen>
     </PreferenceCategory>
-    <eu.siacs.conversations.ui.AboutPreference />
+    <PreferenceCategory android:title="@string/category_about">
+        <eu.siacs.conversations.ui.AboutPreference />
+    </PreferenceCategory>
 </PreferenceScreen>