From e4082dc33aa9c01f2ef16cdcd31e0f4e68b897c5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 27 Mar 2021 08:14:21 +0100
Subject: [PATCH] Restore search

---
 .../main/java/eu/faircode/email/AdapterAnswer.java    |  3 ++-
 .../main/java/eu/faircode/email/AdapterContact.java   |  3 ++-
 app/src/main/java/eu/faircode/email/AdapterRule.java  |  3 ++-
 .../main/java/eu/faircode/email/FragmentAnswers.java  | 11 ++++++-----
 .../main/java/eu/faircode/email/FragmentContacts.java | 11 ++++++-----
 .../main/java/eu/faircode/email/FragmentRules.java    | 11 ++++++-----
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterAnswer.java b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
index 73b1964d87..352c6e9acf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAnswer.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
@@ -236,7 +236,7 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
     }
 
     public void set(@NonNull List<EntityAnswer> answers) {
-        Log.i("Set answers=" + answers.size());
+        Log.i("Set answers=" + answers.size() + " search=" + search);
 
         all = answers;
 
@@ -283,6 +283,7 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
     }
 
     public void search(String query) {
+        Log.i("Answers query=" + query);
         search = query;
         set(all);
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterContact.java b/app/src/main/java/eu/faircode/email/AdapterContact.java
index a7f914530a..122377c974 100644
--- a/app/src/main/java/eu/faircode/email/AdapterContact.java
+++ b/app/src/main/java/eu/faircode/email/AdapterContact.java
@@ -363,7 +363,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
     }
 
     public void set(@NonNull List<TupleContactEx> contacts) {
-        Log.i("Set contacts=" + contacts.size());
+        Log.i("Set contacts=" + contacts.size() + " search=" + search);
 
         all = contacts;
 
@@ -408,6 +408,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
     }
 
     public void search(String query) {
+        Log.i("Contacts query=" + query);
         search = query;
         set(all);
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java
index 191cea7efe..0fde2a7aeb 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@@ -425,7 +425,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
 
     public void set(int protocol, @NonNull List<TupleRuleEx> rules) {
         this.protocol = protocol;
-        Log.i("Set protocol=" + protocol + " rules=" + rules.size());
+        Log.i("Set protocol=" + protocol + " rules=" + rules.size() + " search=" + search);
 
         all = rules;
 
@@ -484,6 +484,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
     }
 
     public void search(String query) {
+        Log.i("Rules query=" + query);
         search = query;
         set(protocol, all);
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswers.java b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
index 9ba960f6b6..3ef4e052b0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswers.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
@@ -128,10 +128,9 @@ public class FragmentAnswers extends FragmentBase {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        if (savedInstanceState != null) {
+        if (savedInstanceState != null)
             searching = savedInstanceState.getString("fair:searching");
-            adapter.search(searching);
-        }
+        adapter.search(searching);
 
         DB db = DB.getInstance(getContext());
         db.answer().liveAnswers().observe(getViewLifecycleOwner(), new Observer<List<EntityAnswer>>() {
@@ -164,8 +163,10 @@ public class FragmentAnswers extends FragmentBase {
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextChange(String newText) {
-                searching = newText;
-                adapter.search(newText);
+                if (getView() != null) {
+                    searching = newText;
+                    adapter.search(newText);
+                }
                 return true;
             }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java
index 4d9cd0b823..9e20038377 100644
--- a/app/src/main/java/eu/faircode/email/FragmentContacts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java
@@ -92,10 +92,9 @@ public class FragmentContacts extends FragmentBase {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        if (savedInstanceState != null) {
+        if (savedInstanceState != null)
             searching = savedInstanceState.getString("fair:searching");
-            adapter.search(searching);
-        }
+        adapter.search(searching);
 
         DB db = DB.getInstance(getContext());
         db.contact().liveContacts().observe(getViewLifecycleOwner(), new Observer<List<TupleContactEx>>() {
@@ -130,8 +129,10 @@ public class FragmentContacts extends FragmentBase {
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextChange(String newText) {
-                searching = newText;
-                adapter.search(newText);
+                if (getView() != null) {
+                    searching = newText;
+                    adapter.search(newText);
+                }
                 return true;
             }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentRules.java b/app/src/main/java/eu/faircode/email/FragmentRules.java
index fa210139dc..013bec4442 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRules.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRules.java
@@ -172,10 +172,9 @@ public class FragmentRules extends FragmentBase {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        if (savedInstanceState != null) {
+        if (savedInstanceState != null)
             searching = savedInstanceState.getString("fair:searching");
-            adapter.search(searching);
-        }
+        adapter.search(searching);
 
         DB db = DB.getInstance(getContext());
         db.rule().liveRules(folder).observe(getViewLifecycleOwner(), new Observer<List<TupleRuleEx>>() {
@@ -236,8 +235,10 @@ public class FragmentRules extends FragmentBase {
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextChange(String newText) {
-                searching = newText;
-                adapter.search(newText);
+                if (getView() != null) {
+                    searching = newText;
+                    adapter.search(newText);
+                }
                 return true;
             }