@bobfrankston/rmfmail 1.1.73 → 1.1.74

package/client/android-bootstrap.bundle.js

@@ -5201,6 +5201,14 @@ var WebMailxDB = class {
     const r = this.get("SELECT body_path FROM messages WHERE account_id = ? AND uid = ?", [accountId, uid]);
     return r?.body_path || "";
   }
+  /** The provider's own message id (Gmail message id) for a uid. Passed to
+   *  the Gmail provider's trash/move so it doesn't fall back to a capped
+   *  list-and-hash search that misses messages in a large mailbox. "" when
+   *  unknown — the provider then uses its (capped) fallback. */
+  getProviderId(accountId, uid) {
+    const r = this.get("SELECT provider_id FROM messages WHERE account_id = ? AND uid = ?", [accountId, uid]);
+    return r?.provider_id || "";
+  }
   updateMessageFlags(accountId, uid, flags) {
     this.run("UPDATE messages SET flags_json = ? WHERE account_id = ? AND uid = ?", [JSON.stringify(flags), accountId, uid]);
   }
@@ -10011,7 +10019,7 @@ var AndroidSyncManager = class {
         if (p.action === "flags" && typeof provider.setFlags === "function") {
           await provider.setFlags(path, p.uid, Array.isArray(p.flags) ? p.flags : p.flags ? [p.flags] : []);
         } else if (p.action === "trash" && typeof provider.trashMessage === "function") {
-          await provider.trashMessage(path, p.uid);
+          await provider.trashMessage(path, p.uid, this.db.getProviderId(accountId, p.uid));
         } else if (p.action === "move" && typeof provider.moveMessage === "function") {
           const toId = p.targetFolderId;
           const toPath = folderPath(toId);
@@ -10019,7 +10027,7 @@ var AndroidSyncManager = class {
             this.db.failSyncActionByUid(accountId, p.action, p.uid, `unknown target folder ${toId}`);
             continue;
           }
-          await provider.moveMessage(path, p.uid, toPath);
+          await provider.moveMessage(path, p.uid, toPath, this.db.getProviderId(accountId, p.uid));
         } else {
           this.db.failSyncActionByUid(accountId, p.action, p.uid, `provider does not support ${p.action}`);
           continue;