From 63c44166315009437df4717f8f417a3b5d2bd070 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 25 Jul 2026 06:42:28 +0200 Subject: [PATCH] Fixed not stopping send service in some cases --- .../java/eu/faircode/email/ServiceSend.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java index 8e72a88908..4dd71d721a 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSend.java +++ b/app/src/main/java/eu/faircode/email/ServiceSend.java @@ -152,6 +152,15 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar Log.w(ex); } } + + if (unsent != null && unsent.count == 0) { + 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); } }); @@ -172,15 +181,6 @@ 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) +