blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

All push groups are 'secure' ConversationActivities.

master
Moxie Marlinspike 2014-02-15 18:40:08 -08:00
parent 4e703d5a00
commit e2989373cd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -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