From 1fc63b759747f5a6cc8151fbf0d62b611052e740 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 4 Dec 2019 10:12:34 -0500
Subject: [PATCH] Fix crash in conversation search.

---
 .../ConversationSearchViewModel.java             | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
index 7f3dda3126..3bc8ad21d2 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
@@ -64,19 +64,27 @@ public class ConversationSearchViewModel extends AndroidViewModel {
   }
 
   void onMoveUp() {
+    if (result.getValue() == null) {
+      return;
+    }
+
     debouncer.clear();
 
-    CursorList<MessageResult> messages = (CursorList<MessageResult>) result.getValue().getResults();
-    int                       position = Math.min(result.getValue().getPosition() + 1, messages.size() - 1);
+    List<MessageResult> messages = result.getValue().getResults();
+    int                 position = Math.min(result.getValue().getPosition() + 1, messages.size() - 1);
 
     result.setValue(new SearchResult(messages, position));
   }
 
   void onMoveDown() {
+    if (result.getValue() == null) {
+      return;
+    }
+
     debouncer.clear();
 
-    CursorList<MessageResult> messages = (CursorList<MessageResult>) result.getValue().getResults();
-    int                       position = Math.max(result.getValue().getPosition() - 1, 0);
+    List<MessageResult> messages = result.getValue().getResults();
+    int                 position = Math.max(result.getValue().getPosition() - 1, 0);
 
     result.setValue(new SearchResult(messages, position));
   }