@bobfrankston/rmfmail 1.2.209 → 1.2.210

package/bin/mailx.ts

@@ -2179,22 +2179,46 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
     // ANOTHER machine (seen via the reminders.jsonc state sync) can retract
     // a popup that's already on this machine's screen. `popupKey` is
     // supplied by alarms.ts and stripped before the opts reach msger.
-    const reminderPopups = new Map<string, { close: () => void }>();
+    const reminderPopups = new Map<string, { close: () => void; result: Promise<any> }>();
     svc.setPopupFn(async (opts: any) => {
         // Own WebView2 profile so a reminder popup can never share (and
         // crash) the main window's browser process — see S67 note on the
         // popout windows below. Service-supplied opts may override.
         const { popupKey, ...boxOpts } = opts || {};
+        // ONE window per occurrence, however many app windows are open.
+        // Every window runs its own alarm poller (alarms.ts is client-side),
+        // so a second main window meant the same reminder spawned two
+        // identical popups — and the second registration clobbered the
+        // first's closer, leaving a popup that cross-machine retraction
+        // could no longer close (Bob 2026-07-31: "two instances running,
+        // two popups"). The late caller joins the SAME result, so both
+        // pollers persist the same dismiss/snooze.
+        if (popupKey) {
+            const open = reminderPopups.get(popupKey);
+            if (open) {
+                console.log(`  [reminder] popup ${popupKey} already open — joining it instead of opening a second`);
+                return await open.result;
+            }
+        }
         const h = showMessageBoxEx({ profile: "popout", ...boxOpts });
         if (typeof h.pid === "number") addChildPid(h.pid);
-        if (popupKey) reminderPopups.set(popupKey, { close: () => { try { h.close(); } catch { /* already gone */ } } });
-        try {
+        const result = (async () => {
             const r = await h.result;
             return { button: r.button, closed: r.closed, dismissed: r.dismissed, form: (r as any).form };
-        } finally {
+        })();
+        // Cleanup rides on the shared promise, not on this caller — joiners
+        // must not tear down registration out from under the real window.
+        void result.catch(() => { /* surfaced to the awaiting callers */ }).finally(() => {
             if (typeof h.pid === "number") removeChildPid(h.pid);
             if (popupKey) reminderPopups.delete(popupKey);
+        });
+        if (popupKey) {
+            reminderPopups.set(popupKey, {
+                close: () => { try { h.close(); } catch { /* already gone */ } },
+                result,
+            });
         }
+        return await result;
     });
     svc.setPopupCloserFn((key: string) => {
         const p = reminderPopups.get(key);

package/client/android-bootstrap.bundle.js

@@ -11477,6 +11477,7 @@ async function initAndroidOnce() {
     }
     syncManager.syncAll().catch((e) => console.error(`[android] Periodic sync error: ${e.message}`));
     service.maybeRefreshContactsConfig().catch((e) => console.error(`[android] contacts.jsonc freshness check: ${e?.message || e}`));
+    primeSharedConfigs(false).catch((e) => console.error(`[android] shared config freshness check: ${e?.message || e}`));
     if (++contactsSyncTickCounter % 8 === 0) {
       for (const account of db.getAccounts()) {
         if (!account.email || !isGoogleAccount(account)) continue;