From 8452fc6c5830eba6bebc664f615cde5d098f825b Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Thu, 19 Apr 2018 10:53:37 -0700
Subject: [PATCH] Correctly avoid displaying about category in groups

Fixes #7702
---
 res/xml/recipient_preferences.xml                             | 4 ++--
 .../thoughtcrime/securesms/RecipientPreferenceActivity.java   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/xml/recipient_preferences.xml b/res/xml/recipient_preferences.xml
index 28e3c6b61..aa051965b 100644
--- a/res/xml/recipient_preferences.xml
+++ b/res/xml/recipient_preferences.xml
@@ -6,7 +6,7 @@
         <org.thoughtcrime.securesms.preferences.widgets.ContactPreference android:key="pref_key_number" android:persistent="false"/>
     </PreferenceCategory>
 
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
+    <PreferenceCategory android:key="about_divider" android:layout="@layout/preference_divider"/>
 
     <PreferenceCategory android:key="notification_settings" android:title="@string/recipient_preferences__chat_settings">
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
@@ -43,7 +43,7 @@
 
     <PreferenceCategory android:layout="@layout/preference_divider"/>
 
-    <PreferenceCategory android:title="@string/recipient_preferences__call_settings">
+    <PreferenceCategory android:key="call_settings" android:title="@string/recipient_preferences__call_settings">
 
         <org.thoughtcrime.securesms.preferences.widgets.SignalPreference
                 android:key="pref_key_recipient_call_ringtone"
diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index 86b0e5bb1..7723e51ae 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -328,6 +328,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
       Preference            blockPreference           = this.findPreference(PREFERENCE_BLOCK);
       Preference            identityPreference        = this.findPreference(PREFERENCE_IDENTITY);
       PreferenceCategory    aboutCategory             = (PreferenceCategory)this.findPreference("about");
+      PreferenceCategory    aboutDivider              = (PreferenceCategory)this.findPreference("about_divider");
       ContactPreference     aboutPreference           = (ContactPreference)this.findPreference(PREFERENCE_ABOUT);
       PreferenceCategory    privacyCategory           = (PreferenceCategory) this.findPreference("privacy_settings");
       PreferenceCategory    divider                   = (PreferenceCategory) this.findPreference("divider");
@@ -352,7 +353,8 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         if (identityPreference != null) identityPreference.setVisible(false);
         if (privacyCategory    != null) privacyCategory.setVisible(false);
         if (divider            != null) divider.setVisible(false);
-        if (aboutCategory      != null) aboutCategory.setVisible(false);
+        if (aboutCategory      != null) getPreferenceScreen().removePreference(aboutCategory);
+        if (aboutDivider       != null) getPreferenceScreen().removePreference(aboutDivider);
       } else {
         colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(getActivity()));
         colorPreference.setColor(recipient.getColor().toActionBarColor(getActivity()));