From 62d8c115ba98a5539fa834b3ee299aee8923c1ee Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 17 Sep 2021 09:53:28 -0400
Subject: [PATCH] Enable group call notification settings when group ringing is
 enabled.

---
 .../sounds/custom/CustomNotificationsSettingsViewModel.kt      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
index 355515f4e..0eb9f3c65 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
@@ -9,6 +9,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.livedata.Store
 
 class CustomNotificationsSettingsViewModel(
@@ -42,7 +43,7 @@ class CustomNotificationsSettingsViewModel(
           RecipientDatabase.VibrateState.ENABLED -> true
           RecipientDatabase.VibrateState.DISABLED -> false
         },
-        showCallingOptions = !recipient.isGroup && recipient.isRegistered,
+        showCallingOptions = recipient.isRegistered && (!recipient.isGroup || FeatureFlags.groupCallRinging()),
         callSound = recipient.callRingtone,
         callVibrateState = recipient.callVibrate
       )