From 1ad7aa901aedc71b934b7d436ba0fd2a19aa2fa0 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 9 Jan 2026 13:24:51 -0400
Subject: [PATCH] Fix group-ring logic.

---
 .../securesms/components/webrtc/v2/CallControls.kt       | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallControls.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallControls.kt
index 9b02e78ff6..77b6dbaa06 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallControls.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallControls.kt
@@ -36,7 +36,6 @@ import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState
 import org.thoughtcrime.securesms.components.webrtc.ToggleButtonOutputState
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput
 import org.thoughtcrime.securesms.components.webrtc.WebRtcControls
-import org.thoughtcrime.securesms.events.WebRtcViewModel
 import org.thoughtcrime.securesms.util.RemoteConfig
 
 /**
@@ -225,12 +224,6 @@ data class CallControlsState(
       webRtcControls: WebRtcControls,
       groupMemberCount: Int
     ): CallControlsState {
-      val isGroupRingingEnabled = if (callParticipantsState.callState == WebRtcViewModel.State.CALL_PRE_JOIN) {
-        callParticipantsState.groupCallState.isNotIdle
-      } else {
-        callParticipantsState.ringGroup
-      }
-
       return CallControlsState(
         isEarpieceAvailable = webRtcControls.isEarpieceAvailableForAudioToggle,
         isBluetoothHeadsetAvailable = webRtcControls.isBluetoothHeadsetAvailableForAudioToggle,
@@ -243,7 +236,7 @@ data class CallControlsState(
         displayMicToggle = webRtcControls.displayMuteAudio(),
         isMicEnabled = callParticipantsState.localParticipant.isMicrophoneEnabled,
         displayGroupRingingToggle = webRtcControls.displayRingToggle(),
-        isGroupRingingEnabled = isGroupRingingEnabled,
+        isGroupRingingEnabled = callParticipantsState.ringGroup,
         isGroupRingingAllowed = groupMemberCount <= RemoteConfig.maxGroupCallRingSize,
         displayAdditionalActions = webRtcControls.displayOverflow(),
         displayStartCallButton = webRtcControls.displayStartCallControls(),