From dd836ef589b50a75f78bfd1aa18c330464313aca Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 18 Dec 2018 11:03:00 -0500 Subject: [PATCH] Respond to CR. --- Signal/src/Models/MessageActions.swift | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Signal/src/Models/MessageActions.swift b/Signal/src/Models/MessageActions.swift index cac969b40..4a201baef 100644 --- a/Signal/src/Models/MessageActions.swift +++ b/Signal/src/Models/MessageActions.swift @@ -84,10 +84,8 @@ class ConversationViewItemActions: NSObject { actions.append(copyTextAction) } - if !isFailedOrSending { - let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: conversationViewItem, delegate: delegate) - actions.append(deleteAction) - } + let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: conversationViewItem, delegate: delegate) + actions.append(deleteAction) let showDetailsAction = MessageActionBuilder.showDetails(conversationViewItem: conversationViewItem, delegate: delegate) actions.append(showDetailsAction) @@ -115,10 +113,8 @@ class ConversationViewItemActions: NSObject { } } - if !isFailedOrSending { - let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: conversationViewItem, delegate: delegate) - actions.append(deleteAction) - } + let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: conversationViewItem, delegate: delegate) + actions.append(deleteAction) let showDetailsAction = MessageActionBuilder.showDetails(conversationViewItem: conversationViewItem, delegate: delegate) actions.append(showDetailsAction) @@ -133,11 +129,11 @@ class ConversationViewItemActions: NSObject { if !isFailedOrSending { let replyAction = MessageActionBuilder.reply(conversationViewItem: conversationViewItem, delegate: delegate) actions.append(replyAction) - - let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: conversationViewItem, delegate: delegate) - actions.append(deleteAction) } + let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: conversationViewItem, delegate: delegate) + actions.append(deleteAction) + let showDetailsAction = MessageActionBuilder.showDetails(conversationViewItem: conversationViewItem, delegate: delegate) actions.append(showDetailsAction)