diff --git a/package.json b/package.json index c910be647..84316073c 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "@react-spring/web": "9.5.5", "@signalapp/better-sqlite3": "8.4.3", "@signalapp/libsignal-client": "0.29.1", - "@signalapp/ringrtc": "2.29.1", + "@signalapp/ringrtc": "2.30.0", "@types/fabric": "4.5.3", "backbone": "1.4.0", "blob-util": "2.0.2", diff --git a/ts/services/calling.ts b/ts/services/calling.ts index a9af59f2e..de052381f 100644 --- a/ts/services/calling.ts +++ b/ts/services/calling.ts @@ -994,6 +994,8 @@ export class CallingClass { return GroupCallJoinState.NotJoined; case JoinState.Joining: return GroupCallJoinState.Joining; + case JoinState.Pending: + return GroupCallJoinState.Pending; case JoinState.Joined: return GroupCallJoinState.Joined; default: diff --git a/ts/types/Calling.ts b/ts/types/Calling.ts index a76e14043..b39be2360 100644 --- a/ts/types/Calling.ts +++ b/ts/types/Calling.ts @@ -127,7 +127,8 @@ export enum GroupCallConnectionState { export enum GroupCallJoinState { NotJoined = 0, Joining = 1, - Joined = 2, + Pending = 2, + Joined = 3, } export type GroupCallRemoteParticipantType = ConversationType & { diff --git a/ts/util/callDisposition.ts b/ts/util/callDisposition.ts index 08c4d24f0..389ab7372 100644 --- a/ts/util/callDisposition.ts +++ b/ts/util/callDisposition.ts @@ -348,7 +348,10 @@ export function getLocalCallEventFromGroupCall( if (localDeviceState.joinState === JoinState.NotJoined) { return null; // Group calls shouldn't send "NotAccepted" } - if (localDeviceState.joinState === JoinState.Joining) { + if ( + localDeviceState.joinState === JoinState.Joining || + localDeviceState.joinState === JoinState.Pending + ) { return LocalCallEvent.Accepted; } throw missingCaseError(localDeviceState.joinState); diff --git a/yarn.lock b/yarn.lock index 0982f56a0..779205e01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3365,10 +3365,10 @@ ws "^8.4.2" zod "^3.20.2" -"@signalapp/ringrtc@2.29.1": - version "2.29.1" - resolved "https://registry.yarnpkg.com/@signalapp/ringrtc/-/ringrtc-2.29.1.tgz#db5ccc6ee975c75091933e60bde536fe80b550fd" - integrity sha512-i03NAUwDMdEsfJh8Or8SyLCfTvDzlmxSc1kriZgyIY9SUv9dO8jN0F1X9TEJ2WGQbq7n9squPuiDm3wrPjmEtQ== +"@signalapp/ringrtc@2.30.0": + version "2.30.0" + resolved "https://registry.yarnpkg.com/@signalapp/ringrtc/-/ringrtc-2.30.0.tgz#9f865006e10fcc905fd901a8d095ff66b8afc907" + integrity sha512-AsQOk+wMxGbX8YAVP66fguQ7W5N7MVdGJxIeQLvPHpTd9SFNSwNZSim0u4PRxc6ebYU8wXxrupJSOqqEcA+q0A== dependencies: tar "^6.1.0"