From 3efd67b2cf761bf4d1f7a335ba3d58dcc2a6ffb4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 21 Oct 2018 14:14:10 +0000
Subject: [PATCH] Simplification

---
 .../java/eu/faircode/email/BoundaryCallbackMessages.java   | 4 ----
 app/src/main/java/eu/faircode/email/FragmentMessages.java  | 2 +-
 app/src/main/java/eu/faircode/email/ViewModelBrowse.java   | 7 -------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 4abbefc8..46dbbc2f 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -70,10 +70,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         return searching;
     }
 
-    int getLoaded() {
-        return model.getLoaded();
-    }
-
     @Override
     public void onZeroItemsLoaded() {
         Log.i(Helper.TAG, "onZeroItemsLoaded");
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 983d530a..99b05d6f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -919,7 +919,7 @@ public class FragmentMessages extends FragmentEx {
                             @Override
                             public void onLoaded() {
                                 pbWait.setVisibility(View.GONE);
-                                if (searchCallback.getLoaded() == 0)
+                                if (messages.getValue().size() == 0)
                                     tvNoEmail.setVisibility(View.VISIBLE);
                             }
 
diff --git a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
index 4b070eb5..c0673230 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
@@ -38,7 +38,6 @@ public class ViewModelBrowse extends ViewModel {
     private Message[] imessages = null;
 
     private int index = -1;
-    private int loaded = 0;
 
     void set(Context context, long folder, String search, int pageSize) {
         this.context = context;
@@ -47,7 +46,6 @@ public class ViewModelBrowse extends ViewModel {
         this.pageSize = pageSize;
 
         this.index = -1;
-        this.loaded = 0;
     }
 
     @Override
@@ -62,10 +60,6 @@ public class ViewModelBrowse extends ViewModel {
         return context;
     }
 
-    int getLoaded() {
-        return loaded;
-    }
-
     void load() throws MessagingException, FolderClosedIOException {
         DB db = DB.getInstance(context);
         EntityFolder folder = db.folder().getFolder(fid);
@@ -135,7 +129,6 @@ public class ViewModelBrowse extends ViewModel {
                         if (message == null) {
                             ServiceSynchronize.synchronizeMessage(context, folder, ifolder, (IMAPMessage) isub[j], search != null);
                             count++;
-                            loaded++;
                         }
                     } catch (MessageRemovedException ex) {
                         Log.w(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));