From a712875830f817ac4d29da0630c9da153761fcce Mon Sep 17 00:00:00 2001 From: Rhodey Orbits Date: Mon, 1 Jun 2015 16:05:10 -0700 Subject: [PATCH] allow batch selection of failed messages Fixes #2764 Closes #3304 // FREEBIE --- src/org/thoughtcrime/securesms/ConversationItem.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index 28b903ad77..55e8d1e49f 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -319,6 +319,9 @@ public class ConversationItem extends LinearLayout { (messageRecord.isFailed() || messageRecord.isPendingInsecureSmsFallback() || messageRecord.isBundleKeyExchange())); + if (messageRecord.isFailed()) { + setOnLongClickListener(new MultiSelectLongClickListener()); + } } private void setGroupMessageStatus(MessageRecord messageRecord) { @@ -452,7 +455,9 @@ public class ConversationItem extends LinearLayout { private class ClickListener implements View.OnClickListener { public void onClick(View v) { - if (messageRecord.isFailed()) { + if (messageRecord.isFailed() && !batchSelected.isEmpty()) { + selectionClickListener.onItemClick(null, ConversationItem.this, -1, -1); + } else if(messageRecord.isFailed()) { Intent intent = new Intent(context, MessageDetailsActivity.class); intent.putExtra(MessageDetailsActivity.MASTER_SECRET_EXTRA, masterSecret); intent.putExtra(MessageDetailsActivity.MESSAGE_ID_EXTRA, messageRecord.getId());