diff --git a/src/app/features/call/callRingtone.ts b/src/app/features/call/callRingtone.ts index 1724c59af..d888fe386 100644 --- a/src/app/features/call/callRingtone.ts +++ b/src/app/features/call/callRingtone.ts @@ -28,9 +28,8 @@ export const CALL_RINGTONE_OPTIONS: CallToneOption[] = CALL_TONE }) ); -export const CALL_RINGBACK_OPTIONS: CallToneOption[] = CALL_RINGTONE_OPTIONS.filter( - (option) => option.value !== 'silent' -); +export const CALL_RINGBACK_OPTIONS: CallToneOption[] = + CALL_RINGTONE_OPTIONS; type ToneSettings = Pick; diff --git a/src/app/features/call/callSignalingFallback.ts b/src/app/features/call/callSignalingFallback.ts index de65cf924..59ac2517d 100644 --- a/src/app/features/call/callSignalingFallback.ts +++ b/src/app/features/call/callSignalingFallback.ts @@ -60,6 +60,7 @@ export type OutgoingRingbackContext = { declinedRoomId: string | null; hasCallBeenActive: boolean; getRoom: (roomId: string) => Room | null | undefined; + isDirectRoom: (roomId: string) => boolean; getSessionDescription: (room: Room) => SessionDescription; isOutgoingPending?: typeof isOutgoingCallPending; isCallActive?: typeof isCallActive; @@ -87,6 +88,11 @@ export const evaluateOutgoingRingbackFallback = ( return stop(); } + // Only direct (1:1) calls should play an outgoing ringback tone. Voice rooms should not ring. + if (!context.isDirectRoom(context.activeCallRoomId)) { + return stop(); + } + const outgoingRoom = context.getRoom(context.activeCallRoomId); if (!outgoingRoom) { return stop(); diff --git a/src/app/features/settings/general/CallSoundSettings.tsx b/src/app/features/settings/general/CallSoundSettings.tsx index 3413d0798..bae99fc59 100644 --- a/src/app/features/settings/general/CallSoundSettings.tsx +++ b/src/app/features/settings/general/CallSoundSettings.tsx @@ -377,7 +377,6 @@ export function CallSoundSettings() { previewing={previewing} previewActions={[ { label: 'Preview Ringtone', tone: 'incoming', icon: Icons.Play }, - { label: 'Preview Outgoing', tone: 'outgoing', icon: Icons.Phone }, ]} onImport={handleImportCustomRingtone} onPreview={playPreviewTone} diff --git a/src/app/hooks/useCallSignaling.ts b/src/app/hooks/useCallSignaling.ts index 40ce2eca3..7fc8c9287 100644 --- a/src/app/hooks/useCallSignaling.ts +++ b/src/app/hooks/useCallSignaling.ts @@ -293,7 +293,10 @@ export function useIncomingCallSignaling() { callSoundOverrideGlobalNotifications: settings.callSoundOverrideGlobalNotifications, }); const incomingRingtoneAllowed = settings.incomingCallSoundEnabled && callAudioAllowed; - const outgoingRingbackAllowed = settings.outgoingRingbackEnabled && callAudioAllowed; + const outgoingRingbackAllowed = + settings.outgoingRingbackEnabled && + callAudioAllowed && + settings.callRingbackTone !== 'silent'; const incomingToneIsSilent = settings.callRingtoneId === 'silent'; const handleIncomingCall = useCallback( @@ -579,6 +582,7 @@ export function useIncomingCallSignaling() { { ...fallbackContext, activeCallRoomId, + isDirectRoom: (roomId: string) => handlers().mDirects.has(roomId), outgoingRingbackAllowed: handlers().outgoingRingbackAllowed, declinedRoomId: declinedOutgoingRoomIdRef.current, hasCallBeenActive: hasCallBeenActiveRef.current,