From 5c377ba01d241bbf65c77ca3192f0449c7bd786b Mon Sep 17 00:00:00 2001 From: Timo <16718859+toger5@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:26:09 +0200 Subject: [PATCH 1/5] Dont ignore rest of url (#1555) Signed-off-by: Timo K --- src/e2ee/sharedKeyManagement.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2ee/sharedKeyManagement.ts b/src/e2ee/sharedKeyManagement.ts index 2af0b463..e22d3269 100644 --- a/src/e2ee/sharedKeyManagement.ts +++ b/src/e2ee/sharedKeyManagement.ts @@ -59,7 +59,7 @@ export const useManageRoomSharedKey = (roomId: string): string | null => { if (password !== e2eeSharedKey) return; const [hashStart, passwordStart] = hash.split(PASSWORD_STRING); - const hashEnd = passwordStart.split("&")[1]; + const hashEnd = passwordStart.split("&").slice(1).join("&"); location.replace((hashStart ?? "") + (hashEnd ?? "")); }, [password, e2eeSharedKey]); From 9ca2573c0f81c35aa8d20472d257362a433d136b Mon Sep 17 00:00:00 2001 From: Vri Date: Wed, 20 Sep 2023 10:17:47 +0000 Subject: [PATCH 2/5] Translated using Weblate (German) Currently translated at 100.0% (123 of 123 strings) Translation: Element Call/element-call Translate-URL: https://translate.element.io/projects/element-call/element-call/de/ --- public/locales/de/app.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/locales/de/app.json b/public/locales/de/app.json index 01115be0..1b6faa61 100644 --- a/public/locales/de/app.json +++ b/public/locales/de/app.json @@ -119,5 +119,7 @@ "Back to recents": "Zurück zu kürzlichen Anrufen", "Select app": "App auswählen", "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 Verschlüsselungsschlüssel verwenden." } From 28315f237ae48817080366a0e8383e5f6b0489aa Mon Sep 17 00:00:00 2001 From: random Date: Wed, 20 Sep 2023 14:06:04 +0000 Subject: [PATCH 3/5] Translated using Weblate (Italian) Currently translated at 100.0% (123 of 123 strings) Translation: Element Call/element-call Translate-URL: https://translate.element.io/projects/element-call/element-call/it/ --- public/locales/it/app.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/locales/it/app.json b/public/locales/it/app.json index 41e80f4e..38188f72 100644 --- a/public/locales/it/app.json +++ b/public/locales/it/app.json @@ -119,5 +119,7 @@ "Stop video": "Ferma video", "Unmute microphone": "Riaccendi il microfono", "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." } From 12bd7f8bff90eec2f821d5476efe2b76e4b25e00 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Wed, 20 Sep 2023 15:26:46 +0000 Subject: [PATCH 4/5] Translated using Weblate (German) Currently translated at 99.1% (123 of 124 strings) Translation: Element Call/element-call Translate-URL: https://translate.element.io/projects/element-call/element-call/de/ --- public/locales/de/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales/de/app.json b/public/locales/de/app.json index 1b6faa61..c52d27b8 100644 --- a/public/locales/de/app.json +++ b/public/locales/de/app.json @@ -121,5 +121,5 @@ "Mute microphone": "Mikrofon deaktivieren", "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 Verschlüsselungsschlüssel verwenden." + "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." } From 850cae9dfa08b3fd7a9710a5ab32f54c3cf21a3a Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Sep 2023 16:31:45 +0100 Subject: [PATCH 5/5] Revert "fix url by providin a last & (#1550)" This reverts commit 54e6fd4c073d75dc5866fc1e5058f11b1614171e. --- src/room/AppSelectionModal.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/room/AppSelectionModal.tsx b/src/room/AppSelectionModal.tsx index 6a9172dc..80e2871b 100644 --- a/src/room/AppSelectionModal.tsx +++ b/src/room/AppSelectionModal.tsx @@ -63,9 +63,7 @@ export const AppSelectionModal: FC = ({ roomId }) => { }); const result = new URL("element://call"); - // Everything after the last & stripped away making us loose the last param. Most likely while removing the pwd. - // TODO fix the pwd removal function (or wherever this happens) to not delete everything after the last &. - result.searchParams.set("url", url.toString() + "&"); + result.searchParams.set("url", url.toString()); return result.toString(); }, [roomId, roomSharedKey]);