tests

src/state/CallViewModel.ts

@@ -176,7 +176,6 @@ class UserMedia {
     member: RoomMember | undefined,
     participant: LocalParticipant | RemoteParticipant | undefined,
     encryptionSystem: EncryptionSystem,
-    rtcSession: MatrixRTCSession,
   ) {
     this.participant = new BehaviorSubject(participant);
 
@@ -186,7 +185,6 @@ class UserMedia {
         member,
         this.participant.asObservable() as Observable<LocalParticipant>,
         encryptionSystem,
-        rtcSession,
       );
     } else {
       this.vm = new RemoteUserMediaViewModel(
@@ -196,7 +194,6 @@ class UserMedia {
           RemoteParticipant | undefined
         >,
         encryptionSystem,
-        rtcSession,
       );
     }
 
@@ -440,7 +437,6 @@ export class CallViewModel extends ViewModel {
                       member,
                       participant,
                       this.encryptionSystem,
-                      this.matrixRTCSession,
                     ),
                 ];
               }
@@ -494,7 +490,6 @@ export class CallViewModel extends ViewModel {
                             undefined,
                             participant,
                             this.encryptionSystem,
-                            this.matrixRTCSession,
                           ),
                       ];
                     }

src/state/MediaViewModel.ts

@@ -37,7 +37,6 @@ import {
   switchMap,
 } from "rxjs";
 import { useEffect } from "react";
-import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
 
 import { ViewModel } from "./ViewModel";
 import { useReactiveState } from "../useReactiveState";
@@ -206,7 +205,6 @@ abstract class BaseUserMediaViewModel extends BaseMediaViewModel {
     member: RoomMember | undefined,
     participant: Observable<LocalParticipant | RemoteParticipant | undefined>,
     encryptionSystem: EncryptionSystem,
-    rtcSession: MatrixRTCSession,
   ) {
     super(
       id,
@@ -217,19 +215,6 @@ abstract class BaseUserMediaViewModel extends BaseMediaViewModel {
       Track.Source.Camera,
     );
 
-    // rtcSession.on(
-    //   MatrixRTCSessionEvent.EncryptionKeyChanged,
-    //   (key, index, participantId) => {
-    //     if (id.startsWith(participantId))
-    //       logger.info("got new keys: ", participant, { index, key });
-    //     logger.info("All keys for participant ", participant, " - ", [
-    //       ...this.keys.value,
-    //       { index, key },
-    //     ]);
-    //     this.keys.next([...this.keys.value, { index, key }]);
-    //   },
-    // );
-
     const media = participant.pipe(
       switchMap((p) => (p && observeParticipantMedia(p)) ?? of(undefined)),
       this.scope.state(),
@@ -280,9 +265,8 @@ export class LocalUserMediaViewModel extends BaseUserMediaViewModel {
     member: RoomMember | undefined,
     participant: Observable<LocalParticipant | undefined>,
     encryptionSystem: EncryptionSystem,
-    rtcSession: MatrixRTCSession,
   ) {
-    super(id, member, participant, encryptionSystem, rtcSession);
+    super(id, member, participant, encryptionSystem);
   }
 }
 
@@ -341,9 +325,8 @@ export class RemoteUserMediaViewModel extends BaseUserMediaViewModel {
     member: RoomMember | undefined,
     participant: Observable<RemoteParticipant | undefined>,
     encryptionSystem: EncryptionSystem,
-    rtcSession: MatrixRTCSession,
   ) {
-    super(id, member, participant, encryptionSystem, rtcSession);
+    super(id, member, participant, encryptionSystem);
 
     // Sync the local volume with LiveKit
     combineLatest([

src/utils/test.ts

@@ -15,7 +15,6 @@ import {
   RemoteTrackPublication,
   Room as LivekitRoom,
 } from "livekit-client";
-import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
 
 import {
   LocalUserMediaViewModel,
@@ -118,7 +117,6 @@ export function mockLocalParticipant(
 
 export async function withLocalMedia(
   member: Partial<RoomMember>,
-  rtcSession: MatrixRTCSession,
   continuation: (vm: LocalUserMediaViewModel) => void | Promise<void>,
 ): Promise<void> {
   const vm = new LocalUserMediaViewModel(
@@ -128,7 +126,6 @@ export async function withLocalMedia(
     {
       kind: E2eeType.PER_PARTICIPANT,
     },
-    rtcSession,
   );
   try {
     await continuation(vm);
@@ -153,7 +150,6 @@ export function mockRemoteParticipant(
 export async function withRemoteMedia(
   member: Partial<RoomMember>,
   participant: Partial<RemoteParticipant>,
-  rtcSession: MatrixRTCSession,
   continuation: (vm: RemoteUserMediaViewModel) => void | Promise<void>,
 ): Promise<void> {
   const vm = new RemoteUserMediaViewModel(
@@ -163,7 +159,6 @@ export async function withRemoteMedia(
     {
       kind: E2eeType.PER_PARTICIPANT,
     },
-    rtcSession,
   );
   try {
     await continuation(vm);