Merge pull request #1550 from mcginty/email-send-fix

send email addresses as mms
This commit is contained in:
Moxie Marlinspike 2014-06-03 12:46:08 -07:00
commit 59899b1caf

View File

@ -1022,7 +1022,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
if ((!recipients.isSingleRecipient() || recipients.isEmailRecipient()) && !isMmsEnabled) { if ((!recipients.isSingleRecipient() || recipients.isEmailRecipient()) && !isMmsEnabled) {
handleManualMmsRequired(); handleManualMmsRequired();
return; return;
} else if (attachmentManager.isAttachmentPresent() || !recipients.isSingleRecipient() || recipients.isGroupRecipient()) { } else if (attachmentManager.isAttachmentPresent() || !recipients.isSingleRecipient() || recipients.isGroupRecipient() || recipients.isEmailRecipient()) {
SlideDeck slideDeck; SlideDeck slideDeck;
if (attachmentManager.isAttachmentPresent()) slideDeck = attachmentManager.getSlideDeck(); if (attachmentManager.isAttachmentPresent()) slideDeck = attachmentManager.getSlideDeck();