From bae84b6b67e6db7dd587ce52be39e365129b80a5 Mon Sep 17 00:00:00 2001 From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com> Date: Tue, 7 Sep 2021 11:20:13 -0500 Subject: [PATCH] Prevent outbound group ring if the feature flag is disabled --- ts/state/ducks/calling.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/state/ducks/calling.ts b/ts/state/ducks/calling.ts index 658219cd0..8b6a0fc2a 100644 --- a/ts/state/ducks/calling.ts +++ b/ts/state/ducks/calling.ts @@ -29,6 +29,7 @@ import { } from '../../types/Calling'; import { callingTones } from '../../util/callingTones'; import { requestCameraPermissions } from '../../util/callingPermissions'; +import { isGroupCallOutboundRingEnabled } from '../../util/isGroupCallOutboundRingEnabled'; import { sleep } from '../../util/sleep'; import { LatestQueue } from '../../util/LatestQueue'; import type { ConversationChangedActionType } from './conversations'; @@ -1077,7 +1078,7 @@ function startCall( const state = getState(); const { activeCallState } = state.calling; - if (activeCallState?.outgoingRing) { + if (isGroupCallOutboundRingEnabled() && activeCallState?.outgoingRing) { const conversation = getOwn( state.conversations.conversationLookup, activeCallState.conversationId @@ -1253,6 +1254,7 @@ export function reducer( ...ringState, }; outgoingRing = + isGroupCallOutboundRingEnabled() && !ringState.ringId && !call.peekInfo.uuids.length && !call.remoteParticipants.length &&