From 65a6488e445e1559c85bb2d26ab962dafe77b635 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 30 Oct 2017 22:04:58 +0100
Subject: [PATCH] dont show search history in suggestion when disabled

---
 .../fragments/list/search/SearchFragment.java    |  6 ++++++
 .../list/search/SuggestionListAdapter.java       | 16 +++++++++++++++-
 app/src/main/res/layout/activity_history.xml     |  1 -
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index 90d4d9741..fae97bb7b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -113,6 +113,7 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     private int currentNextPage = 0;
     private String searchLanguage;
     private boolean isSuggestionsEnabled = true;
+    private boolean isSearchHistoryEnabled = true;
 
     private PublishSubject<String> suggestionPublisher = PublishSubject.create();
     private Disposable searchDisposable;
@@ -160,7 +161,12 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
+
         suggestionListAdapter = new SuggestionListAdapter(activity);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
+        isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
+        suggestionListAdapter.setShowSugestinHistory(isSearchHistoryEnabled);
+        
         searchHistoryDAO = NewPipeDatabase.getInstance().searchHistoryDAO();
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
index 71d9bf780..3e59b7fa9 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
@@ -19,6 +19,7 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
     private final ArrayList<SuggestionItem> items = new ArrayList<>();
     private final Context context;
     private OnSuggestionItemSelected listener;
+    private boolean showSugestinHistory = true;
 
     public interface OnSuggestionItemSelected {
         void onSuggestionItemSelected(SuggestionItem item);
@@ -31,7 +32,16 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
 
     public void setItems(List<SuggestionItem> items) {
         this.items.clear();
-        this.items.addAll(items);
+        if (showSugestinHistory) {
+            this.items.addAll(items);
+        } else {
+            // remove history items if history is disabled
+            for (SuggestionItem item : items) {
+                if (!item.fromHistory) {
+                    this.items.add(item);
+                }
+            }
+        }
         notifyDataSetChanged();
     }
 
@@ -39,6 +49,10 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
         this.listener = listener;
     }
 
+    public void setShowSugestinHistory(boolean v) {
+        showSugestinHistory = v;
+    }
+
     @Override
     public SuggestionItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         return new SuggestionItemHolder(LayoutInflater.from(context).inflate(R.layout.item_search_suggestion, parent, false));
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index 7076eb34f..e53b9bff9 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -13,7 +13,6 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/appbar_padding_top"
         android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
         app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">