Abstract electron download path behind an opaque ID (#20271)

element-hq · Dec 21, 2021 · 211f480 · 211f480
1 parent 30cb0ae
commit 211f480
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
@@ -32,7 +32,7 @@ type ElectronChannel =
     "setBadgeCount" |
     "update-downloaded" |
     "userDownloadCompleted" |
-    "userDownloadOpen";
+    "userDownloadAction";
 
 declare global {
     interface Window {

diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
@@ -258,14 +258,18 @@ export default class ElectronPlatform extends VectorBasePlatform {
             dis.fire(Action.ViewUserSettings);
         });
 
-        electron.on('userDownloadCompleted', (ev, { path, name }) => {
-            const key = `DOWNLOAD_TOAST_${path}`;
+        electron.on('userDownloadCompleted', (ev, { id, name }) => {
+            const key = `DOWNLOAD_TOAST_${id}`;
 
             const onAccept = () => {
-                electron.send('userDownloadOpen', { path });
+                electron.send('userDownloadAction', { id, open: true });
                 ToastStore.sharedInstance().dismissToast(key);
             };
 
+            const onDismiss = () => {
+                electron.send('userDownloadAction', { id });
+            };
+
             ToastStore.sharedInstance().addOrReplaceToast({
                 key,
                 title: _t("Download Completed"),
@@ -274,6 +278,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
                     acceptLabel: _t("Open"),
                     onAccept,
                     dismissLabel: _t("Dismiss"),
+                    onDismiss,
                     numSeconds: 10,
                 },
                 component: GenericExpiringToast,