From 0ea95b7a3d961e81e3bc5ad14d36ab41f49763c9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 24 Mar 2020 14:57:51 +0100
Subject: [PATCH] Cleanup

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

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index a6c0c48a16..56ac26b0cf 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -86,7 +86,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     interface IBoundaryCallbackMessages {
         void onLoading();
 
-        void onLoaded(int fetched);
+        void onLoaded();
 
         void onException(@NonNull Throwable ex);
     }
@@ -109,33 +109,30 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     @Override
     public void onZeroItemsLoaded() {
         Log.i("Boundary zero loaded");
-        queue_load(true);
+        queue_load();
     }
 
     @Override
     public void onItemAtEndLoaded(@NonNull final TupleMessageEx itemAtEnd) {
         Log.i("Boundary at end");
-        queue_load(false);
+        queue_load();
     }
 
     void retry() {
         state.reset();
-        queue_load(true);
+        queue_load();
     }
 
-    private void queue_load(final boolean zero) {
+    private void queue_load() {
         final State state = this.state;
 
         executor.submit(new Runnable() {
-            private int fetched;
-
             @Override
             public void run() {
                 try {
                     if (state.destroyed || state.error)
                         return;
 
-                    fetched = 0;
                     if (intf != null)
                         handler.post(new Runnable() {
                             @Override
@@ -145,7 +142,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         });
                     if (server)
                         try {
-                            fetched = load_server(state);
+                            load_server(state);
                         } catch (Throwable ex) {
                             if (state.error || ex instanceof IllegalArgumentException)
                                 throw ex;
@@ -155,10 +152,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                             state.reset();
 
                             // Retry
-                            fetched = load_server(state);
+                            load_server(state);
                         }
                     else
-                        fetched = load_device(state);
+                        load_device(state);
                 } catch (final Throwable ex) {
                     state.error = true;
                     Log.e("Boundary", ex);
@@ -174,7 +171,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         handler.post(new Runnable() {
                             @Override
                             public void run() {
-                                intf.onLoaded(zero ? fetched : Integer.MAX_VALUE);
+                                intf.onLoaded();
                             }
                         });
                 }
@@ -585,7 +582,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         });
     }
 
-    void close() {
+    private void close() {
         Log.i("Boundary close");
         try {
             if (state.ifolder != null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 2b34beb440..54d9b7738d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3787,7 +3787,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
 
         @Override
-        public void onLoaded(int fetched) {
+        public void onLoaded() {
             loading = false;
             updateListState("Loaded");
         }