Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-14 23:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix group-ring logic.

Browse Source
This commit is contained in:
Alex Hart
2026-01-09 13:24:51 -04:00
parent b0aa440b9d
commit 1ad7aa901a
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallControls.kt
View File

@@ -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(),