From a50bf4582caf5b68ac7662cc9a3a32ece8a1cce1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 15 Apr 2022 13:14:03 +0200
Subject: [PATCH] Move "Ignored users" setting section into "Security &
 Privacy", as per Element Web

---
 .../src/main/res/values/config-settings.xml         |  5 ++---
 vector/src/main/res/xml/vector_settings_root.xml    |  6 ------
 .../res/xml/vector_settings_security_privacy.xml    | 13 +++++++++++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/vector-config/src/main/res/values/config-settings.xml b/vector-config/src/main/res/values/config-settings.xml
index b6d1c6676c..0a4da4c98e 100755
--- a/vector-config/src/main/res/values/config-settings.xml
+++ b/vector-config/src/main/res/values/config-settings.xml
@@ -13,7 +13,6 @@
     <bool name="settings_root_notification_visible">true</bool>
     <bool name="settings_root_preferences_visible">true</bool>
     <bool name="settings_root_voice_video_visible">true</bool>
-    <bool name="settings_root_ignored_users_visible">true</bool>
     <bool name="settings_root_security_privacy_visible">true</bool>
     <bool name="settings_root_labs_visible">true</bool>
     <bool name="settings_root_advanced_visible">true</bool>
@@ -33,10 +32,10 @@
 
     <!-- Level 1: Voice and video -->
 
-    <!-- Level 1: Ignored Users -->
-
     <!-- Level 1: Security and Privacy -->
 
+    <bool name="settings_ignored_users_visible">true</bool>
+
     <!-- Level 1: Labs -->
     <bool name="settings_labs_thread_messages_default">false</bool>
 
diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
index 744694cf5f..0c50083d53 100644
--- a/vector/src/main/res/xml/vector_settings_root.xml
+++ b/vector/src/main/res/xml/vector_settings_root.xml
@@ -32,12 +32,6 @@
         app:fragment="im.vector.app.features.settings.VectorSettingsVoiceVideoFragment"
         app:isPreferenceVisible="@bool/settings_root_voice_video_visible" />
 
-    <im.vector.app.core.preference.VectorPreference
-        android:icon="@drawable/ic_settings_root_ignored_users"
-        android:title="@string/settings_ignored_users"
-        app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment"
-        app:isPreferenceVisible="@bool/settings_root_ignored_users_visible" />
-
     <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_security_privacy"
         android:title="@string/settings_security_and_privacy"
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index cd413e3fec..d4dfed2fcf 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -101,6 +101,19 @@
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
+    <im.vector.app.core.preference.VectorPreferenceCategory
+        android:key="SETTINGS_IGNORED_USERS_PREFERENCE_CATEGORY_KEY"
+        android:title="@string/settings_ignored_users"
+        app:isPreferenceVisible="@bool/settings_ignored_users_visible">
+
+        <im.vector.app.core.preference.VectorPreference
+            android:icon="@drawable/ic_settings_root_ignored_users"
+            android:key="SETTINGS_IGNORED_USERS_PREFERENCE_KEY"
+            android:title="@string/settings_ignored_users"
+            app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment" />
+
+    </im.vector.app.core.preference.VectorPreferenceCategory>
+
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY"
         android:title="@string/settings_analytics">