From ab8898b42273325d5f5d7edc0fd3f01d9f7e68b0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 18 Jan 2020 16:57:14 +0100
Subject: [PATCH] Show number of messages found, when possible

---
 .../email/BoundaryCallbackMessages.java       | 21 ++++++++++++++++++-
 .../eu/faircode/email/FragmentMessages.java   |  5 +++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 8f208dad73..904d3e9d24 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -88,6 +88,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
         void onLoaded(int fetched);
 
+        void onFound(String query, int count);
+
         void onException(@NonNull Throwable ex);
     }
 
@@ -188,10 +190,19 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean fts = prefs.getBoolean("fts", false);
         boolean pro = ActivityBilling.isPro(context);
-        if (fts && pro && seen == null && flagged == null && snoozed == null && encrypted == null) {
+        if (fts && pro &&
+                query != null &&
+                seen == null && flagged == null && snoozed == null && encrypted == null) {
             if (state.ids == null) {
                 SQLiteDatabase sdb = FtsDbHelper.getInstance(context);
                 state.ids = FtsDbHelper.match(sdb, folder, query);
+
+                handler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        intf.onFound(query, state.ids.size());
+                    }
+                });
             }
 
             try {
@@ -450,7 +461,15 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
                     state.imessages = (Message[]) result;
                 }
+
                 Log.i("Boundary server found messages=" + state.imessages.length);
+                if (query != null)
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            intf.onFound(query, count);
+                        }
+                    });
 
                 state.index = state.imessages.length - 1;
             } catch (Throwable ex) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index fdc4cae413..ab27eb776f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3375,6 +3375,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 pbWait.setVisibility(View.GONE);
         }
 
+        @Override
+        public void onFound(String query, int count) {
+            setSubtitle(getString(R.string.title_name_count, query, count));
+        }
+
         @Override
         public void onException(@NonNull Throwable ex) {
             if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))