EWS and OWA: List all new messages, not just the last iteration (#170)

mustang-im · Aug 12, 2024 · 2ebbb3e · 2ebbb3e
1 parent c803cae
commit 2ebbb3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/logic/Mail/EWS/EWSFolder.ts b/app/logic/Mail/EWS/EWSFolder.ts
@@ -194,13 +194,14 @@ export class EWSFolder extends Folder {
           newMessageIDs.push(message.ItemId);
         }
       }
-      newMsgs = await this.getNewMessageHeaders(newMessageIDs);
-      allMsgs.addAll(newMsgs);
+      let newMsgsInIteration = await this.getNewMessageHeaders(newMessageIDs);
+      newMsgs.addAll(newMsgsInIteration);
     }
 
     for (let email of this.messages.subtract(allMsgs)) {
       SQLEMail.deleteIt(email);
     }
+    allMsgs.addAll(newMsgs);
     this.messages.replaceAll(allMsgs);
     return newMsgs;
   }

diff --git a/app/logic/Mail/OWA/OWAFolder.ts b/app/logic/Mail/OWA/OWAFolder.ts
@@ -159,13 +159,14 @@ export class OWAFolder extends Folder {
           newMessageIDs.push(message.ItemId.Id);
         }
       }
-      newMsgs = await this.getNewMessageHeaders(newMessageIDs);
-      allMsgs.addAll(newMsgs);
+      let newMsgsInIteration = await this.getNewMessageHeaders(newMessageIDs);
+      newMsgs.addAll(newMsgsInIteration);
     }
 
     for (let email of this.messages.subtract(allMsgs)) {
       SQLEMail.deleteIt(email);
     }
+    allMsgs.addAll(newMsgs);
     this.messages.replaceAll(allMsgs);
     return newMsgs;
   }