From 99d5277de88447cd9e8ae56fec2d6cb66a6acbc7 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 31 Dec 2022 21:21:25 +0100 Subject: [PATCH] Fixed no messages indicator behavior --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 914e5a3bb8..ad6866eed5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -6420,13 +6420,14 @@ public class FragmentMessages extends FragmentBase @Override public void onLoading() { loading = true; - initialized = true; updateListState("Loading", SimpleTask.getCount(), adapter == null ? 0 : adapter.getItemCount()); } @Override public void onLoaded(int found) { loading = false; + if (viewType == AdapterMessage.ViewType.SEARCH) + initialized = true; updateListState("Loaded found=" + found, SimpleTask.getCount(), adapter == null ? 0 : adapter.getItemCount() + found); } @@ -6536,7 +6537,7 @@ public class FragmentMessages extends FragmentBase (filter_unknown && !EntityFolder.isOutgoing(type)) || (language_detection && !TextUtils.isEmpty(filter_language) && !outbox)); - boolean none = (items == 0 && !loading && initialized); + boolean none = (items == 0 && initialized); boolean filtered = (filter_active && viewType != AdapterMessage.ViewType.SEARCH); pbWait.setVisibility(loading || tasks > 0 ? View.VISIBLE : View.GONE);