@bobfrankston/mailx 1.0.204 → 1.0.206

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":206,"y":12}
+{"height":1344,"width":2151,"x":476,"y":58}

package/client/android.html

@@ -135,7 +135,7 @@
         <section class="message-viewer" id="message-viewer">
             <div class="mv-header" id="mv-header" hidden>
                 <div class="mv-toolbar">
-                    <button class="tb-btn" id="btn-back" title="Back to list" hidden>←</button>
+                    <button class="tb-btn btn-back-list" id="btn-back" title="Back to message list" hidden>← Inbox</button>
                     <button class="tb-btn" id="btn-reply" title="Reply">↩</button>
                     <button class="tb-btn" id="btn-reply-all" title="Reply All">↩↩</button>
                     <button class="tb-btn" id="btn-forward" title="Forward">→</button>

package/client/components/message-viewer.js

@@ -290,10 +290,11 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
         else {
             bodyEl.innerHTML = `<div class="mv-empty">No content</div>`;
         }
-        // Attachments
+        // Attachments — always clear first to avoid stale chips from previous message
+        attEl.innerHTML = "";
+        attEl.hidden = true;
         if (msg.attachments?.length) {
             attEl.hidden = false;
-            attEl.innerHTML = "";
             for (let i = 0; i < msg.attachments.length; i++) {
                 const att = msg.attachments[i];
                 const chip = document.createElement("a");

package/client/index.html

@@ -99,7 +99,7 @@
         <section class="message-viewer" id="message-viewer">
             <div class="mv-header" id="mv-header" hidden>
                 <div class="mv-toolbar">
-                    <button class="tb-btn" id="btn-back" title="Back to list" hidden>←</button>
+                    <button class="tb-btn btn-back-list" id="btn-back" title="Back to message list" hidden>← Inbox</button>
                     <button class="tb-btn" id="btn-reply" title="Reply (Ctrl+R)">↩</button>
                     <button class="tb-btn" id="btn-reply-all" title="Reply All (Ctrl+Shift+R)">↩↩</button>
                     <button class="tb-btn" id="btn-forward" title="Forward">→</button>

package/client/styles/layout.css

@@ -132,9 +132,20 @@ body {
     }
     .message-list.narrow-hidden { display: none; }
 
-    /* Show hamburger and back buttons */
+    /* Show hamburger always on narrow */
     #btn-menu { display: inline-flex !important; }
-    #btn-back { display: inline-flex !important; }
+    /* Back button: only show when viewer is active (message list hidden) */
+    #btn-back { display: none !important; }
+    .message-viewer.narrow-active ~ * #btn-back,
+    body:has(.message-viewer.narrow-active) #btn-back {
+        display: inline-flex !important;
+        font-size: 1.1em;
+        font-weight: 600;
+        padding: 0.5em 1em;
+        background: var(--color-accent, #1a6dd4);
+        color: white;
+        border-radius: 6px;
+    }
 
     /* Message list: full width, two-line rows */
     .message-list {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.204",
+  "version": "1.0.206",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.265",
+    "@bobfrankston/msger": "^0.1.267",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-store-web/android-bootstrap.js

@@ -14,7 +14,7 @@
 import { WebMailxDB } from "./db.js";
 import { WebMessageStore } from "./web-message-store.js";
 import { WebMailxService } from "./web-service.js";
-import { loadAccounts, loadAccountsFromCloud, saveAccounts, clearSettings, setGDriveTokenProvider, setGDriveFolderId } from "./web-settings.js";
+import { loadAccounts, loadAccountsFromCloud, saveAccounts, clearSettings, getDeviceId, setGDriveTokenProvider, setGDriveFolderId } from "./web-settings.js";
 import { GmailApiWebProvider } from "./gmail-api-web.js";
 // ── State ──
 let db;
@@ -364,6 +364,56 @@ function createNativeTokenProvider(email) {
     };
 }
 // ── GDrive folder lookup ──
+async function registerDeviceInGDrive(tokenProvider, folderId, accountIds) {
+    try {
+        const token = await tokenProvider();
+        const deviceId = `android-${getDeviceId().substring(0, 8)}`;
+        // Read existing clients.jsonc
+        const q = encodeURIComponent(`name='clients.jsonc' and '${folderId}' in parents and trashed=false`);
+        const listRes = await fetch(`https://www.googleapis.com/drive/v3/files?q=${q}&fields=files(id)`, { headers: { "Authorization": `Bearer ${token}` } });
+        if (!listRes.ok) {
+            console.warn(`[gdrive] clients.jsonc list failed: ${listRes.status}`);
+            return;
+        }
+        const listData = await listRes.json();
+        const fileId = listData.files?.[0]?.id;
+        let clients = {};
+        if (fileId) {
+            const readRes = await fetch(`https://www.googleapis.com/drive/v3/files/${fileId}?alt=media`, { headers: { "Authorization": `Bearer ${token}` } });
+            if (readRes.ok) {
+                try {
+                    clients = JSON.parse(await readRes.text());
+                }
+                catch { /* */ }
+            }
+        }
+        clients[deviceId] = {
+            hostname: deviceId,
+            platform: "android",
+            accounts: accountIds,
+            lastSeen: new Date().toISOString(),
+            version: window._nativeBridge?.info?.version || "?",
+        };
+        const content = JSON.stringify(clients, null, 2);
+        if (fileId) {
+            const upRes = await fetch(`https://www.googleapis.com/upload/drive/v3/files/${fileId}?uploadType=media`, {
+                method: "PATCH",
+                headers: {
+                    "Authorization": `Bearer ${token}`,
+                    "Content-Type": "application/json",
+                },
+                body: content,
+            });
+            if (upRes.ok)
+                console.log(`[android] Registered device in clients.jsonc as ${deviceId}`);
+            else
+                console.warn(`[gdrive] clients.jsonc update failed: ${upRes.status}`);
+        }
+    }
+    catch (e) {
+        console.warn(`[android] Device registration failed: ${e.message}`);
+    }
+}
 async function findGDriveMailxFolder(tokenProvider) {
     const token = await tokenProvider();
     const q = encodeURIComponent("name='mailx' and mimeType='application/vnd.google-apps.folder' and trashed=false");
@@ -425,16 +475,21 @@ export async function initAndroid() {
     if (gmailTokenProvider) {
         setGDriveTokenProvider(gmailTokenProvider);
         try {
+            console.log("[android] Looking up GDrive mailx folder...");
             const folderId = await findGDriveMailxFolder(gmailTokenProvider);
-            if (folderId) {
+            if (!folderId) {
+                console.warn("[android] GDrive mailx folder not found");
+            }
+            else {
                 setGDriveFolderId(folderId);
                 console.log(`[android] GDrive mailx folder: ${folderId}`);
-                // Re-read accounts directly from GDrive (bypass cache to pick up bob.ma etc.)
+                // Read accounts directly from GDrive (bypass IndexedDB cache)
+                console.log("[android] Reading accounts.jsonc from GDrive...");
                 const gdriveAccounts = await loadAccountsFromCloud();
-                if (gdriveAccounts.length > accounts.length) {
-                    console.log(`[android] GDrive has ${gdriveAccounts.length} accounts (was ${accounts.length})`);
+                console.log(`[android] GDrive returned ${gdriveAccounts.length} accounts: ${gdriveAccounts.map(a => a.id).join(",")}`);
+                if (gdriveAccounts.length > 0) {
+                    // Use canonical GDrive accounts (upsert handles overwrites)
                     accounts = gdriveAccounts;
-                    // Register any new accounts
                     for (const account of accounts) {
                         if (!account.enabled)
                             continue;
@@ -444,7 +499,10 @@ export async function initAndroid() {
                         }
                         await syncManager.addAccount(account);
                     }
+                    console.log(`[android] Loaded ${accounts.length} accounts from GDrive`);
                 }
+                // Register this Android device in clients.jsonc
+                await registerDeviceInGDrive(gmailTokenProvider, folderId, accounts.map(a => a.id));
             }
         }
         catch (e) {