From fd862e575bd6aac0f3005a591c9fa2c0d143ba54 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 28 Feb 2019 16:51:10 -0800
Subject: [PATCH] Fix situation where search nav could get stuck.

If you navigated to the ConversationActivity again via some action (like
a shared contact invite) while searching, we don't get the toolbar close
event, and therefore the search nav would stay open. Now we just reset
it on newIntent() to be safe.
---
 .../securesms/conversation/ConversationActivity.java            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 238ffbff98..c7be9d0211 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -394,6 +394,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     if (fragment != null) {
       fragment.onNewIntent();
     }
+
+    searchNav.setVisibility(View.GONE);
   }
 
   @Override