From 90bd775fd57cdcca64080e252aa0623124914351 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Thu, 5 Aug 2021 16:05:52 +1000 Subject: [PATCH] show delete options for only outgoing messages --- .../ConversationVC+Interaction.swift | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 1d78193a6..e2b0fa407 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -546,22 +546,28 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc } func delete(_ viewItem: ConversationViewItem) { - let alertVC = UIAlertController.init(title: nil, message: nil, preferredStyle: .actionSheet) - let deleteLocallyAction = UIAlertAction.init(title: "Delete just for me", style: .destructive) { _ in - self.deleteLocally(viewItem) + if viewItem.interaction.interactionType() == .outgoingMessage { + let alertVC = UIAlertController.init(title: nil, message: nil, preferredStyle: .actionSheet) + let deleteLocallyAction = UIAlertAction.init(title: "Delete just for me", style: .destructive) { _ in + self.deleteLocally(viewItem) + } + alertVC.addAction(deleteLocallyAction) + + var title = "Delete for everyone" + if !viewItem.isGroupThread { + title = "Delete for me and \(viewItem.interaction.thread.name())" + } + let deleteRemotelyAction = UIAlertAction.init(title: title, style: .destructive) { _ in + self.deleteForEveryone(viewItem) + } + alertVC.addAction(deleteRemotelyAction) + + let cancelAction = UIAlertAction.init(title: "Cancel", style: .cancel, handler: nil) + alertVC.addAction(cancelAction) + self.navigationController?.presentAlert(alertVC) + } else { + deleteLocally(viewItem) } - var title = "Delete for everyone" - if !viewItem.isGroupThread { - title = "Delete for me and \(viewItem.interaction.thread.name())" - } - let deleteRemotelyAction = UIAlertAction.init(title: title, style: .destructive) { _ in - self.deleteForEveryone(viewItem) - } - let cancelAction = UIAlertAction.init(title: "Cancel", style: .cancel, handler: nil) - alertVC.addAction(deleteLocallyAction) - alertVC.addAction(deleteRemotelyAction) - alertVC.addAction(cancelAction) - self.navigationController?.presentAlert(alertVC) } private func buildUsendRequest(_ viewItem: ConversationViewItem) -> UnsendRequest? {