mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Show waiting for server earlier

This commit is contained in:
M66B 2023-06-08 16:10:33 +02:00
parent 2d84461bf7
commit 114e1c24f1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -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) +

10
app/src/main/java/eu/faircode/email/Helper.java
View File

@ -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) {