From 0a8d831bdc2bf1af242df3d07c6fc7b74f3a0907 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 18 Jun 2021 13:10:16 +0200
Subject: [PATCH] Count running tasks only

---
 app/src/main/java/eu/faircode/email/SimpleTask.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java
index ef8b6760cf..861299a95d 100644
--- a/app/src/main/java/eu/faircode/email/SimpleTask.java
+++ b/app/src/main/java/eu/faircode/email/SimpleTask.java
@@ -315,15 +315,19 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
     @Override
     public String toString() {
         long now = new Date().getTime();
-        return name + " elapsed=" +
-                (started == 0 ? null : (now - started) / 1000) + "s";
+        long elapsed = now - started;
+        return name +
+                " elapsed=" + (started == 0 ? null : elapsed / 1000) +
+                " done=" + (future == null ? null : future.isDone()) +
+                " cancelled=" + (future == null ? null : future.isCancelled());
     }
 
     static int getCount() {
         int executing = 0;
         synchronized (tasks) {
             for (SimpleTask task : tasks)
-                if (task.started > 0 && task.count)
+                if (task.count &&
+                        task.future != null && !task.future.isDone())
                     executing++;
         }
         return executing;