Revert "You're being watched"

This reverts commit d303a859a8.

app/src/main/java/eu/faircode/email/SimpleTask.java

@@ -144,15 +144,6 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
             }
         }
 
-        LifecycleObserver watcher = new LifecycleObserver() {
-            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-            public void onDestroy() {
-                EntityLog.log(context, EntityLog.Type.Debug, "Cancelling task=" + name);
-                cancel(context);
-                owner.getLifecycle().removeObserver(this);
-            }
-        };
-
         future = getExecutor(context).submit(new Runnable() {
             private Object data;
             private long elapsed;
@@ -190,10 +181,7 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
                         if (state.equals(Lifecycle.State.DESTROYED)) {
                             // No delivery
                             cleanup(context);
-                        } else {
+                        } else if (state.isAtLeast(Lifecycle.State.RESUMED)) {
-                            owner.getLifecycle().removeObserver(watcher);
-
-                            if (state.isAtLeast(Lifecycle.State.RESUMED)) {
                             // Inline delivery
                             Log.i("Deliver task " + name + " state=" + state + " elapse=" + elapsed + " ms");
                             deliver();
@@ -219,7 +207,6 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
                             });
                         }
                     }
-                    }
 
                     private void deliver() {
                         try {
@@ -262,8 +249,6 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
             }
         });
 
-        owner.getLifecycle().addObserver(watcher);
-
         updateTaskCount(context);
     }