prevent searchbar listener overriding the search result when disabled

Author: ajungg

ui/src/main/java/io/snabble/sdk/ui/search/ProductSearchView.java

@@ -47,6 +47,8 @@ private void inflateView() {
         Project project = SnabbleUI.getProject();
 
         RecyclerView recyclerView = findViewById(R.id.recycler_view);
+
+        searchBarEnabled = true;
         searchBar = findViewById(R.id.search_bar);
         searchBar.addTextChangedListener(new TextWatcher() {
             @Override
@@ -61,7 +63,9 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
 
             @Override
             public void afterTextChanged(Editable s) {
-                search(s.toString());
+                if (searchBarEnabled) {
+                    search(s.toString());
+                }
             }
         });
 
@@ -71,12 +75,9 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if (actionId == EditorInfo.IME_ACTION_DONE
                         || (event.getAction() == KeyEvent.ACTION_DOWN
                         && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    SnabbleUICallback callback = SnabbleUI.getUiCallback();
-                    if (callback != null) {
-                        CharSequence text = searchBar.getText();
-                        if (text != null) {
-                            callback.showScannerWithCode(text.toString());
-                        }
+                    CharSequence text = searchBar.getText();
+                    if (text != null) {
+                        showScannerWithCode(text.toString());
                     }
 
                     return true;
@@ -137,11 +138,15 @@ public void setSearchBarEnabled(boolean searchBarEnabled) {
 
     public void search(String searchQuery) {
         if (searchBarEnabled) {
-            searchBar.setText(searchQuery);
+            if(!searchBar.getText().toString().equals(searchQuery)) {
+                searchBar.setText(searchQuery);
+            }
         }
 
-        lastSearchQuery = searchQuery;
-        searchableProductAdapter.search(searchQuery);
+        if (lastSearchQuery == null || !lastSearchQuery.equals(searchQuery)) {
+            lastSearchQuery = searchQuery;
+            searchableProductAdapter.search(searchQuery);
+        }
     }
 
     private void onSearchUpdated() {