From 156f5b78bf132e4bb3c2197e5e7ee034c239c646 Mon Sep 17 00:00:00 2001
From: Bruno Windels <274386+bwindels@users.noreply.github.com>
Date: Mon, 11 Apr 2022 12:36:02 +0200
Subject: [PATCH] use session_id from member event to set dest_session_id

so our invite event isn't ignored by EC
---
 src/matrix/calls/callEventTypes.ts | 3 ++-
 src/matrix/calls/group/Member.ts   | 8 +-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/matrix/calls/callEventTypes.ts b/src/matrix/calls/callEventTypes.ts
index 9189911f..4726175c 100644
--- a/src/matrix/calls/callEventTypes.ts
+++ b/src/matrix/calls/callEventTypes.ts
@@ -23,7 +23,8 @@ export enum EventType {
 export const SDPStreamMetadataKey = "org.matrix.msc3077.sdp_stream_metadata";
 
 export interface CallDeviceMembership {
-    device_id: string
+    device_id: string,
+    session_id: string
 }
 
 export interface CallMembership {
diff --git a/src/matrix/calls/group/Member.ts b/src/matrix/calls/group/Member.ts
index e3b1545b..2929e26c 100644
--- a/src/matrix/calls/group/Member.ts
+++ b/src/matrix/calls/group/Member.ts
@@ -42,7 +42,6 @@ export type Options = Omit<PeerCallOptions, "emitUpdate" | "sendSignallingMessag
 export class Member {
     private peerCall?: PeerCall;
     private localMedia?: LocalMedia;
-    private destSessionId?: string;
 
     constructor(
         public readonly member: RoomMember,
@@ -116,7 +115,7 @@ export class Member {
         groupMessage.content.device_id = this.options.ownDeviceId;
         groupMessage.content.party_id = this.options.ownDeviceId;
         groupMessage.content.sender_session_id = this.options.sessionId;
-        groupMessage.content.dest_session_id = this.destSessionId!;
+        groupMessage.content.dest_session_id = this.callDeviceMembership.session_id;
         // const encryptedMessages = await this.options.encryptDeviceMessage(this.member.userId, groupMessage, log);
         // const payload = formatToDeviceMessagesPayload(encryptedMessages);
         const payload = {
@@ -145,11 +144,6 @@ export class Member {
         if (this.peerCall) {
             const prevState = this.peerCall.state;
             this.peerCall.handleIncomingSignallingMessage(message, deviceId);
-            //if (prevState !== this.peerCall.state) {
-            if (!this.destSessionId) {
-                this.destSessionId = message.content.sender_session_id;
-            }
-            //}
         } else {
             // TODO: need to buffer events until invite comes?
         }