From 114e1c24f11a0f61b60ee9bbd14e3b5331e3ab3c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 8 Jun 2023 16:10:33 +0200
Subject: [PATCH] Show waiting for server earlier

---
 .../main/java/eu/faircode/email/FragmentMessages.java  |  5 +++--
 app/src/main/java/eu/faircode/email/Helper.java        | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index b48036756b..ee614bccd1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -6861,7 +6861,7 @@ public class FragmentMessages extends FragmentBase
                 (language_detection && !TextUtils.isEmpty(filter_language) && !outbox));
 
         boolean none = (items == 0 && initialized);
-        boolean searching = (viewType == AdapterMessage.ViewType.SEARCH && server && loading && items == 0);
+        boolean searching = (viewType == AdapterMessage.ViewType.SEARCH && server && (!initialized || loading) && items == 0);
         boolean filtered = (filter_active && viewType != AdapterMessage.ViewType.SEARCH);
 
         pbWait.setVisibility(loading || tasks > 0 ? View.VISIBLE : View.GONE);
@@ -6872,7 +6872,8 @@ public class FragmentMessages extends FragmentBase
         if (BuildConfig.DEBUG)
             updateDebugInfo();
 
-        Log.i("List state reason=" + reason +
+        Log.i(" List state who=" + Helper.getWho(this) + "" +
+                " reason=" + reason +
                 " tasks=" + tasks + " loading=" + loading +
                 " items=" + items + " initialized=" + initialized +
                 " wait=" + (pbWait.getVisibility() == View.VISIBLE) +
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index ba5f10ea0d..fa1fd24e1f 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1677,7 +1677,7 @@ public class Helper {
         return layout.getOffsetForHorizontal(line, x);
     }
 
-    static String getRequestKey(Fragment fragment) {
+    static String getWho(Fragment fragment) {
         String who;
         try {
             Class<?> cls = fragment.getClass();
@@ -1685,16 +1685,18 @@ public class Helper {
                 cls = cls.getSuperclass();
             Field f = cls.getDeclaredField("mWho");
             f.setAccessible(true);
-            who = (String) f.get(fragment);
+            return (String) f.get(fragment);
         } catch (Throwable ex) {
             Log.w(ex);
             String we = fragment.toString();
             int pa = we.indexOf('(');
             int sp = we.indexOf(' ', pa);
-            who = we.substring(pa + 1, sp);
+            return we.substring(pa + 1, sp);
         }
+    }
 
-        return fragment.getClass().getName() + ":result:" + who;
+    static String getRequestKey(Fragment fragment) {
+        return fragment.getClass().getName() + ":result:" + getWho(fragment);
     }
 
     static void clearViews(Object instance) {