rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also use return value password in the other hook

Browse Source
This commit is contained in:
David Baker
2023-09-20 17:40:37 +01:00
parent ed0059c898
commit cbf27fc887
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/e2ee/sharedKeyManagement.ts
View File

@@ -63,7 +63,7 @@ export const useRoomSharedKey = (roomId: string): string | null => {
export const useManageRoomSharedKey = (roomId: string): string | null => { export const useManageRoomSharedKey = (roomId: string): string | null => {
const urlParams = useUrlParams(); const urlParams = useUrlParams();
useKeyFromUrl(roomId); const urlPassword = useKeyFromUrl(roomId);
const [e2eeSharedKey] = useInternalRoomSharedKey(roomId); const [e2eeSharedKey] = useInternalRoomSharedKey(roomId);
@@ -80,7 +80,7 @@ export const useManageRoomSharedKey = (roomId: string): string | null => {
location.replace((hashStart ?? "") + (hashEnd ?? "")); location.replace((hashStart ?? "") + (hashEnd ?? ""));
}, [urlParams, e2eeSharedKey]); }, [urlParams, e2eeSharedKey]);
return e2eeSharedKey; return e2eeSharedKey ?? urlPassword;
}; };
export const useIsRoomE2EE = (roomId: string): boolean | null => { export const useIsRoomE2EE = (roomId: string): boolean | null => {