From 88bfdc2d41362327672873fd8a180703d0ad527b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 22 Feb 2022 09:38:29 +0100
Subject: [PATCH] Check sent orphans on foreground sync

---
 .../main/java/eu/faircode/email/EntityOperation.java | 12 ++++++++++++
 .../java/eu/faircode/email/FragmentMessages.java     |  7 -------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index eeacc1915c..57c233a493 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -556,6 +556,18 @@ public class EntityOperation {
         if (foreground && folder.sync_state == null) // Show spinner
             db.folder().setFolderSyncState(fid, "requested");
 
+        if (foreground && EntityFolder.SENT.equals(folder.type)) {
+            EntityAccount account = db.account().getAccount(folder.account);
+            if (account.protocol == EntityAccount.TYPE_IMAP) {
+                List<EntityMessage> orphans = db.message().getSentOrphans(folder.id);
+                if (orphans != null) {
+                    EntityLog.log(context, "Sent orphans=" + orphans.size());
+                    for (EntityMessage orphan : orphans)
+                        EntityOperation.queue(context, orphan, EntityOperation.EXISTS);
+                }
+            }
+        }
+
         if (folder.account == null) // Outbox
             if (!outbox) {
                 Log.e("outbox");
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index fa5f68aefb..e400ef22ab 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1796,13 +1796,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                     reload = true;
                             }
                         }
-
-                        if (EntityFolder.SENT.equals(folder.type)) {
-                            List<EntityMessage> orphans = db.message().getSentOrphans(folder.id);
-                            if (orphans != null)
-                                for (EntityMessage orphan : orphans)
-                                    EntityOperation.queue(context, orphan, EntityOperation.EXISTS);
-                        }
                     }
 
                     db.setTransactionSuccessful();