From e2989373cd5e65ee23ebc709f49ffcec6ae918f6 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sat, 15 Feb 2014 18:40:08 -0800
Subject: [PATCH] All push groups are 'secure' ConversationActivities.

---
 src/org/thoughtcrime/securesms/ConversationActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 8323bebf8a..eddcd6b07a 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -552,8 +552,8 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
                                         R.attr.conversation_send_secure_button};
     TypedArray drawables    = obtainStyledAttributes(attributes);
 
-    if (isSingleConversation() &&
-        Session.hasSession(this, masterSecret, getRecipients().getPrimaryRecipient()))
+    if ((getRecipients() != null && getRecipients().isGroupRecipient()) ||
+        (isSingleConversation() && Session.hasSession(this, masterSecret, getRecipients().getPrimaryRecipient())))
     {
       sendButton.setImageDrawable(drawables.getDrawable(1));
       this.isEncryptedConversation     = true;
@@ -643,6 +643,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
     Intent intent = new Intent(ConversationActivity.this, SingleContactSelectionActivity.class);
     startActivityForResult(intent, PICK_CONTACT);
   }
+
   private void initializeReceivers() {
     securityUpdateReceiver = new BroadcastReceiver() {
       @Override