From 149ac9f41791118ea047232acc4ccbd65c3ecdfb Mon Sep 17 00:00:00 2001
From: Calvin Hu <fivepercentjuice@gmail.com>
Date: Sat, 18 Jul 2015 17:06:02 -0400
Subject: [PATCH] when camera preview is open, the preview toggle button will
 close the preview

closes #3574
---
 src/org/thoughtcrime/securesms/ConversationActivity.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 7edd4c87f9..d901cab072 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1370,8 +1370,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private class QuickAttachmentToggleListener implements OnClickListener {
     @Override
     public void onClick(View v) {
-      composeText.clearFocus();
-      container.show(composeText, quickAttachmentDrawer);
+      if (!quickAttachmentDrawer.isShowing()) {
+        composeText.clearFocus();
+        container.show(composeText, quickAttachmentDrawer);
+      } else {
+        container.hideAttachedInput(false);
+      }
     }
   }