@bobfrankston/rmfmail 1.1.230 → 1.1.231

package/client/app.bundle.js

@@ -600,9 +600,9 @@ function setupAccount(name, email, password) {
 async function getAttachment(accountId, uid, attachmentId, folderId) {
   return ipc().getAttachment(accountId, uid, attachmentId, folderId);
 }
-async function openAttachment(accountId, uid, attachmentId, folderId) {
+async function openAttachment(accountId, uid, attachmentId, folderId, filename) {
   const fn = ipc().openAttachment;
-  return fn ? fn(accountId, uid, attachmentId, folderId) : void 0;
+  return fn ? fn(accountId, uid, attachmentId, folderId, filename) : void 0;
 }
 async function getDeviceAccounts() {
   return ipc().getDeviceAccounts?.() ?? [];
@@ -1816,14 +1816,30 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
       attEl.hidden = false;
       const saveAttachmentAt = async (idx) => {
         const a0 = msg.attachments[idx];
+        const name = a0.filename || "attachment";
         try {
-          const data = await getAttachment(accountId, uid, idx, msg.folderId);
+          const data = await getAttachment(accountId, uid, a0.id, msg.folderId);
           const bytes = Uint8Array.from(atob(data.content), (c) => c.charCodeAt(0));
           const blob = new Blob([bytes], { type: data.contentType || "application/octet-stream" });
+          const picker = window.showSaveFilePicker;
+          if (typeof picker === "function") {
+            let handle;
+            try {
+              handle = await picker({ suggestedName: name });
+            } catch (e) {
+              if (e?.name === "AbortError")
+                return;
+              throw e;
+            }
+            const writable = await handle.createWritable();
+            await writable.write(blob);
+            await writable.close();
+            return;
+          }
           const url = URL.createObjectURL(blob);
           const a = document.createElement("a");
           a.href = url;
-          a.download = a0.filename || "attachment";
+          a.download = name;
           a.style.display = "none";
           document.body.appendChild(a);
           a.click();
@@ -1832,7 +1848,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
             URL.revokeObjectURL(url);
           }, 5e3);
         } catch (err) {
-          window.dispatchEvent(new CustomEvent("mailx-alert", { detail: { message: `Couldn't save "${a0.filename}": ${err?.message || err}`, key: "attachment-save" } }));
+          window.dispatchEvent(new CustomEvent("mailx-alert", { detail: { message: `Couldn't save "${name}": ${err?.message || err}`, key: "attachment-save" } }));
         }
       };
       const saveAllAttachments = async () => {
@@ -1866,14 +1882,14 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
           try {
             const bridge = window._nativeBridge;
             if (bridge?.openAttachment) {
-              const data2 = await getAttachment(accountId, uid, i, msg.folderId);
+              const data2 = await getAttachment(accountId, uid, att.id, msg.folderId);
               await bridge.openAttachment(att.filename, data2.contentType, data2.content);
               return;
             }
-            const res = await openAttachment(accountId, uid, i, msg.folderId);
+            const res = await openAttachment(accountId, uid, att.id, msg.folderId, att.filename);
             if (res)
               return;
-            const data = await getAttachment(accountId, uid, i, msg.folderId);
+            const data = await getAttachment(accountId, uid, att.id, msg.folderId);
             const bytes = Uint8Array.from(atob(data.content), (c) => c.charCodeAt(0));
             const blob = new Blob([bytes], { type: data.contentType });
             const url = URL.createObjectURL(blob);
@@ -1900,7 +1916,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
           if (!e.dataTransfer)
             return;
           try {
-            const data = await getAttachment(accountId, uid, i, msg.folderId);
+            const data = await getAttachment(accountId, uid, att.id, msg.folderId);
             const bytes = Uint8Array.from(atob(data.content), (c) => c.charCodeAt(0));
             const blob = new Blob([bytes], { type: data.contentType || "application/octet-stream" });
             const url = URL.createObjectURL(blob);