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

Fixed displaying no messages while searching

This commit is contained in:
M66B 2018-09-21 12:43:12 +00:00
parent 771da2bbcd
commit eddbf29175
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
View File

@ -64,6 +64,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
private Message[] imessages = null;
private int index;
private boolean searching = false;
private int loaded = 0;
interface IBoundaryCallbackMessages {
void onLoading();
@ -111,6 +112,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
return searching;
}
int getLoaded() {
return loaded;
}
@Override
public void onZeroItemsLoaded() {
Log.i(Helper.TAG, "onZeroItemsLoaded");
@ -196,6 +201,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
if (db.message().getMessageByUid(fid, uid) == null) {
ServiceSynchronize.synchronizeMessage(context, folder, ifolder, (IMAPMessage) isub[j], true);
count++;
loaded++;
}
} catch (MessageRemovedException ex) {
Log.w(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));

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

@ -708,12 +708,15 @@ public class FragmentMessages extends FragmentEx {
new BoundaryCallbackMessages.IBoundaryCallbackMessages() {
@Override
public void onLoading() {
tvNoEmail.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
}
@Override
public void onLoaded() {
pbWait.setVisibility(View.GONE);
if (searchCallback.getLoaded() == 0)
tvNoEmail.setVisibility(View.VISIBLE);
}
@Override
@ -751,8 +754,9 @@ public class FragmentMessages extends FragmentEx {
pbWait.setVisibility(View.GONE);
grpReady.setVisibility(View.VISIBLE);
if (messages.size() == 0 && !searching) {
tvNoEmail.setVisibility(View.VISIBLE);
if (messages.size() == 0) {
if (searchCallback == null)
tvNoEmail.setVisibility(View.VISIBLE);
rvMessage.setVisibility(View.GONE);
} else {
tvNoEmail.setVisibility(View.GONE);