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

Fixed invalid "no messages"

This commit is contained in:
M66B 2019-01-27 07:44:45 +00:00
parent 09f0fa55d4
commit e0e4b4730d
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
interface IBoundaryCallbackMessages { interface IBoundaryCallbackMessages {
void onLoading(); void onLoading();
void onLoaded(boolean empty); void onLoaded();
void onError(Throwable ex); void onError(Throwable ex);
} }
@ -103,7 +103,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
handler.post(new Runnable() { handler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
intf.onLoaded(model == null || model.isEmpty()); intf.onLoaded();
} }
}); });
} }

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

@ -1733,9 +1733,11 @@ public class FragmentMessages extends FragmentBase {
} }
@Override @Override
public void onLoaded(boolean empty) { public void onLoaded() {
RecyclerView.Adapter adapter = rvMessage.getAdapter();
int items = (adapter == null ? 0 : adapter.getItemCount());
tvNoEmail.setVisibility(items == 0 ? View.VISIBLE : View.GONE);
pbWait.setVisibility(View.GONE); pbWait.setVisibility(View.GONE);
tvNoEmail.setVisibility(empty ? View.VISIBLE : View.GONE);
} }
@Override @Override

12
app/src/main/java/eu/faircode/email/ViewModelBrowse.java
View File

@ -64,7 +64,6 @@ public class ViewModelBrowse extends ViewModel {
private int pageSize; private int pageSize;
int local = 0; int local = 0;
int matched = 0;
List<Long> messages = null; List<Long> messages = null;
IMAPStore istore = null; IMAPStore istore = null;
IMAPFolder ifolder = null; IMAPFolder ifolder = null;
@ -84,13 +83,6 @@ public class ViewModelBrowse extends ViewModel {
currentState.error = false; currentState.error = false;
} }
boolean isEmpty() {
final State state = currentState;
if (state == null)
return true;
return (state.matched == 0 && (state.imessages == null || state.imessages.length == 0));
}
void load() throws MessagingException, IOException { void load() throws MessagingException, IOException {
final State state = currentState; final State state = currentState;
if (state == null || state.error) if (state == null || state.error)
@ -136,10 +128,8 @@ public class ViewModelBrowse extends ViewModel {
if (!match && message.content) if (!match && message.content)
match = body.toLowerCase().contains(find); match = body.toLowerCase().contains(find);
if (match) { if (match)
state.matched++;
db.message().setMessageFound(message.account, message.thread); db.message().setMessageFound(message.account, message.thread);
}
} }
db.setTransactionSuccessful(); db.setTransactionSuccessful();