From 3c9e5a9fdbe7edfa420f3abd03eca459bb091060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= <michael@schattgen.me>
Date: Mon, 27 Feb 2023 23:49:35 +0100
Subject: [PATCH] Fix empty state while using search filter

---
 .../com/beemdevelopment/aegis/ui/views/EntryAdapter.java | 4 ++++
 .../beemdevelopment/aegis/ui/views/EntryListView.java    | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
index d482f67a..53083c97 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
@@ -286,6 +286,10 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         }
     }
 
+    public String getSearchFilter() {
+        return _searchFilter;
+    }
+
     public void setSearchFilter(String search) {
         _searchFilter = (search != null && !search.isEmpty()) ? search.toLowerCase() : null;
         updateShownEntries();
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
index 38aa7ded..99393f0d 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
@@ -45,6 +45,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.divider.MaterialDividerItemDecoration;
+import com.google.common.base.Strings;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -207,6 +208,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
     public void setSearchFilter(String search) {
         _adapter.setSearchFilter(search);
         _touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
+
+        updateEmptyState();
     }
 
     public void setSelectedEntry(VaultEntry entry) {
@@ -546,8 +549,10 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
             _recyclerView.setVisibility(View.VISIBLE);
             _emptyStateView.setVisibility(View.GONE);
         } else {
-            _recyclerView.setVisibility(View.GONE);
-            _emptyStateView.setVisibility(View.VISIBLE);
+            if (Strings.isNullOrEmpty(_adapter.getSearchFilter())) {
+                _recyclerView.setVisibility(View.GONE);
+                _emptyStateView.setVisibility(View.VISIBLE);
+            }
         }
     }