From 912c2dc50517f704536ab61c21e88e192c2c2dc8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 14 Jan 2025 12:54:53 +0100
Subject: [PATCH] Reuse search term

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

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 99b014ea97..4fbc18d5ae 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4644,7 +4644,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     else
                         context.startActivity(new Intent(context, ActivityBilling.class));
                 } else if (id == R.id.ibSearchText) {
-                    onSearchText(message);
+                    onSearchText(message, searched);
                 } else if (id == R.id.ibSearch) {
                     onSearchContact(message, false);
                 } else if (id == R.id.ibTranslate) {
@@ -6572,7 +6572,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         onMenuManageKeywords(message);
                         return true;
                     } else if (itemId == R.id.menu_search_in_text) {
-                        onSearchText(message);
+                        onSearchText(message, searched);
                         return true;
                     } else if (itemId == R.id.menu_translate) {
                         onActionTranslate(message);
@@ -7527,8 +7527,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }
         }
 
-        private void onSearchText(TupleMessageEx message) {
-            properties.startSearch(tvBody);
+        private void onSearchText(TupleMessageEx message, String term) {
+            properties.startSearch(tvBody, term);
         }
 
         private void onMenuCreateRule(TupleMessageEx message) {
@@ -9484,7 +9484,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         void reply(TupleMessageEx message, CharSequence selected, View anchor);
 
-        void startSearch(TextView view);
+        void startSearch(TextView view, String term);
 
         void endSearch();
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 090f5a11a0..6879685a51 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2903,8 +2903,8 @@ public class FragmentMessages extends FragmentBase
             onReply(message, selected, anchor);
         }
 
-        public void startSearch(TextView view) {
-            FragmentMessages.this.startSearch(view);
+        public void startSearch(TextView view, String term) {
+            FragmentMessages.this.startSearch(view, term);
         }
 
         public void endSearch() {
@@ -8882,7 +8882,7 @@ public class FragmentMessages extends FragmentBase
         }
     }
 
-    private void startSearch(TextView view) {
+    private void startSearch(TextView view, String term) {
         searchView = view;
 
         searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
@@ -8898,10 +8898,13 @@ public class FragmentMessages extends FragmentBase
             }
         });
 
-        etSearch.setText(null);
+        etSearch.setText(term);
         etSearch.setVisibility(View.VISIBLE);
-        etSearch.requestFocus();
-        Helper.showKeyboard(etSearch);
+        if (term == null) {
+            etSearch.requestFocus();
+            Helper.showKeyboard(etSearch);
+        } else
+            performSearch(false);
     }
 
     private void endSearch() {