Merge pull request #8972 from Stypox/fix-suggestions-listadapter

Fix various issues in the search suggestions list

Author: Stypox

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

@@ -340,6 +340,8 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
         searchBinding.suggestionsList.setAdapter(suggestionListAdapter);
+        // animations are just strange and useless, since the suggestions keep changing too much
+        searchBinding.suggestionsList.setItemAnimator(null);
         new ItemTouchHelper(new ItemTouchHelper.Callback() {
             @Override
             public int getMovementFlags(@NonNull final RecyclerView recyclerView,
@@ -944,8 +946,8 @@ public void handleSuggestions(@NonNull final List<SuggestionItem> suggestions) {
         if (DEBUG) {
             Log.d(TAG, "handleSuggestions() called with: suggestions = [" + suggestions + "]");
         }
-        searchBinding.suggestionsList.smoothScrollToPosition(0);
-        suggestionListAdapter.submitList(suggestions);
+        suggestionListAdapter.submitList(suggestions,
+                () -> searchBinding.suggestionsList.scrollToPosition(0));
 
         if (suggestionsPanelVisible && isErrorPanelVisible()) {
             hideLoading();

app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java

@@ -80,13 +80,14 @@ private static class SuggestionItemCallback extends DiffUtil.ItemCallback<Sugges
         @Override
         public boolean areItemsTheSame(@NonNull final SuggestionItem oldItem,
                                        @NonNull final SuggestionItem newItem) {
-            return oldItem.query.equals(newItem.query);
+            return oldItem.fromHistory == newItem.fromHistory
+                    && oldItem.query.equals(newItem.query);
         }
 
         @Override
         public boolean areContentsTheSame(@NonNull final SuggestionItem oldItem,
                                           @NonNull final SuggestionItem newItem) {
-            return oldItem.equals(newItem);
+            return true; // items' contents never change; the list of items themselves does
         }
     }
 }