From 5b4fbe32b180510ea044285b138b3c198ebe2325 Mon Sep 17 00:00:00 2001
From: Saurav Rao <56369484+sauravrao637@users.noreply.github.com>
Date: Wed, 12 May 2021 18:03:00 +0530
Subject: [PATCH] Fix trying to delete object not in list (#6127)

* fix trying to delete object by index -1

* correction in checkstyle-supressions.xml

Co-authored-by: camo0112 <56369484+camo0112@users.noreply.github.com>
---
 .../newpipe/local/LocalItemListAdapter.java       | 15 +++++++++++++--
 checkstyle-suppressions.xml                       |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index da8902c08..5d81c0069 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -126,8 +126,19 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     public void removeItem(final LocalItem data) {
         final int index = localItems.indexOf(data);
-        localItems.remove(index);
-        notifyItemRemoved(index + (header != null ? 1 : 0));
+        if (index != -1) {
+            localItems.remove(index);
+            notifyItemRemoved(index + (header != null ? 1 : 0));
+        } else {
+            // this happens when
+            // 1) removeItem is called on infoItemDuplicate as in showStreamItemDialog of
+            // LocalPlaylistFragment in this case need to implement delete object by it's duplicate
+
+            // OR
+
+            // 2)data not in itemList and UI is still not updated so notifyDataSetChanged()
+            notifyDataSetChanged();
+        }
     }
 
     public boolean swapItems(final int fromAdapterPosition, final int toAdapterPosition) {
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 2ff7ae68d..e97272fe6 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -5,7 +5,7 @@
 <suppressions>
   <suppress checks="FinalParameters"
     files="LocalItemListAdapter.java"
-    lines="221,293"/>
+    lines="232,304"/>
 
   <suppress checks="FinalParameters"
     files="InfoListAdapter.java"