mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Revert to previous method of rendering calling notifications

Browse source
This commit is contained in:
Jamie Kyle 2023-08-21 10:09:54 -07:00 • committed by GitHub
parent 3beea78aff
commit 7c16b16ee0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 131 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

81
ts/components/conversation/CallingNotification.stories.tsx
View file

@ -21,7 +21,6 @@ import {
DirectCallStatus,
} from '../../types/CallDisposition';
import type { ConversationType } from '../../state/ducks/conversations';
import { CallExternalState } from '../../util/callingNotification';
const i18n = setupI18n('en', enMessages);
@ -35,7 +34,9 @@ const getCommonProps = (options: {
direction?: CallDirection;
status?: CallStatus;
callCreator?: ConversationType | null;
callExternalState?: CallExternalState;
groupCallEnded: boolean | null;
deviceCount: number;
maxDevices: number;
}): PropsType => {
const {
mode,
@ -48,7 +49,9 @@ const getCommonProps = (options: {
serviceId: generateAci(),
isMe: direction === CallDirection.Outgoing,
}),
callExternalState = CallExternalState.Active,
groupCallEnded,
deviceCount,
maxDevices,
} = options;
const conversation =
@ -71,15 +74,10 @@ const getCommonProps = (options: {
status,
},
callCreator,
callExternalState,
maxDevices: mode === CallMode.Group ? 15 : 0,
deviceCount:
// eslint-disable-next-line no-nested-ternary
mode === CallMode.Group
? callExternalState === CallExternalState.Full
? 15
: 13
: Infinity,
activeConversationId: null,
groupCallEnded,
maxDevices,
deviceCount,
};
};
@ -103,6 +101,9 @@ export function AcceptedIncomingAudioCall(): JSX.Element {
type: CallType.Audio,
direction: CallDirection.Incoming,
status: DirectCallStatus.Accepted,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
);
@ -116,7 +117,9 @@ export function AcceptedIncomingVideoCall(): JSX.Element {
type: CallType.Video,
direction: CallDirection.Incoming,
status: DirectCallStatus.Accepted,
callExternalState: CallExternalState.Ended,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
);
@ -130,6 +133,9 @@ export function DeclinedIncomingAudioCall(): JSX.Element {
type: CallType.Audio,
direction: CallDirection.Incoming,
status: DirectCallStatus.Declined,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
);
@ -143,6 +149,9 @@ export function DeclinedIncomingVideoCall(): JSX.Element {
type: CallType.Video,
direction: CallDirection.Incoming,
status: DirectCallStatus.Declined,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
);
@ -156,6 +165,9 @@ export function AcceptedOutgoingAudioCall(): JSX.Element {
type: CallType.Audio,
direction: CallDirection.Outgoing,
status: DirectCallStatus.Accepted,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
);
@ -169,6 +181,9 @@ export function AcceptedOutgoingVideoCall(): JSX.Element {
type: CallType.Video,
direction: CallDirection.Outgoing,
status: DirectCallStatus.Accepted,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
);
@ -182,6 +197,9 @@ export function DeclinedOutgoingAudioCall(): JSX.Element {
type: CallType.Audio,
direction: CallDirection.Outgoing,
status: DirectCallStatus.Declined,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
);
@ -195,6 +213,9 @@ export function DeclinedOutgoingVideoCall(): JSX.Element {
type: CallType.Video,
direction: CallDirection.Outgoing,
status: DirectCallStatus.Declined,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
);
@ -209,7 +230,9 @@ export function TwoIncomingDirectCallsBackToBack(): JSX.Element {
type: CallType.Video,
direction: CallDirection.Incoming,
status: DirectCallStatus.Declined,
callExternalState: CallExternalState.Ended,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
isNextItemCallingNotification
/>
@ -219,6 +242,9 @@ export function TwoIncomingDirectCallsBackToBack(): JSX.Element {
type: CallType.Audio,
direction: CallDirection.Incoming,
status: DirectCallStatus.Declined,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
</>
@ -238,7 +264,9 @@ export function TwoOutgoingDirectCallsBackToBack(): JSX.Element {
type: CallType.Video,
direction: CallDirection.Outgoing,
status: DirectCallStatus.Declined,
callExternalState: CallExternalState.Ended,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
isNextItemCallingNotification
/>
@ -248,6 +276,9 @@ export function TwoOutgoingDirectCallsBackToBack(): JSX.Element {
type: CallType.Audio,
direction: CallDirection.Outgoing,
status: DirectCallStatus.Declined,
groupCallEnded: null,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
</>
@ -267,6 +298,9 @@ export function GroupCallByUnknown(): JSX.Element {
direction: CallDirection.Incoming,
status: GroupCallStatus.Accepted,
callCreator: null,
groupCallEnded: false,
deviceCount: 1,
maxDevices: 8,
})}
/>
);
@ -280,6 +314,9 @@ export function GroupCallByYou(): JSX.Element {
type: CallType.Group,
direction: CallDirection.Outgoing,
status: GroupCallStatus.Accepted,
groupCallEnded: false,
deviceCount: 1,
maxDevices: 8,
})}
/>
);
@ -293,6 +330,9 @@ export function GroupCallBySomeone(): JSX.Element {
type: CallType.Group,
direction: CallDirection.Incoming,
status: GroupCallStatus.GenericGroupCall,
groupCallEnded: false,
deviceCount: 1,
maxDevices: 8,
})}
/>
);
@ -309,6 +349,9 @@ export function GroupCallStartedBySomeoneWithALongName(): JSX.Element {
callCreator: getDefaultConversation({
name: '😤🪐🦆'.repeat(50),
}),
groupCallEnded: false,
deviceCount: 1,
maxDevices: 8,
})}
/>
);
@ -326,7 +369,9 @@ export function GroupCallActiveCallFull(): JSX.Element {
type: CallType.Group,
direction: CallDirection.Incoming,
status: GroupCallStatus.GenericGroupCall,
callExternalState: CallExternalState.Full,
groupCallEnded: false,
deviceCount: 8,
maxDevices: 8,
})}
/>
);
@ -344,7 +389,9 @@ export function GroupCallEnded(): JSX.Element {
type: CallType.Group,
direction: CallDirection.Incoming,
status: GroupCallStatus.GenericGroupCall,
callExternalState: CallExternalState.Ended,
groupCallEnded: true,
deviceCount: 0,
maxDevices: Infinity,
})}
/>
);

30
ts/components/conversation/CallingNotification.tsx
View file

@ -12,7 +12,6 @@ import type { LocalizerType } from '../../types/Util';
import { CallMode } from '../../types/Calling';
import type { CallingNotificationType } from '../../util/callingNotification';
import {
CallExternalState,
getCallingIcon,
getCallingNotificationText,
} from '../../util/callingNotification';
@ -110,10 +109,7 @@ function renderCallingNotificationButton(
direction === CallDirection.Incoming
? i18n('icu:calling__call-back')
: i18n('icu:calling__call-again');
if (
props.callExternalState === CallExternalState.Joined ||
props.callExternalState === CallExternalState.InOtherCall
) {
if (props.activeConversationId != null) {
disabledTooltipText = i18n('icu:calling__in-another-call-tooltip');
onClick = noop;
} else {
@ -127,17 +123,19 @@ function renderCallingNotificationButton(
break;
}
case CallMode.Group: {
if (props.callExternalState === CallExternalState.Ended) {
if (props.groupCallEnded) {
return null;
}
if (props.callExternalState === CallExternalState.Joined) {
buttonText = i18n('icu:calling__return');
onClick = returnToActiveCall;
} else if (props.callExternalState === CallExternalState.InOtherCall) {
buttonText = i18n('icu:calling__join');
disabledTooltipText = i18n('icu:calling__in-another-call-tooltip');
onClick = noop;
} else if (props.callExternalState === CallExternalState.Full) {
if (props.activeConversationId != null) {
if (props.activeConversationId === conversationId) {
buttonText = i18n('icu:calling__return');
onClick = returnToActiveCall;
} else {
buttonText = i18n('icu:calling__join');
disabledTooltipText = i18n('icu:calling__in-another-call-tooltip');
onClick = noop;
}
} else if (props.deviceCount > props.maxDevices) {
buttonText = i18n('icu:calling__call-is-full');
disabledTooltipText = i18n(
'icu:calling__call-notification__button__call-full-tooltip',
@ -146,13 +144,11 @@ function renderCallingNotificationButton(
}
);
onClick = noop;
} else if (props.callExternalState === CallExternalState.Active) {
} else {
buttonText = i18n('icu:calling__join');
onClick = () => {
startCallingLobby({ conversationId, isVideoCall: true });
};
} else {
throw missingCaseError(props.callExternalState);
}
break;
}