Refactoring

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) {
+            public void onChanged(List<EntitySearch> searches) {
-                if (search == null)
+                if (searches == null)
-                    search = new ArrayList<>();
+                    searches = new ArrayList<>();
-                adapterNavSearch.set(search, nav_expanded);
+                adapterNavSearch.set(searches, nav_expanded);
 
                 boolean nav_search = prefs.getBoolean("nav_search", true);
-                ibExpanderSearch.setVisibility(search.size() > 0 ? View.VISIBLE : View.GONE);
+                ibExpanderSearch.setVisibility(searches.size() > 0 ? View.VISIBLE : View.GONE);
-                rvSearch.setVisibility(search.size() > 0 && nav_search ? View.VISIBLE : View.GONE);
+                rvSearch.setVisibility(searches.size() > 0 && nav_search ? View.VISIBLE : View.GONE);
-                vSeparatorSearch.setVisibility(search.size() > 0 ? View.VISIBLE : View.GONE);
+                vSeparatorSearch.setVisibility(searches.size() > 0 ? View.VISIBLE : View.GONE);
             }
         });
 

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) {
+    public void set(@NonNull List<EntitySearch> searches, boolean expanded) {
-        Log.i("Set nav search=" + search.size() + " expanded=" + 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

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();