@bobfrankston/rmfmail 1.1.33 → 1.1.35

package/client/android-bootstrap.bundle.js

@@ -6090,8 +6090,40 @@ ${bodyEncoded}`;
   hasBccHistoryTo(_email) {
     return false;
   }
+  /** Pull the shared GDrive `contacts.jsonc` and merge its entries into the
+   *  local contacts table. Desktop flushes the full union there (everything
+   *  it discovered from its mailbox corpus + Google contacts + preferred);
+   *  this is how an Android device gets contacts it never saw in its own
+   *  (partial) on-device corpus. Called once at startup — re-importing on a
+   *  loop would bump `use_count` every pass and distort autocomplete rank. */
   async loadContactsConfig() {
-    return null;
+    try {
+      const { cloudRead: cloudRead2 } = await Promise.resolve().then(() => (init_web_settings(), web_settings_exports));
+      const raw = await cloudRead2("contacts.jsonc");
+      if (!raw)
+        return null;
+      const cfg = parseJsoncLoose(raw);
+      if (!cfg)
+        return null;
+      let imported = 0;
+      for (const list of [cfg.preferred, cfg.discovered]) {
+        if (!Array.isArray(list))
+          continue;
+        for (const e of list) {
+          const email = (e?.email || "").trim();
+          if (!email)
+            continue;
+          this.db.recordSentAddress((e?.name || "").trim(), email);
+          imported++;
+        }
+      }
+      if (imported > 0)
+        console.log(`[contacts] loaded ${imported} from contacts.jsonc`);
+      return { imported };
+    } catch (e) {
+      console.error(`[contacts] loadContactsConfig failed: ${e?.message || e}`);
+      return null;
+    }
   }
   // Calendar — Android UI has its own native calendar; no JS-side data.
   async getCalendarEvents(_fromMs, _toMs) {
@@ -10131,6 +10163,9 @@ function setContactsSyncToken(accountId, token) {
   } catch {
   }
 }
+function isGoogleAccount(account) {
+  return !!(account.imap?.host?.toLowerCase().includes("gmail") || account.email?.toLowerCase().endsWith("@gmail.com"));
+}
 async function syncGoogleContactsForAccount(db2, accountId, tokenProvider2) {
   const inFlight = contactsSyncing.get(accountId);
   if (inFlight) return inFlight;
@@ -10351,8 +10386,9 @@ async function initAndroid() {
       }
     })();
   }
+  service.loadContactsConfig().catch((e) => console.error(`[android] startup contacts.jsonc load: ${e?.message || e}`));
   for (const account of db.getAccounts()) {
-    if (!account.email) continue;
+    if (!account.email || !isGoogleAccount(account)) continue;
     const tp = createNativeTokenProvider(account.email);
     syncGoogleContactsForAccount(db, account.id, tp).catch((e) => console.error(`[android] startup contacts sync ${account.id}: ${e.message}`));
   }
@@ -10368,7 +10404,7 @@ async function initAndroid() {
     syncManager.syncAll().catch((e) => console.error(`[android] Periodic sync error: ${e.message}`));
     if (++contactsSyncTickCounter % 8 === 0) {
       for (const account of db.getAccounts()) {
-        if (!account.email) continue;
+        if (!account.email || !isGoogleAccount(account)) continue;
         const tp = createNativeTokenProvider(account.email);
         syncGoogleContactsForAccount(db, account.id, tp).catch((e) => console.error(`[android] periodic contacts sync ${account.id}: ${e.message}`));
       }