Twiddle the auto initiate

This commit is contained in:
Moxie Marlinspike 2014-01-06 20:03:16 -08:00
parent dde2d2564a
commit 5c97b1e864

View File

@ -200,9 +200,14 @@ public class ConversationItem extends LinearLayout {
} }
private void setEvents(MessageRecord messageRecord) { private void setEvents(MessageRecord messageRecord) {
setClickable(messageRecord.isKeyExchange() && !messageRecord.isOutgoing()); setClickable(messageRecord.isKeyExchange() &&
!messageRecord.isCorruptedKeyExchange() &&
!messageRecord.isOutgoing());
if (!messageRecord.isOutgoing() && messageRecord.getRecipients().isSingleRecipient()) { if (!messageRecord.isOutgoing() &&
messageRecord.getRecipients().isSingleRecipient() &&
!messageRecord.isSecure())
{
checkForAutoInitiate(messageRecord.getIndividualRecipient(), checkForAutoInitiate(messageRecord.getIndividualRecipient(),
messageRecord.getBody().getBody(), messageRecord.getBody().getBody(),
messageRecord.getThreadId()); messageRecord.getThreadId());