Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #306 from vector-im/bwindels/prevent-reload-on-notif-click

Browse source 
Fix reloading or opening wrong page when clicking notif
This commit is contained in:
Bruno Windels 2021-03-31 14:55:06 +00:00 committed by GitHub
commit 5a54eda512
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/platform/web/dom/ServiceWorkerHandler.js
View file

@ -76,6 +76,8 @@ export class ServiceWorkerHandler {
// this flag is read in fetch.js // this flag is read in fetch.js
this.haltRequests = true; this.haltRequests = true;
event.source.postMessage({replyTo: data.id}); event.source.postMessage({replyTo: data.id});
} else if (data.type === "openRoom") {
this._navigation.push("room", data.payload.roomId);
} }
} }

5
src/platform/web/service-worker.js
View file

@ -196,13 +196,13 @@ async function openClientFromNotif(event) {
const {sessionId, roomId} = event.notification.data; const {sessionId, roomId} = event.notification.data;
const sessionHash = `#/session/${sessionId}`; const sessionHash = `#/session/${sessionId}`;
const roomHash = `${sessionHash}/room/${roomId}`; const roomHash = `${sessionHash}/room/${roomId}`;
const roomURL = `/${roomHash}`;
const clientWithSession = await findClient(async client => { const clientWithSession = await findClient(async client => {
return await sendAndWaitForReply(client, "hasSessionOpen", {sessionId}); return await sendAndWaitForReply(client, "hasSessionOpen", {sessionId});
}); });
if (clientWithSession) { if (clientWithSession) {
console.log("notificationclick: client has session open, showing room there"); console.log("notificationclick: client has session open, showing room there");
clientWithSession.navigate(roomURL); // use a message rather than clientWithSession.navigate here as this refreshes the page on chrome
clientWithSession.postMessage({type: "openRoom", payload: {roomId}});
if ('focus' in clientWithSession) { if ('focus' in clientWithSession) {
try { try {
await clientWithSession.focus(); await clientWithSession.focus();
@ -210,6 +210,7 @@ async function openClientFromNotif(event) {
} }
} else if (self.clients.openWindow) { } else if (self.clients.openWindow) {
console.log("notificationclick: no client found with session open, opening new window"); console.log("notificationclick: no client found with session open, opening new window");
const roomURL = new URL(`./${roomHash}`, baseURL).href;
await self.clients.openWindow(roomURL); await self.clients.openWindow(roomURL);
} }
} }