[geary/wip/131-sent-mail: 48/52] Ensure new sent mail is found for services that auto-save

[Michael Gratton <mjog src gnome org>]

commit 4aba310caec3af2c3b9c427209bb0db42a6359a4
Author: Michael Gratton <mike vee net>
Date:   Mon Aug 12 08:58:45 2019 +1000

    Ensure new sent mail is found for services that auto-save
    
    Ensure that sent mail shows up in a conversartion ASAP for Google,
    Outlook and others that automatically save sent mail by performing a
    manual sync of the Sent folder after delivering the mail.

 src/engine/smtp/smtp-client-service.vala | 41 ++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)
---
diff --git a/src/engine/smtp/smtp-client-service.vala b/src/engine/smtp/smtp-client-service.vala
index a5a41ac4..36c0727b 100644
--- a/src/engine/smtp/smtp-client-service.vala
+++ b/src/engine/smtp/smtp-client-service.vala
@@ -225,10 +225,16 @@ internal class Geary.Smtp.ClientService : Geary.ClientService {
 
         // If we get to this point, the message has either been just
         // sent, or previously sent but not saved. So now try flagging
-        // as such and saving it.
+        // as such and saving it if enabled, else sync the folder in
+        // case the provider saved it so the new mail shows up.
         if (this.account.save_sent) {
-            debug("Outbox postie: Saving %s to sent mail", email.id.to_string());
-            yield save_sent_mail_async(email, cancellable);
+            debug("Outbox postie: Saving %s to sent mail",
+                  email.id.to_string());
+            yield save_sent_mail(email, cancellable);
+        } else {
+            debug("Outbox postie: Syncing sent mail to find %s",
+                  email.id.to_string());
+            yield sync_sent_mail(cancellable);
         }
 
         // Again, don't observe the cancellable here - if it's been
@@ -305,8 +311,8 @@ internal class Geary.Smtp.ClientService : Geary.ClientService {
         email_sent(rfc822);
     }
 
-    private async void save_sent_mail_async(Geary.Email email,
-                                            GLib.Cancellable? cancellable)
+    private async void save_sent_mail(Geary.Email email,
+                                      GLib.Cancellable? cancellable)
         throws GLib.Error {
         Geary.FolderSupport.Create? create = (
             yield this.owner.get_required_special_folder_async(
@@ -336,4 +342,29 @@ internal class Geary.Smtp.ClientService : Geary.ClientService {
         }
     }
 
+    private async void sync_sent_mail(GLib.Cancellable? cancellable)
+        throws GLib.Error {
+        Geary.Folder sent = yield this.owner.get_required_special_folder_async(
+            Geary.SpecialFolderType.SENT, cancellable
+        );
+        if (sent != null) {
+            bool open = false;
+            try {
+                yield sent.open_async(
+                    Geary.Folder.OpenFlags.NO_DELAY, cancellable
+                );
+                open = true;
+                yield sent.synchronise_remote(cancellable);
+            } finally {
+                if (open) {
+                    try {
+                        yield sent.close_async(null);
+                    } catch (Error e) {
+                        debug("Error closing folder %s: %s",
+                              sent.to_string(), e.message);
+                    }
+                }
+            }
+        }
+    }
 }