From bfad85a3af36fe35a25ab4cc83091b003dbceda8 Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Fri, 2 Oct 2026 14:49:44 +0200
Subject: [PATCH] Remove wait_for_key_rotation_ms config option

I learned that makeKeyDelay has been deprecated in matrix-js-sdk ever since the switch to the new encryption manager, so this config option has no effect.
---
 config/config.devenv.json                          |  1 -
 config/config.sample.json                          |  1 -
 config/config_netlify_preview.json                 |  1 -
 config/config_netlify_preview_sdk.json             |  1 -
 src/config/ConfigOptions.ts                        |  6 ------
 src/state/CallViewModel/localMember/LocalMember.ts |  1 -
 vite-embedded.config.ts                            | 14 --------------
 7 files changed, 25 deletions(-)

diff --git a/config/config.devenv.json b/config/config.devenv.json
index 294209a67..b78314d3c 100644
--- a/config/config.devenv.json
+++ b/config/config.devenv.json
@@ -7,7 +7,6 @@
   },
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
   "matrix_rtc_session": {
-    "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 180000000,
     "network_error_retry_ms": 100
   }
diff --git a/config/config.sample.json b/config/config.sample.json
index 9f7ab61ac..387c0a3dc 100644
--- a/config/config.sample.json
+++ b/config/config.sample.json
@@ -11,7 +11,6 @@
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
   "matrix_rtc_mode": "compatibility",
   "matrix_rtc_session": {
-    "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 180000000,
     "network_error_retry_ms": 100
   }
diff --git a/config/config_netlify_preview.json b/config/config_netlify_preview.json
index 179177bac..f8e4fc53c 100644
--- a/config/config_netlify_preview.json
+++ b/config/config_netlify_preview.json
@@ -7,7 +7,6 @@
   },
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
   "matrix_rtc_session": {
-    "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 180000000,
     "network_error_retry_ms": 100
   },
diff --git a/config/config_netlify_preview_sdk.json b/config/config_netlify_preview_sdk.json
index fa60fe8d4..77d885ea0 100644
--- a/config/config_netlify_preview_sdk.json
+++ b/config/config_netlify_preview_sdk.json
@@ -7,7 +7,6 @@
   },
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
   "matrix_rtc_session": {
-    "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 180000000,
     "network_error_retry_ms": 100
   }
diff --git a/src/config/ConfigOptions.ts b/src/config/ConfigOptions.ts
index 872e35168..5d18695a9 100644
--- a/src/config/ConfigOptions.ts
+++ b/src/config/ConfigOptions.ts
@@ -207,12 +207,6 @@ export interface ConfigOptions {
    * Take care when changing these options.
    */
   matrix_rtc_session?: {
-    /**
-     * How long (in milliseconds) to wait before rotating end-to-end media encryption keys
-     * when someone leaves a call.
-     */
-    wait_for_key_rotation_ms?: number;
-
     /**
      * How long we wait before retrying after a network error on any of the requests.
      */
diff --git a/src/state/CallViewModel/localMember/LocalMember.ts b/src/state/CallViewModel/localMember/LocalMember.ts
index 5af8eb016..feb49554c 100644
--- a/src/state/CallViewModel/localMember/LocalMember.ts
+++ b/src/state/CallViewModel/localMember/LocalMember.ts
@@ -1004,7 +1004,6 @@ export function enterRTCSession(
     delayedLeaveEventRestartLocalTimeoutMs:
       delayedLeaveTimings.restart_timeout_ms,
     networkErrorRetryMs: sessionConfig.network_error_retry_ms,
-    makeKeyDelay: sessionConfig.wait_for_key_rotation_ms,
     membershipEventExpiryMs: sessionConfig.membership_event_expiry_ms,
     keyRotationParticipantLimit: sessionConfig.key_rotation_participant_limit,
     unstableSendStickyEvents: matrixRTCMode === MatrixRTCMode.Matrix_2_0,
diff --git a/vite-embedded.config.ts b/vite-embedded.config.ts
index 36f2779b2..322adbc0a 100644
--- a/vite-embedded.config.ts
+++ b/vite-embedded.config.ts
@@ -6,7 +6,6 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { defineConfig, mergeConfig } from "vite";
-import generateFile from "vite-plugin-generate-file";
 
 import fullConfig from "./vite.config.ts";
 
@@ -19,19 +18,6 @@ export default defineConfig((env) =>
     defineConfig({
       base, // Use relative URLs to allow the app to be hosted under any path
       publicDir: false, // Don't serve the public directory which only contains the favicon
-      plugins: [
-        generateFile([
-          {
-            type: "json",
-            output: "./config.json",
-            data: {
-              matrix_rtc_session: {
-                wait_for_key_rotation_ms: 5000,
-              },
-            },
-          },
-        ]),
-      ],
     }),
   ),
 );