From 5a15249ed46e50213979075c62d01dec97dd167c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 27 Nov 2020 08:27:57 +0100
Subject: [PATCH] Report number of found message for list state

---
 .../faircode/email/BoundaryCallbackMessages.java  | 15 +++++++++------
 .../java/eu/faircode/email/FragmentMessages.java  |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index ccb439d23c..7037d209e8 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -96,7 +96,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     interface IBoundaryCallbackMessages {
         void onLoading();
 
-        void onLoaded();
+        void onLoaded(int found);
 
         void onException(@NonNull Throwable ex);
     }
@@ -141,6 +141,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         executor.submit(new Runnable() {
             @Override
             public void run() {
+                int found = 0;
                 try {
                     if (state.destroyed || state.error)
                         return;
@@ -154,7 +155,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         });
                     if (server)
                         try {
-                            load_server(state);
+                            found = load_server(state);
                         } catch (Throwable ex) {
                             if (state.error || ex instanceof IllegalArgumentException)
                                 throw ex;
@@ -163,10 +164,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                             close(state, true);
 
                             // Retry
-                            load_server(state);
+                            found = load_server(state);
                         }
                     else
-                        load_device(state);
+                        found = load_device(state);
                 } catch (final Throwable ex) {
                     state.error = true;
                     Log.e("Boundary", ex);
@@ -178,13 +179,15 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                             }
                         });
                 } finally {
-                    if (intf != null)
+                    if (intf != null) {
+                        final int f = found;
                         ApplicationEx.getMainHandler().post(new Runnable() {
                             @Override
                             public void run() {
-                                intf.onLoaded();
+                                intf.onLoaded(f);
                             }
                         });
+                    }
                 }
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 4879cc5c67..4767ee3277 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4537,9 +4537,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
 
         @Override
-        public void onLoaded() {
+        public void onLoaded(int found) {
             loading = false;
-            updateListState("Loaded", SimpleTask.getCount(), adapter.getItemCount());
+            updateListState("Loaded found=" + found, SimpleTask.getCount(), adapter.getItemCount() + found);
         }
 
         @Override