From 94e8553b736cf03c94d55b683861949e412f9c70 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 15 Feb 2019 19:24:23 -0800
Subject: [PATCH] Fix possible NPE during conversation load.

---
 .../securesms/conversation/ConversationActivity.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index d07efde756..998d08fd26 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -1671,7 +1671,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId());
       initializeSecurity(isSecureText, isDefaultSms);
 
-      if (!searchViewItem.isActionViewExpanded()) {
+      if (searchViewItem == null || !searchViewItem.isActionViewExpanded()) {
         invalidateOptionsMenu();
       }
     });