From 43bb732e08a8197ee32e11192618718d1dc50d0e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:07:49 +0100
Subject: [PATCH] Improved send quit

---
 .../main/java/eu/faircode/email/ServiceSend.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 93413bfeae..10203cb365 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -151,10 +151,6 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                     } catch (Throwable ex) {
                         Log.w(ex);
                     }
-
-                    getMainHandler().removeCallbacks(quit);
-                    if (unsent == null || unsent.count == 0)
-                        getMainHandler().postDelayed(quit, STOP_DELAY);
                 }
             }
         });
@@ -176,6 +172,15 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                 }
                 handling = ops;
 
+                if (handling.isEmpty()) {
+                    if (!getMainHandler().hasCallbacks(quit)) {
+                        long at = new Date().getTime() + STOP_DELAY;
+                        EntityLog.log(ServiceSend.this, "Send quit at " + new Date(at));
+                        getMainHandler().postDelayed(quit, STOP_DELAY);
+                    }
+                } else
+                    getMainHandler().removeCallbacks(quit);
+
                 if (process.size() > 0) {
                     EntityLog.log(ServiceSend.this,
                             "Send process=" + TextUtils.join(",", process) +