From 525ebe58d620c7e74521a39354d1cf6cab7efd94 Mon Sep 17 00:00:00 2001 From: Timo K Date: Mon, 22 Apr 2024 20:02:18 +0200 Subject: [PATCH] remove error for unencrypted calls (allow intentional unencrypted calls) Signed-off-by: Timo K --- src/room/GroupCallView.tsx | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/room/GroupCallView.tsx b/src/room/GroupCallView.tsx index a5d756af..a3fe1dbd 100644 --- a/src/room/GroupCallView.tsx +++ b/src/room/GroupCallView.tsx @@ -29,7 +29,7 @@ import { useTranslation } from "react-i18next"; import type { IWidgetApiRequest } from "matrix-widget-api"; import { widget, ElementWidgetActions, JoinCallData } from "../widget"; -import { ErrorView, FullScreenView } from "../FullScreenView"; +import { FullScreenView } from "../FullScreenView"; import { LobbyView } from "./LobbyView"; import { MatrixInfo } from "./VideoPreview"; import { CallEndedView } from "./CallEndedView"; @@ -291,23 +291,8 @@ export const GroupCallView: FC = ({ const { t } = useTranslation(); - if (e2eeSystem.kind === E2eeType.NONE && !widget) { - // the url wants encryption, but we don't have a encryption system. (e.g. when joining a call without password) - // TODO: we need to figure out what we do with encryption going forward. - // In the SPA a room is unencrypted but uses a shared secret for the call (since we distribute via url that works) - // In embedded mode unencrypted rooms would make most sense to also call unencrypted. - // A call where one person joins with the spa and another person with the widget would be a problem. - return ( - - ); - } else if (!isE2EESupportedBrowser()) { - // and we have a encryption system. + if (!isE2EESupportedBrowser() && e2eeSystem.kind !== E2eeType.NONE) { + // If we have a encryption system but the browser does not support it. return ( {t("browser_media_e2ee_unsupported_heading")}