From 72fc6a46012224165c465d6437a030284f489294 Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Thu, 23 Jan 2025 18:44:54 +0100
Subject: [PATCH 1/2] chore(legacy call): Remove `DeviceInfo` usage

---
 src/webrtc/call.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts
index 6ab15d48b8..d53fb56c21 100644
--- a/src/webrtc/call.ts
+++ b/src/webrtc/call.ts
@@ -48,7 +48,6 @@ import {
 import { CallFeed } from "./callFeed.ts";
 import { MatrixClient } from "../client.ts";
 import { EventEmitterEvents, TypedEventEmitter } from "../models/typed-event-emitter.ts";
-import { DeviceInfo } from "../crypto/deviceinfo.ts";
 import { GroupCallUnknownDeviceError } from "./groupCall.ts";
 import { IScreensharingOpts } from "./mediaHandler.ts";
 import { MatrixError } from "../http-api/index.ts";
@@ -426,7 +425,7 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
     private callStartTime?: number;
 
     private opponentDeviceId?: string;
-    private opponentDeviceInfo?: DeviceInfo;
+    private hasOpponentDeviceInfo?: boolean;
     private opponentSessionId?: string;
     public groupCallId?: string;
 
@@ -633,7 +632,7 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
         // ourselves (for example if the client is a RoomWidgetClient)
         if (!this.client.getCrypto()) {
             // All we know is the device ID
-            this.opponentDeviceInfo = new DeviceInfo(this.opponentDeviceId);
+            this.hasOpponentDeviceInfo = true;
             return;
         }
         const userId = this.invitee || this.getOpponentMember()?.userId;
@@ -642,8 +641,8 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
 
         // Here we were calling `MatrixClient.crypto.deviceList.downloadKeys` which is not supported by the rust cryptography.
         const deviceInfoMap = new Map();
-        this.opponentDeviceInfo = deviceInfoMap.get(userId)?.get(this.opponentDeviceId);
-        if (this.opponentDeviceInfo === undefined) {
+        this.hasOpponentDeviceInfo = Boolean(deviceInfoMap.get(userId)?.get(this.opponentDeviceId));
+        if (!this.hasOpponentDeviceInfo) {
             throw new GroupCallUnknownDeviceError(userId);
         }
     }
@@ -2509,7 +2508,7 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
 
             const userId = this.invitee || this.getOpponentMember()!.userId;
             if (this.client.getUseE2eForGroupCall()) {
-                if (!this.opponentDeviceInfo) {
+                if (!this.hasOpponentDeviceInfo) {
                     logger.warn(`Call ${this.callId} sendVoipEvent() failed: we do not have opponentDeviceInfo`);
                     return;
                 }

From 7d51f81e22b5c9f2f5d43a857583467a5cdff712 Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Mon, 27 Jan 2025 14:46:41 +0100
Subject: [PATCH 2/2] refactor(legacy call): throw
 `GroupCallUnknownDeviceError` at the end of `initOpponentCrypto`

---
 src/webrtc/call.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts
index d53fb56c21..ac1fde665d 100644
--- a/src/webrtc/call.ts
+++ b/src/webrtc/call.ts
@@ -640,11 +640,8 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
         if (!userId) throw new Error("Couldn't find opponent user ID to init crypto");
 
         // Here we were calling `MatrixClient.crypto.deviceList.downloadKeys` which is not supported by the rust cryptography.
-        const deviceInfoMap = new Map();
-        this.hasOpponentDeviceInfo = Boolean(deviceInfoMap.get(userId)?.get(this.opponentDeviceId));
-        if (!this.hasOpponentDeviceInfo) {
-            throw new GroupCallUnknownDeviceError(userId);
-        }
+        this.hasOpponentDeviceInfo = false;
+        throw new GroupCallUnknownDeviceError(userId);
     }
 
     /**