From 5c97b1e864662cb1d72fc1549f93973737b538e2 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 6 Jan 2014 20:03:16 -0800
Subject: [PATCH] Twiddle the auto initiate

---
 .../thoughtcrime/securesms/ConversationItem.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 178c0bb654..94de626921 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -200,12 +200,17 @@ public class ConversationItem extends LinearLayout {
   }
 
   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(),
-          messageRecord.getBody().getBody(),
-          messageRecord.getThreadId());
+                           messageRecord.getBody().getBody(),
+                           messageRecord.getThreadId());
     }
   }