mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2026-05-08 08:58:38 +01:00
Show connecting state before ringing for direct calls
This commit is contained in:
@@ -365,6 +365,7 @@ export function CallScreen({
|
||||
|
||||
let isRinging: boolean;
|
||||
let hasCallStarted: boolean;
|
||||
let isConnecting: boolean;
|
||||
let isConnected: boolean;
|
||||
let participantCount: number;
|
||||
let conversationsByDemuxId: ConversationsByDemuxIdType;
|
||||
@@ -372,10 +373,11 @@ export function CallScreen({
|
||||
|
||||
switch (activeCall.callMode) {
|
||||
case CallMode.Direct: {
|
||||
isRinging =
|
||||
activeCall.callState === CallState.Prering ||
|
||||
activeCall.callState === CallState.Ringing;
|
||||
hasCallStarted = !isRinging;
|
||||
isConnecting = activeCall.callState === CallState.Prering;
|
||||
isRinging = activeCall.callState === CallState.Ringing;
|
||||
hasCallStarted =
|
||||
activeCall.callState !== CallState.Prering &&
|
||||
activeCall.callState !== CallState.Ringing;
|
||||
isConnected = activeCall.callState === CallState.Accepted;
|
||||
participantCount = isConnected ? 2 : 0;
|
||||
conversationsByDemuxId = new Map();
|
||||
@@ -394,6 +396,8 @@ export function CallScreen({
|
||||
|
||||
isConnected =
|
||||
activeCall.connectionState === GroupCallConnectionState.Connected;
|
||||
isConnecting =
|
||||
activeCall.connectionState === GroupCallConnectionState.Connecting;
|
||||
break;
|
||||
default:
|
||||
throw missingCaseError(activeCall);
|
||||
@@ -644,6 +648,9 @@ export function CallScreen({
|
||||
const raisedHandsCount: number = raisedHands?.size ?? 0;
|
||||
|
||||
const callStatus: ReactNode | string = React.useMemo(() => {
|
||||
if (isConnecting) {
|
||||
return i18n('icu:outgoingCallConnecting');
|
||||
}
|
||||
if (isRinging) {
|
||||
return i18n('icu:outgoingCallRinging');
|
||||
}
|
||||
@@ -672,6 +679,7 @@ export function CallScreen({
|
||||
return null;
|
||||
}, [
|
||||
i18n,
|
||||
isConnecting,
|
||||
isRinging,
|
||||
isConnected,
|
||||
activeCall.callMode,
|
||||
|
||||
Reference in New Issue
Block a user