@bobfrankston/rmfmail 1.2.223 → 1.2.225

package/client/android-bootstrap.bundle.js

@@ -5061,6 +5061,15 @@ var SCHEMA = `
         name TEXT DEFAULT '',
         email TEXT NOT NULL,
         organization TEXT DEFAULT '',
+        -- Full contact card, mirroring mailx-store v3. Android keeps its own
+        -- IndexedDB-backed store, so the columns have to be declared here too
+        -- or the same Google People fields get dropped on mobile.
+        phone TEXT DEFAULT '',
+        title TEXT DEFAULT '',
+        address TEXT DEFAULT '',
+        website TEXT DEFAULT '',
+        notes TEXT DEFAULT '',
+        birthday TEXT DEFAULT '',
         last_used INTEGER DEFAULT 0,
         use_count INTEGER DEFAULT 0,
         updated_at INTEGER NOT NULL,
@@ -5508,10 +5517,23 @@ var WebMailxDB = class {
    *  Web side mirrors mailx-store/db.ts — the Google sync calls
    *  `recordSentAddress` first to upsert, then this to attach the
    *  Google identity for incremental delete tracking. */
-  setContactGoogleId(email, googleId, organization) {
+  setContactGoogleId(email, googleId, organization, card) {
     if (!email)
       return;
-    this.run("UPDATE contacts SET source = 'google', google_id = ?, organization = ?, updated_at = ? WHERE email = ?", [googleId, organization || "", Date.now(), email]);
+    this.run(`UPDATE contacts SET source = 'google', google_id = ?, organization = ?, title = ?,
+                phone = ?, address = ?, website = ?, notes = ?, birthday = ?, updated_at = ?
+             WHERE email = ?`, [
+      googleId,
+      organization || "",
+      card?.title || "",
+      card?.phone || "",
+      card?.address || "",
+      card?.website || "",
+      card?.notes || "",
+      card?.birthday || "",
+      Date.now(),
+      email
+    ]);
   }
   recordSentAddress(name, email) {
     if (isJunkContact(email, name))
@@ -6627,8 +6649,21 @@ ${bodyEncoded}`;
     return this.notImpl("openAttachment");
   }
   // Spam / abuse
-  async markAsSpamMessages(_accountId, _uids) {
-    return this.notImpl("markAsSpamMessages");
+  /** Mark as spam = move to the account's \Junk folder, exactly as desktop's
+   *  MailxService.markAsSpamMessages does. This was a notImpl() stub, which
+   *  is worse than it sounds: the client optimistically removes the rows
+   *  from the list BEFORE calling this, then only writes the rejection to
+   *  the status bar. So on Android the spam button looked like it worked,
+   *  nothing moved on the server, and the next sync brought every message
+   *  straight back (Bob 2026-08-07: "attempts to delete spam but they keep
+   *  coming back"). moveMessages was implemented all along — spam just never
+   *  got wired to it. */
+  async markAsSpamMessages(accountId, uids) {
+    const target = this.db.getFolders(accountId).find((f) => f.specialUse === "junk");
+    if (!target)
+      throw new Error(`No \\Junk/\\Spam folder found for ${accountId}`);
+    await this.moveMessages(accountId, uids, target.id);
+    return { targetFolderId: target.id, moved: uids.length };
   }
   async recordSpamReport(_accountId, _uid, _folderId) {
     return this.notImpl("recordSpamReport");
@@ -11241,7 +11276,9 @@ async function syncGoogleContactsForAccount(db2, accountId, tokenProvider2) {
     try {
       do {
         const params = new URLSearchParams({
-          personFields: "names,emailAddresses,organizations,photos",
+          // Full contact card — matches the desktop sync in
+          // mailx-imap so mobile doesn't silently hold less.
+          personFields: "names,emailAddresses,organizations,photos,phoneNumbers,addresses,urls,biographies,birthdays",
           pageSize: "100"
         });
         if (nextPageToken) params.set("pageToken", nextPageToken);
@@ -11273,13 +11310,23 @@ async function syncGoogleContactsForAccount(db2, accountId, tokenProvider2) {
             }
             const name = person.names?.[0]?.displayName || "";
             const org = person.organizations?.[0]?.name || "";
+            const bd = person.birthdays?.[0]?.date;
+            const pad = (n) => String(n).padStart(2, "0");
+            const card = {
+              title: person.organizations?.[0]?.title || "",
+              phone: person.phoneNumbers?.[0]?.value || "",
+              address: person.addresses?.[0]?.formattedValue || "",
+              website: person.urls?.[0]?.value || "",
+              notes: person.biographies?.[0]?.value || "",
+              birthday: bd?.month && bd?.day ? `${bd.year ? bd.year : "-"}-${pad(bd.month)}-${pad(bd.day)}` : ""
+            };
             for (const e of person.emailAddresses || []) {
               const email = e.value?.toLowerCase();
               if (!email) continue;
               const existing = db2.searchContacts(email, 1);
               const wasNew = !(existing.length > 0 && existing[0].email === email);
               db2.recordSentAddress(name, email);
-              db2.setContactGoogleId(email, googleId, org);
+              db2.setContactGoogleId(email, googleId, org, card);
               if (wasNew) changed++;
             }
           }