From abf683f2754f4950568a72eccb28f3e3560e949c Mon Sep 17 00:00:00 2001 From: Timo Date: Fri, 16 May 2025 15:23:44 +0200 Subject: [PATCH] Hide the input list on both, android+ios. This will now be decided based on controlled media devices. --- src/UrlParams.ts | 3 +-- src/settings/SettingsModal.tsx | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/UrlParams.ts b/src/UrlParams.ts index 66dce22f..c9100e99 100644 --- a/src/UrlParams.ts +++ b/src/UrlParams.ts @@ -284,8 +284,7 @@ export const getUrlParams = ( fontScale: Number.isNaN(fontScale) ? null : fontScale, allowIceFallback: parser.getFlagParam("allowIceFallback"), perParticipantE2EE: parser.getFlagParam("perParticipantE2EE"), - // TODO this should not default to true! - controlledOutput: parser.getFlagParam("controlledMediaDevices", true), + controlledOutput: parser.getFlagParam("controlledMediaDevices"), skipLobby: parser.getFlagParam( "skipLobby", isWidget && intent === UserIntent.StartNewCall, diff --git a/src/settings/SettingsModal.tsx b/src/settings/SettingsModal.tsx index 519a48ed..548b481e 100644 --- a/src/settings/SettingsModal.tsx +++ b/src/settings/SettingsModal.tsx @@ -36,6 +36,7 @@ import { useTrackProcessor } from "../livekit/TrackProcessorContext"; import { DeveloperSettingsTab } from "./DeveloperSettingsTab"; import { FieldRow, InputField } from "../input/Input"; import { useSubmitRageshake } from "./submit-rageshake"; +import { useUrlParams } from "../UrlParams"; type SettingsTab = | "audio" @@ -103,7 +104,10 @@ export const SettingsModal: FC = ({ const [showDeveloperSettingsTab] = useSetting(developerMode); const { available: isRageshakeAvailable } = useSubmitRageshake(); + // If we are on ios we will show a button to open the native picker. const iosDeviceMenu = useObservableEagerState(iosDeviceMenu$); + // In controlled devices we will not show the input section + const { controlledOutput } = useUrlParams(); const audioTab: Tab = { key: "audio", @@ -111,7 +115,7 @@ export const SettingsModal: FC = ({ content: ( <>
- {!iosDeviceMenu && ( + {!controlledOutput && (