@bobfrankston/rmfmail 1.1.40 → 1.1.42

package/client/android-bootstrap.bundle.js

@@ -9395,6 +9395,10 @@ var AndroidSyncManager = class {
   async addAccount(account) {
     vlog(`addAccount id=${account.id} email=${account.email} host=${account.imap?.host} auth=${account.imap?.auth}`);
     this.db.upsertAccount(account.id, account.name, account.email, JSON.stringify(account));
+    if (this.providers.has(account.id)) {
+      vlog(`addAccount ${account.id}: provider already registered \u2014 keeping it`);
+      return;
+    }
     if (this.isGmailAccount(account)) {
       const tokenProvider2 = this.tokenProviders.get(account.id);
       if (tokenProvider2) {
@@ -9700,14 +9704,20 @@ var AndroidSyncManager = class {
     const envelope = this.db.getMessageByUid(accountId, uid, folderId);
     const bp = envelope?.bodyPath || "";
     const FETCH_TIMEOUT_MS = 6e4;
+    let __folderPath = "(n/a)";
     const fetchPromise = (async () => {
       if (bp.startsWith("gmail:") && provider.fetchById) {
         const providerId = bp.substring(6);
+        __folderPath = `gmail:${bp.substring(6)}`;
         return provider.fetchById(providerId, { source: true });
       }
       const folders = this.db.getFolders(accountId);
       const folder = folders.find((f) => f.id === folderId);
-      if (!folder) return null;
+      if (!folder) {
+        __folderPath = "(folder row missing)";
+        return null;
+      }
+      __folderPath = folder.path || "(empty path)";
       return provider.fetchOne(folder.path, uid, { source: true });
     })();
     let msg = null;
@@ -9724,7 +9734,8 @@ var AndroidSyncManager = class {
       throw e;
     }
     if (!msg?.source) {
-      console.warn(`[fetchBody] No source returned for ${accountId}/${folderId}/${uid} (bp=${bp}, ${Date.now() - t0}ms)`);
+      const why = msg == null ? "fetchOne returned null" : "message had no .source";
+      console.warn(`[fetchBody] No source returned for ${accountId}/${folderId}/${uid} (bp=${bp}, path=${__folderPath}, ${why}, ${Date.now() - t0}ms)`);
       return null;
     }
     const raw = new TextEncoder().encode(msg.source);