From cbb23b3d6c6a988d5ecde9d22bf617b073a73c8d Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 7 Feb 2022 12:31:04 -0400
Subject: [PATCH] Close out search if new intent does not request it.

Fixes #11946
---
 .../securesms/conversation/ConversationParentFragment.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index 5c8e850d67..c4bee278ba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -619,6 +619,10 @@ public class ConversationParentFragment extends Fragment
       if (searchViewItem != null && searchViewItem.expandActionView()) {
         searchViewModel.onSearchOpened();
       }
+    } else {
+      searchViewModel.onSearchClosed();
+      viewModel.setSearchQuery(null);
+      inputPanel.setHideForSearch(false);
     }
   }