From 4af6fea84d89977aedb936712082409903db97fe Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 4 Apr 2020 20:23:48 +0200
Subject: [PATCH] hide input field and attachment draft when opening in-chat
 search

---
 .../securesms/ConversationActivity.java       | 24 +++++++++++++++++--
 .../securesms/mms/AttachmentManager.java      | 14 +++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index bf1a1efad..9cc3b6b54 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -461,13 +461,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
         @Override
         public boolean onMenuItemActionExpand(final MenuItem item) {
-          ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, false);
+          searchExpand(menu, item);
           return true;
         }
 
         @Override
         public boolean onMenuItemActionCollapse(final MenuItem item) {
-          ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, true);
+          searchCollapse(menu, item);
           return true;
         }
       });
@@ -1534,6 +1534,26 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   // in-chat search
 
+  int beforeSearchComposeVisibility = View.VISIBLE;
+  int beforeSearchAttachVisibility = View.GONE;
+
+  private void searchExpand(final Menu menu, final MenuItem searchItem) {
+    beforeSearchComposeVisibility = composePanel.getVisibility();
+    composePanel.setVisibility(View.GONE);
+
+    beforeSearchAttachVisibility = attachmentManager.getVisibility();
+    attachmentManager.setVisibility(View.GONE);
+
+    ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, false);
+  }
+
+  private void searchCollapse(final Menu menu, final MenuItem searchItem) {
+    composePanel.setVisibility(beforeSearchComposeVisibility);
+    attachmentManager.setVisibility(beforeSearchAttachVisibility);
+
+    ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, true);
+  }
+
   private void handleMenuSearchNext(boolean searchNext) {
   }
 
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 3220416de..822299932 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -592,4 +592,18 @@ public class AttachmentManager {
     }
 
   }
+
+  public int getVisibility() {
+    int ret = View.GONE;
+    try {
+      ret = attachmentViewStub.get().getVisibility();
+    } catch(Exception e) {}
+    return ret;
+  }
+
+  public void setVisibility(int vis) {
+    try {
+      attachmentViewStub.get().setVisibility(vis);
+    } catch(Exception e) {}
+  }
 }