From b8effba49790dd0bd5a443c5d177ac32ccfcb942 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 18 Jul 2023 13:44:51 -0300 Subject: [PATCH] Fix crash in hasHeader via range check. --- .../conversation/v2/ConversationItemDecorations.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt index c6f6749fd2..d7af83e26e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt @@ -93,7 +93,11 @@ class ConversationItemDecorations(hasWallpaper: Boolean = false, private val sch } private fun hasHeader(position: Int): Boolean { - val model = currentItems[position] + val model = if (position in currentItems.indices) { + currentItems[position] + } else { + null + } if (model == null || model !is ConversationMessageElement) { return false