From c6e6248cd64dfe5d766df03ffa2cb58ca8667c04 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 15 Nov 2023 14:44:58 +0000
Subject: [PATCH] Don't rotate keys if not managing media keys (#3877)

This could have caused weirdness in non per-user key calling mode.
---
 src/matrixrtc/MatrixRTCSession.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/matrixrtc/MatrixRTCSession.ts b/src/matrixrtc/MatrixRTCSession.ts
index 86f53bc94..faf7acc65 100644
--- a/src/matrixrtc/MatrixRTCSession.ts
+++ b/src/matrixrtc/MatrixRTCSession.ts
@@ -578,7 +578,7 @@ export class MatrixRTCSession extends TypedEventEmitter<MatrixRTCSessionEvent, M
         const isMyMembership = (m: CallMembership): boolean =>
             m.sender === this.client.getUserId() && m.deviceId === this.client.getDeviceId();
 
-        if (this.isJoined() && this.makeNewKeyTimeout === undefined) {
+        if (this.manageMediaKeys && this.isJoined() && this.makeNewKeyTimeout === undefined) {
             const oldMebershipIds = new Set(
                 oldMemberships.filter((m) => !isMyMembership(m)).map(getParticipantIdFromMembership),
             );
@@ -782,6 +782,8 @@ export class MatrixRTCSession extends TypedEventEmitter<MatrixRTCSessionEvent, M
     }
 
     private onRotateKeyTimeout = (): void => {
+        if (!this.manageMediaKeys) return;
+
         this.makeNewKeyTimeout = undefined;
         logger.info("Making new sender key for key rotation");
         this.makeNewSenderKey(true);