fix delete and deleteByIds methods in MessagesListAdapter

fiteroc · Sep 26, 2018 · 3a754d7 · 3a754d7
1 parent 719b67a
commit 3a754d7
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListAdapter.java b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListAdapter.java
@@ -239,12 +239,18 @@ public void delete(MESSAGE message) {
      * @param messages messages list to delete.
      */
     public void delete(List<MESSAGE> messages) {
+        boolean result = false;
         for (MESSAGE message : messages) {
             int index = getMessagePositionById(message.getId());
-            items.remove(index);
-            notifyItemRemoved(index);
+            if (index >= 0) {
+                items.remove(index);
+                notifyItemRemoved(index);
+                result = true;
+            }
+        }
+        if (result) {
+            recountDateHeaders();
         }
-        recountDateHeaders();
     }
 
     /**
@@ -267,12 +273,18 @@ public void deleteById(String id) {
      * @param ids array of identifiers of messages to delete.
      */
     public void deleteByIds(String[] ids) {
+        boolean result = false;
         for (String id : ids) {
             int index = getMessagePositionById(id);
-            items.remove(index);
-            notifyItemRemoved(index);
+            if (index >= 0) {
+                items.remove(index);
+                notifyItemRemoved(index);
+                result = true;
+            }
+        }
+        if (result) {
+            recountDateHeaders();
         }
-        recountDateHeaders();
     }
 
     /**