Do not crash if we try to access an item outside of the bounds of the…

… conversation.
cascheberg · Jun 28, 2021 · 44119b6 · 44119b6
1 parent d4a3b44
commit 44119b6
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -387,7 +387,13 @@ public void onBindHeaderViewHolder(StickyHeaderViewHolder viewHolder, int positi
       if (pagingController != null) {
         pagingController.onDataNeededAroundIndex(correctedPosition);
       }
-      return super.getItem(correctedPosition);
+
+      if (correctedPosition < getItemCount()) {
+        return super.getItem(correctedPosition);
+      } else {
+        Log.d(TAG, "Could not access corrected position " + correctedPosition + " as it is out of bounds.");
+        return null;
+      }
     }
   }