Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-08-05 19:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'livekit' into new_url_scema

Browse Source
This commit is contained in:
Timo
2023-09-20 19:06:44 +02:00
committed by GitHub
parent 2a1208a951 fb4e0784fc
commit 02bf13e1fb
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/locales/de/app.json
View File

@@ -119,5 +119,7 @@
"Back to recents": "Zurück zu kürzlichen Anrufen", "Back to recents": "Zurück zu kürzlichen Anrufen",
"Select app": "App auswählen", "Select app": "App auswählen",
"Mute microphone": "Mikrofon deaktivieren", "Mute microphone": "Mikrofon deaktivieren",
"Start new call": "Neuen Anruf beginnen" "Start new call": "Neuen Anruf beginnen",
"Call not found": "Anruf nicht gefunden",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Anrufe sind nun Ende-zu-Ende-verschlüsselt und müssen auf der Startseite erstellt werden. Damit stellen wir sicher, dass alle denselben Schlüssel verwenden."
} }

4
public/locales/it/app.json
View File

@@ -119,5 +119,7 @@
"Stop video": "Ferma video", "Stop video": "Ferma video",
"Unmute microphone": "Riaccendi il microfono", "Unmute microphone": "Riaccendi il microfono",
"Back to recents": "Torna ai recenti", "Back to recents": "Torna ai recenti",
"Start new call": "Inizia nuova chiamata" "Start new call": "Inizia nuova chiamata",
"Call not found": "Chiamata non trovata",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Le chiamate ora sono cifrate end-to-end e devono essere create dalla pagina principale. Ciò assicura che chiunque usi la stessa chiave di crittografia."
} }

2
src/e2ee/sharedKeyManagement.ts
View File

@@ -59,7 +59,7 @@ export const useManageRoomSharedKey = (roomId: string): string | null => {
if (password !== e2eeSharedKey) return; if (password !== e2eeSharedKey) return;
const [hashStart, passwordStart] = hash.split(PASSWORD_STRING); const [hashStart, passwordStart] = hash.split(PASSWORD_STRING);
const hashEnd = passwordStart.split("&")[1]; const hashEnd = passwordStart.split("&").slice(1).join("&");
location.replace((hashStart ?? "") + (hashEnd ?? "")); location.replace((hashStart ?? "") + (hashEnd ?? ""));
}, [password, e2eeSharedKey]); }, [password, e2eeSharedKey]);

4
src/room/AppSelectionModal.tsx
View File

@@ -63,9 +63,7 @@ export const AppSelectionModal: FC<Props> = ({ roomId }) => {
}); });
const result = new URL("io.element.call:/"); const result = new URL("io.element.call:/");
// Everything after the last & stripped away making us loose the last param. Most likely while removing the pwd. result.searchParams.set("url", url.toString());
// TODO fix the pwd removal function (or wherever this happens) to not delete everything after the last &.
result.searchParams.set("url", url.toString() + "&");
return result.toString(); return result.toString();
}, [roomId, roomSharedKey]); }, [roomId, roomSharedKey]);