From 12565d28ae405c8635eae04366e4af6747b85cd9 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 25 Oct 2021 16:30:47 -0300
Subject: [PATCH] Fix possible NPE.

---
 .../securesms/conversation/ConversationViewModel.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
index 30b6ac31b..3388134d7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
@@ -188,7 +188,13 @@ public class ConversationViewModel extends ViewModel {
   void onMessagesCommitted(@NonNull List<ConversationMessage> conversationMessages) {
     if (Util.hasItems(conversationMessages)) {
       threadAnimationStateStore.update(state -> {
-        if (state.getThreadId() == conversationMessages.get(0).getMessageRecord().getThreadId()) {
+        long threadId = conversationMessages.stream()
+                                            .filter(Objects::nonNull)
+                                            .findFirst()
+                                            .map(c -> c.getMessageRecord().getThreadId())
+                                            .orElse(-2L);
+
+        if (state.getThreadId() == threadId) {
           return state.copy(state.getThreadId(), state.getThreadMetadata(), true);
         } else {
           return state;