From 142f84703b1bfd5b6d8a35477e695bef4354679c Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 16 Mar 2015 10:31:42 -0700 Subject: [PATCH] Make clickable conversation items batch selectable Fixes #2679 // FREEBIE --- src/org/thoughtcrime/securesms/ConversationItem.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index b6fb8395f7..62313a1960 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -334,9 +334,10 @@ public class ConversationItem extends LinearLayout { } private void setEvents(MessageRecord messageRecord) { - setClickable(messageRecord.isFailed() || - messageRecord.isPendingInsecureSmsFallback() || - messageRecord.isBundleKeyExchange()); + setClickable(batchSelected.isEmpty() && + (messageRecord.isFailed() || + messageRecord.isPendingInsecureSmsFallback() || + messageRecord.isBundleKeyExchange())); } private void setGroupMessageStatus(MessageRecord messageRecord) {