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

Fix calls to PNI

Browse source
This commit is contained in:
Fedor Indutny 2024-02-27 17:34:50 -08:00 • committed by GitHub
parent e3dbcc1e0f
commit abad547c32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ts/services/calling.ts
View file

@ -127,6 +127,7 @@ import {
} from '../util/callDisposition'; } from '../util/callDisposition';
import { isNormalNumber } from '../util/isNormalNumber'; import { isNormalNumber } from '../util/isNormalNumber';
import { LocalCallEvent } from '../types/CallDisposition'; import { LocalCallEvent } from '../types/CallDisposition';
import { isServiceIdString } from '../types/ServiceId';
import { isInSystemContacts } from '../util/isInSystemContacts'; import { isInSystemContacts } from '../util/isInSystemContacts';
import { import {
getRoomIdFromRootKey, getRoomIdFromRootKey,
@ -2287,7 +2288,10 @@ export class CallingClass {
Boolean(message.offer); Boolean(message.offer);
try { try {
assertDev(isAciString(remoteUserId), 'remoteUserId is not a aci'); assertDev(
isServiceIdString(remoteUserId),
'remoteUserId is not a service id'
);
const result = await handleMessageSend( const result = await handleMessageSend(
window.textsecure.messaging.sendCallingMessage( window.textsecure.messaging.sendCallingMessage(
remoteUserId, remoteUserId,

6
ts/state/smart/CallManager.tsx
View file

@ -27,7 +27,6 @@ import type {
ConversationsByDemuxIdType, ConversationsByDemuxIdType,
GroupCallRemoteParticipantType, GroupCallRemoteParticipantType,
} from '../../types/Calling'; } from '../../types/Calling';
import { isAciString } from '../../util/isAciString';
import type { AciString } from '../../types/ServiceId'; import type { AciString } from '../../types/ServiceId';
import { CallMode, CallState } from '../../types/Calling'; import { CallMode, CallState } from '../../types/Calling';
import type { CallLinkType } from '../../types/CallLink'; import type { CallLinkType } from '../../types/CallLink';
@ -194,11 +193,6 @@ const mapStateToActiveCallProp = (
return; return;
} }
strictAssert(
isAciString(conversation.serviceId),
'Conversation must have aci'
);
return { return {
...baseResult, ...baseResult,
callEndedReason: call.callEndedReason, callEndedReason: call.callEndedReason,