From 6c81bf6ee80e48250d3de75843761130dea0e4ca Mon Sep 17 00:00:00 2001
From: Florian Renaud <florian.renaud@niji.fr>
Date: Mon, 22 Nov 2021 16:21:55 +0100
Subject: [PATCH] Remove duplicated settings declaration

---
 changelog.d/4539.bugfix                        |  1 +
 .../res/xml/vector_settings_preferences.xml    | 18 ++----------------
 2 files changed, 3 insertions(+), 16 deletions(-)
 create mode 100644 changelog.d/4539.bugfix

diff --git a/changelog.d/4539.bugfix b/changelog.d/4539.bugfix
new file mode 100644
index 0000000000..0e133cbadc
--- /dev/null
+++ b/changelog.d/4539.bugfix
@@ -0,0 +1 @@
+Remove duplicated settings declaration
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 1f7c347ddd..14c7dc7b80 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -35,8 +35,8 @@
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:key="SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME"
-            android:title="@string/preference_show_all_rooms_in_home"
-            android:summary="@string/all_rooms_youre_in_will_be_shown_in_home" />
+            android:summary="@string/all_rooms_youre_in_will_be_shown_in_home"
+            android:title="@string/preference_show_all_rooms_in_home" />
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
@@ -121,20 +121,6 @@
             android:summary="@string/settings_chat_effects_description"
             android:title="@string/settings_chat_effects_title" />
 
-        <im.vector.app.core.preference.VectorSwitchPreference
-            android:defaultValue="true"
-            android:key="SETTINGS_SHOW_JOIN_LEAVE_MESSAGES_KEY"
-            android:summary="@string/settings_show_join_leave_messages_summary"
-            android:title="@string/settings_show_join_leave_messages"
-            app:isPreferenceVisible="@bool/false_not_implemented" />
-
-        <im.vector.app.core.preference.VectorSwitchPreference
-            android:defaultValue="true"
-            android:key="SETTINGS_SHOW_AVATAR_DISPLAY_NAME_CHANGES_MESSAGES_KEY"
-            android:summary="@string/settings_show_avatar_display_name_changes_messages_summary"
-            android:title="@string/settings_show_avatar_display_name_changes_messages"
-            app:isPreferenceVisible="@bool/false_not_implemented" />
-
         <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_VIBRATE_ON_MENTION_KEY"
             android:title="@string/settings_vibrate_on_mention"