From abb80b0d31b3ecf49e4a3bee733e6feec9d4c262 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 6 Oct 2023 18:24:39 +0100
Subject: [PATCH] Decode passwords as buffers if we can

---
 src/livekit/useLiveKit.ts  | 2 +-
 src/room/GroupCallView.tsx | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/livekit/useLiveKit.ts b/src/livekit/useLiveKit.ts
index bf12669c..0fea2198 100644
--- a/src/livekit/useLiveKit.ts
+++ b/src/livekit/useLiveKit.ts
@@ -41,7 +41,7 @@ import {
 } from "./useECConnectionState";
 
 export type E2EEConfig = {
-  sharedKey: string;
+  sharedKey: Uint8Array | string;
 };
 
 interface UseLivekitResult {
diff --git a/src/room/GroupCallView.tsx b/src/room/GroupCallView.tsx
index d238176e..905b1b52 100644
--- a/src/room/GroupCallView.tsx
+++ b/src/room/GroupCallView.tsx
@@ -45,6 +45,7 @@ import { useRoomAvatar } from "./useRoomAvatar";
 import { useRoomName } from "./useRoomName";
 import { useJoinRule } from "./useJoinRule";
 import { InviteModal } from "./InviteModal";
+import { useE2eeConfig } from "../useE2eeConfig";
 
 declare global {
   interface Window {
@@ -254,10 +255,7 @@ export function GroupCallView({
 
   const [e2eeEnabled] = useEnableE2EE();
 
-  const e2eeConfig = useMemo(
-    () => (e2eeSharedKey ? { sharedKey: e2eeSharedKey } : undefined),
-    [e2eeSharedKey]
-  );
+  const e2eeConfig = useE2eeConfig(e2eeSharedKey);
 
   const onReconnect = useCallback(() => {
     setLeft(false);