From 4cddc76284b87cbe58bb0369194d37a439680efd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 26 Nov 2022 19:44:58 +0100
Subject: [PATCH] Refactoring

---
 .../java/eu/faircode/email/ActivityView.java     | 16 ++++++++--------
 .../java/eu/faircode/email/AdapterNavSearch.java |  8 ++++----
 .../main/java/eu/faircode/email/DaoSearch.java   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 13364bf8d9..a8e7f4f9e0 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -999,17 +999,17 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             }
         });
 
-        db.search().liveSearch().observe(owner, new Observer<List<EntitySearch>>() {
+        db.search().liveSearches().observe(owner, new Observer<List<EntitySearch>>() {
             @Override
-            public void onChanged(List<EntitySearch> search) {
-                if (search == null)
-                    search = new ArrayList<>();
-                adapterNavSearch.set(search, nav_expanded);
+            public void onChanged(List<EntitySearch> searches) {
+                if (searches == null)
+                    searches = new ArrayList<>();
+                adapterNavSearch.set(searches, nav_expanded);
 
                 boolean nav_search = prefs.getBoolean("nav_search", true);
-                ibExpanderSearch.setVisibility(search.size() > 0 ? View.VISIBLE : View.GONE);
-                rvSearch.setVisibility(search.size() > 0 && nav_search ? View.VISIBLE : View.GONE);
-                vSeparatorSearch.setVisibility(search.size() > 0 ? View.VISIBLE : View.GONE);
+                ibExpanderSearch.setVisibility(searches.size() > 0 ? View.VISIBLE : View.GONE);
+                rvSearch.setVisibility(searches.size() > 0 && nav_search ? View.VISIBLE : View.GONE);
+                vSeparatorSearch.setVisibility(searches.size() > 0 ? View.VISIBLE : View.GONE);
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavSearch.java b/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
index 397cc0cb94..631fb4e690 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
@@ -142,13 +142,13 @@ public class AdapterNavSearch extends RecyclerView.Adapter<AdapterNavSearch.View
         });
     }
 
-    public void set(@NonNull List<EntitySearch> search, boolean expanded) {
-        Log.i("Set nav search=" + search.size() + " expanded=" + expanded);
+    public void set(@NonNull List<EntitySearch> searches, boolean expanded) {
+        Log.i("Set nav search=" + searches.size() + " expanded=" + expanded);
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, search), false);
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, searches), false);
 
         this.expanded = expanded;
-        this.items = search;
+        this.items = searches;
 
         diff.dispatchUpdatesTo(new ListUpdateCallback() {
             @Override
diff --git a/app/src/main/java/eu/faircode/email/DaoSearch.java b/app/src/main/java/eu/faircode/email/DaoSearch.java
index 5af3463b7c..3d89a3883f 100644
--- a/app/src/main/java/eu/faircode/email/DaoSearch.java
+++ b/app/src/main/java/eu/faircode/email/DaoSearch.java
@@ -31,7 +31,7 @@ import java.util.List;
 public interface DaoSearch {
     @Query("SELECT * FROM search" +
             " ORDER BY `order`, name COLLATE NOCASE")
-    LiveData<List<EntitySearch>> liveSearch();
+    LiveData<List<EntitySearch>> liveSearches();
 
     @Query("SELECT * FROM search")
     List<EntitySearch> getSearches();