From 06dd5546914a2b8f0f1107a4e2455ba04dae5b6f Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Sun, 1 Nov 2020 20:09:46 -0500
Subject: [PATCH] Fixing merge bugs

---
 .../com/example/listify/MainActivity.java     | 18 ------------------
 .../com/example/listify/SearchResults.java    | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/MainActivity.java b/Listify/app/src/main/java/com/example/listify/MainActivity.java
index ab0e781..fef669e 100644
--- a/Listify/app/src/main/java/com/example/listify/MainActivity.java
+++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java
@@ -208,24 +208,6 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
         });
     }
 
-    public void onClickSignout(MenuItem m) {
-        m.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                try {
-                    am.signOutUser();
-                    Intent intent = new Intent(MainActivity.this, com.example.listify.ui.LoginPage.class);
-                    startActivity(intent);
-                    finish();
-                }
-                catch (Exception e) {
-                    Log.i("Authentication", e.toString());
-                }
-                return false;
-            }
-        });
-    }
-
     @Override
     public void sendNewListName(String name) {
         Properties configs = new Properties();
diff --git a/Listify/app/src/main/java/com/example/listify/SearchResults.java b/Listify/app/src/main/java/com/example/listify/SearchResults.java
index 788f4f7..96e1fa1 100644
--- a/Listify/app/src/main/java/com/example/listify/SearchResults.java
+++ b/Listify/app/src/main/java/com/example/listify/SearchResults.java
@@ -340,15 +340,24 @@ public class SearchResults extends AppCompatActivity implements FilterDialogFrag
             }
         }
 
+        // Reset selected stores on search so that every store is selected
+        this.selectedStores.clear();
+        this.selectedStores.addAll(stores);
+
         // Add all results to the sorted list
         resultsProductListSorted.addAll(resultsProductList);
       
         // Filtering should only be allowed if there are items in the results
-        if (resultsProductList.isEmpty()) {
-            filterItem.setEnabled(false);
-        } else {
-            filterItem.setEnabled(true);
-        }
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (resultsProductList.isEmpty()) {
+                    filterItem.setEnabled(false);
+                } else {
+                    filterItem.setEnabled(true);
+                }
+            }
+        });
 
         // Apply selected sorting to the list
         sortResults();