From 0503c9eea5a7d0315fc02ecc204d90b68980ea0f Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 23 May 2018 15:16:42 -0400 Subject: [PATCH] Prevent replies on action messages. Fixes #7829 --- src/org/thoughtcrime/securesms/ConversationFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 0ce45ba42c..6361353488 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -266,7 +266,8 @@ public class ConversationFragment extends Fragment menu.findItem(R.id.menu_context_forward).setVisible(!actionMessage); menu.findItem(R.id.menu_context_details).setVisible(!actionMessage); - menu.findItem(R.id.menu_context_reply).setVisible(!messageRecord.isPending() && + menu.findItem(R.id.menu_context_reply).setVisible(!actionMessage && + !messageRecord.isPending() && !messageRecord.isFailed() && messageRecord.isSecure()); }