Fixing merge bugs

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

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()) {
+        runOnUiThread(new Runnable() {
-            filterItem.setEnabled(false);
+            @Override
-        } else {
+            public void run() {
-            filterItem.setEnabled(true);
+                if (resultsProductList.isEmpty()) {
-        }
+                    filterItem.setEnabled(false);
+                } else {
+                    filterItem.setEnabled(true);
+                }
+            }
+        });
 
         // Apply selected sorting to the list
         sortResults();