Merge pull request #3291 from element-hq:toger5/backport-disable-device-switching-and-update-state

Backport: Disable device switching when in controlled audio devices mode
Disable device switching when in controlled audio devices mode (#3290 )
2026-08-29 21:15:19 +00:00 · 2025-05-23 17:56:49 +02:00 · 2025-05-23 17:55:28 +02:00 · 2025-05-22 14:32:12 -04:00 · 2025-05-22 14:11:46 -04:00 · 2025-05-22 13:57:06 -04:00
3 changed files with 5 additions and 7 deletions
--- a/dev-backend-docker-compose.yml
+++ b/dev-backend-docker-compose.yml
@@ -6,7 +6,7 @@ services:
    image: ghcr.io/element-hq/lk-jwt-service:latest-ci
    hostname: auth-server
    environment:
-      - LIVEKIT_JWT_PORT=8080
+      - LK_JWT_PORT=8080
      - LIVEKIT_URL=wss://matrix-rtc.m.localhost/livekit/sfu
      - LIVEKIT_KEY=devkey
      - LIVEKIT_SECRET=secret
--- a/src/settings/SettingsModal.tsx
+++ b/src/settings/SettingsModal.tsx
@@ -129,7 +129,7 @@ export const SettingsModal: FC<Props> = ({
              }
            />
          )}
-          {iosDeviceMenu && controlledAudioDevices && (
+          {iosDeviceMenu && (
            <Button
              onClick={(e): void => {
                e.preventDefault();
--- a/yarn.lock
+++ b/yarn.lock
@@ -9387,8 +9387,8 @@ __metadata:
  linkType: hard

 "livekit-client@npm:^2.13.0":
-  version: 2.13.3
-  resolution: "livekit-client@npm:2.13.3"
+  version: 2.13.0
+  resolution: "livekit-client@npm:2.13.0"
  dependencies:
    "@livekit/mutex": "npm:1.1.1"
    "@livekit/protocol": "npm:1.38.0"
@@ -9399,9 +9399,7 @@ __metadata:
    tslib: "npm:2.8.1"
    typed-emitter: "npm:^2.1.0"
    webrtc-adapter: "npm:^9.0.1"
-  peerDependencies:
-    "@types/dom-mediacapture-record": ^1
-  checksum: 10c0/9eadb9835514551c8e834cebb607999e632bc4b3b3e5d5e206db90b66e2e5467b8a1f76a03c648e00cc96c87256b4eece58dbb2b92dfcafa84f4798bbb305060
+  checksum: 10c0/b5b7b37eea56681e543d754ee5df63651e45a78462d1f0c26334f0aa525761fefc86d5ad85513e9345bbb4d6821fc95dded5f1d7c008da2b558a14905cbd9ac2
  languageName: node
  linkType: hard
Author	SHA1	Message	Date
Timo	24cb61c24b	Merge pull request #3291 from element-hq:toger5/backport-disable-device-switching-and-update-state Backport: Disable device switching when in controlled audio devices mode	2025-05-23 17:56:49 +02:00
Timo	8f424452fc	Disable device switching when in controlled audio devices mode (#3290 ) * Disable device switching when in controlled audio devices mode * Temporarily switch matrix-js-sdk to robin/embedded-no-update-state To allow us to test this change on Element X, which does not yet support the update_state action. * Also add a check for controlled audio devices in useAudioContext * use develop branch * fix tests --------- Co-authored-by: Robin <robin@robin.town>	2025-05-23 17:55:28 +02:00
Robin	c2ce1fd382	Merge pull request #3288 from element-hq/robin/backport-audio-controls Audio device controls for mobile native audio device selection	2025-05-22 14:32:12 -04:00
Robin	52895ed599	Audio device controls for mobile native audio device selection Backport of `0971a15c40`.	2025-05-22 14:11:46 -04:00
Robin	0719320ceb	Merge pull request #3286 from element-hq/robin/backport-reset-develop Reset to develop branch of matrix-js-sdk	2025-05-22 13:57:06 -04:00
Robin	593a50289a	Reset to develop branch of matrix-js-sdk Now that the toger5/add-room-key-fallback-on-encryption-manager-not-supported branch has been merged, we can reset to develop. (And need to, actually, because that branch is deleted.)	2025-05-22 13:12:23 -04:00
Robin	60881d7b11	Merge pull request #3281 from element-hq/robin/backport-reintroduce-update-state Improve the reliability of state changes in widget mode	2025-05-21 14:36:24 -04:00
Robin	5f65c51cf3	Reference matrix-js-sdk by branch name Rather than by commit, which makes it hard to tell whether we're using mainline matrix-js-sdk or not.	2025-05-21 14:27:15 -04:00
Robin	4876bddea4	Update matrix-widget-api to support update_state action	2025-05-21 14:27:15 -04:00
Robin	a5a737f830	Update matrix-js-sdk to support update_state action	2025-05-21 14:27:15 -04:00