From 82aeee301da33ffe4f63228f82a2ffde7b168019 Mon Sep 17 00:00:00 2001 From: sdkjfhsdkjhfsdlkjhfsdf Date: Tue, 19 Dec 2017 19:53:15 -0600 Subject: [PATCH] can delete text messages again // FREEBIE --- .../ConversationView/ConversationViewItem.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index e61564bdd..00b129185 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -492,12 +492,12 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"EDIT_ITEM_MESSAGE_METADATA_ACTION", @"Short name for edit menu item to show message metadata.") action:self.metadataActionSelector], - // FIXME this is going to be confusing if the text/attachment look like separate entities. - // we can re-enable this once it's clear that deleting the text would also delete the attachment. - // [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"EDIT_ITEM_DELETE_ACTION", - // @"Short name for edit menu item to delete contents of media - // message.") - // action:self.deleteActionSelector], + // FIXME: when deleting a caption, users will be surprised that it also deletes the attachment. + // We either need to implement a way to remove the caption separate from the attachment + // or make a design change which clarifies that the whole message is getting deleted. + [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"EDIT_ITEM_DELETE_ACTION", + @"Short name for edit menu item to delete contents of media message.") + action:self.deleteActionSelector] ]; } - (NSArray *)mediaMenuControllerItems