From c2a078a340d27fc75f17e644096d09e45d73e68e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 26 Sep 2018 11:32:24 +0000
Subject: [PATCH] Fixed search spinner

---
 .../email/BoundaryCallbackMessages.java       | 11 +++------
 .../eu/faircode/email/FragmentMessages.java   | 23 +++++++++++--------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index d38479404e..54e0acb41b 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -65,7 +65,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     private int index;
     private boolean searching = false;
     private int loaded = 0;
-    private boolean destroyed = false;
 
     interface IBoundaryCallbackMessages {
         void onLoading();
@@ -87,7 +86,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
             @Override
             public void onStateChanged(LifecycleOwner source, Lifecycle.Event event) {
                 if (event == Lifecycle.Event.ON_DESTROY) {
-                    destroyed = true;
                     executor.submit(new Runnable() {
                         @Override
                         public void run() {
@@ -140,8 +138,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     handler.post(new Runnable() {
                         @Override
                         public void run() {
-                            if (!destroyed)
-                                intf.onLoading();
+                            intf.onLoading();
                         }
                     });
 
@@ -232,8 +229,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     handler.post(new Runnable() {
                         @Override
                         public void run() {
-                            if (!destroyed)
-                                intf.onError(context, ex);
+                            intf.onError(context, ex);
                         }
                     });
                 } finally {
@@ -241,8 +237,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     handler.post(new Runnable() {
                         @Override
                         public void run() {
-                            if (!destroyed)
-                                intf.onLoaded();
+                            intf.onLoaded();
                         }
                     });
                 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index cd445d4cef..2b0fad285e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -52,6 +52,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SearchView;
 import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.paging.LivePagedListBuilder;
@@ -682,11 +683,12 @@ public class FragmentMessages extends FragmentEx {
 
                                     @Override
                                     public void onError(Context context, Throwable ex) {
-                                        new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
-                                                .setMessage(Helper.formatThrowable(ex))
-                                                .setPositiveButton(android.R.string.cancel, null)
-                                                .create()
-                                                .show();
+                                        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
+                                            new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
+                                                    .setMessage(Helper.formatThrowable(ex))
+                                                    .setPositiveButton(android.R.string.cancel, null)
+                                                    .create()
+                                                    .show();
                                     }
                                 });
 
@@ -727,11 +729,12 @@ public class FragmentMessages extends FragmentEx {
 
                             @Override
                             public void onError(Context context, Throwable ex) {
-                                new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
-                                        .setMessage(Helper.formatThrowable(ex))
-                                        .setPositiveButton(android.R.string.cancel, null)
-                                        .create()
-                                        .show();
+                                if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
+                                    new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
+                                            .setMessage(Helper.formatThrowable(ex))
+                                            .setPositiveButton(android.R.string.cancel, null)
+                                            .create()
+                                            .show();
                             }
                         });