oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/oxen-io/session-ios into voice-calls-2

Browse source
This commit is contained in:
ryanzhao 2021-10-25 09:38:03 +11:00
parent fb156b7d52 e529e68cb2
commit 7dfb999239
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Session/Conversations/ConversationVC+Interaction.swift
View file

@ -595,8 +595,13 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
return
}
if viewItem.interaction.interactionType() == .outgoingMessage,
let message = viewItem.interaction as? TSMessage, message.serverHash != nil {
guard let message = viewItem.interaction as? TSMessage else { return self.deleteLocally(viewItem) }
// Handle open group messages the old way
if message.isOpenGroupMessage { return self.deleteForEveryone(viewItem) }
// Handle 1-1 and closed group messages with unsend request
if viewItem.interaction.interactionType() == .outgoingMessage, message.serverHash != nil {
let alertVC = UIAlertController.init(title: nil, message: nil, preferredStyle: .actionSheet)
let deleteLocallyAction = UIAlertAction.init(title: NSLocalizedString("delete_message_for_me", comment: ""), style: .destructive) { _ in
self.deleteLocally(viewItem)

2
Session/Media Viewing & Editing/MediaPageViewController.swift
View file

@ -406,7 +406,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
}
let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
let deleteAction = UIAlertAction(title: NSLocalizedString("TXT_DELETE_TITLE", comment: ""),
let deleteAction = UIAlertAction(title: NSLocalizedString("delete_message_for_me", comment: ""),
style: .destructive) { _ in
let deletedItem = currentViewController.galleryItem
mediaGalleryDataSource.delete(items: [deletedItem], initiatedBy: self)