From a0b4065be3e7da2f4c31e8eba2b917e37b3a3184 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 19 May 2020 17:09:25 -0400
Subject: [PATCH] Fix potention OOB error when pulse-highlighting a message.

This basically happened if you used full-text search to search for the
latest message in a conversation, but when you navigated there, it
*also* had a header set (like a typing indicator or unknownSenderView).
---
 .../securesms/conversation/ConversationAdapter.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
index af16b65180..b4e05c0c79 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -358,8 +358,10 @@ public class ConversationAdapter<V extends View & BindableConversationItem>
    */
   void pulseHighlightItem(int position) {
     if (position >= 0 && position < getItemCount()) {
-      recordToPulseHighlight = getItem(position);
-      notifyItemChanged(position);
+      int correctedPosition = isHeaderPosition(position) ? position + 1 : position;
+
+      recordToPulseHighlight = getItem(correctedPosition);
+      notifyItemChanged(correctedPosition);
     }
   }