From e04f76b558129a528742ec9cbb2f8beb513c6347 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 8 Jun 2020 15:45:07 -0300
Subject: [PATCH] Fix issue where invalid PagedList objects were passed to
 ConversationAdapter.

---
 .../securesms/conversation/ConversationFragment.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 579412bd18..888cf8d5a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -219,9 +219,11 @@ public class ConversationFragment extends Fragment {
 
     this.conversationViewModel = ViewModelProviders.of(requireActivity(), new ConversationViewModel.Factory()).get(ConversationViewModel.class);
     conversationViewModel.getMessages().observe(this, list -> {
-      if (getListAdapter() != null) {
+      if (getListAdapter() != null && !list.getDataSource().isInvalid()) {
         Log.i(TAG, "submitList");
         getListAdapter().submitList(list);
+      } else if (list.getDataSource().isInvalid()) {
+        Log.i(TAG, "submitList skipped an invalid list");
       }
     });
     conversationViewModel.getConversationMetadata().observe(this, data -> deferred.defer(() -> presentConversationMetadata(data)));