feat(cells): delete message with files - WPB-19433

WireMessaging/Sources/WireMessagingAssembly/WireCellsFactory.swift

@@ -109,6 +109,14 @@ public struct WireCellsFactory {
         )
     }
 
+    public func makeDeleteNodesUseCase() -> any WireCellsDeleteNodesUseCaseProtocol {
+        WireCellsDeleteNodesUseCase(
+            repository: nodesAPI,
+            fileCache: fileCache,
+            localAssetStore: localAssetStore
+        )
+    }
+
 }
 
 public extension WireCellsFactory {

WireMessaging/Sources/WireMessagingDomain/WireCells/Protocols/WireCellsDeleteNodesUseCaseProtocol.swift

@@ -0,0 +1,25 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+public import Foundation
+
+public protocol WireCellsDeleteNodesUseCaseProtocol: Sendable {
+
+    func invoke(nodeIDs: [UUID]) async throws
+
+}

WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/WireCellsDeleteNodesUseCase.swift

@@ -23,7 +23,7 @@ package enum WireCellsDeleteNodesError: Error {
 }
 
 /// Deletes `WireCellNodes`s from both the server and locally cached data.
-package struct WireCellsDeleteNodesUseCase: Sendable {
+package struct WireCellsDeleteNodesUseCase: WireCellsDeleteNodesUseCaseProtocol {
 
     private let repository: any WireCellsNodesRepositoryProtocol
     private let fileCache: any FileCache

wire-ios/Wire-iOS Tests/ArticleViewTests.swift

@@ -76,6 +76,14 @@ final class MockConversationMessageCellDelegate: ConversationMessageCellDelegate
     ) {
         // no-op
     }
+
+    func conversationMessageWantsToDeleteFiles(
+        _ attachments: [WireDataModel.MultipartMessageData.Attachment],
+        for multipartMessage: any WireDataModel.ZMConversationMessage,
+        deletionType: Wire.DeletionType
+    ) {
+        // no-op
+    }
 }
 
 // MARK: - MockArticleViewDelegate

wire-ios/Wire-iOS Tests/ConversationContentViewControllerTests.swift

@@ -72,12 +72,12 @@ final class ConversationContentViewControllerTests: XCTestCase, CoreDataFixtureT
 
         // create deletionDialogPresenter
         let message = MockMessageFactory.textMessage(withText: "test")
-        sut.messageAction(actionId: .delete, for: message, view: view)
+        sut.messageAction(actionId: .delete(), for: message, view: view)
 
         try verify(matching: sut.deletionDialogPresenter!.deleteAlert(
             message: mockMessage,
             sourceView: view,
             userSession: userSession
-        ) { _ in })
+        ) { _, _ in })
     }
 }

wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift

@@ -797,7 +797,7 @@ extension CollectionsViewController: CollectionCellDelegate {
                 forMessage: message,
                 source: source,
                 userSession: userSession
-            ) { [weak self] deleted in
+            ) { [weak self] deleted, _ in
                 guard deleted else { return }
                 _ = self?.navigationController?.popViewController(animated: true)
                 self?.refetchCollection()

wire-ios/Wire-iOS/Sources/UserInterface/Collections/ConversationImagesViewController.swift

@@ -35,7 +35,7 @@
         options: [:]
     )
     var buttonsBar: InputBarButtonsView!
-    lazy var deleteButton = iconButton(messageAction: .delete)
+    lazy var deleteButton = iconButton(messageAction: .delete())
     let overlay = FeedbackOverlayView()
     let separator: UIView = {
         let view = UIView()
@@ -286,7 +286,7 @@
 
             let emojiSketchButton = iconButton(messageAction: .sketchEmoji)
 
             let revealButton = iconButton(messageAction: .showInConversation)
             if !MediaShareRestrictionManager(sessionRestriction: ZMUserSession.shared()).canDownloadMedia {
                 buttons = [sketchButton, emojiSketchButton, revealButton]
             } else {
@@ -444,7 +444,7 @@
 
     @objc
     func deleteCurrent(_ sender: AnyObject!) {
-        perform(action: .delete, sender: sender)
+        perform(action: .delete(), sender: sender)
     }
 
     @objc

wire-ios/Wire-iOS/Sources/UserInterface/Components/Controllers/FullscreenImageViewController.swift

@@ -601,7 +601,7 @@
     @objc
     private func didTapBackground(_ tapper: UITapGestureRecognizer?) {
         isShowingChrome = !isShowingChrome
         setSelectedByMenu(false, animated: false)
         UIMenuController.shared.hideMenu()
         delegate?.fadeAndHideMenu(delegate?.menuVisible == false)
     }
@@ -612,11 +612,11 @@
 
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(menuDidHide(_:)),
             name: UIMenuController.didHideMenuNotification,
             object: nil
         )
 
         let menuController = UIMenuController.shared
         menuController.menuItems = ConversationMessageActionController.allMessageActions
 
@@ -629,7 +629,7 @@
         setSelectedByMenu(true, animated: true)
     }
 
     private func hideMenu() {
         UIMenuController.shared.hideMenu()
     }
 
@@ -766,7 +766,7 @@
     }
 
     @objc
     private func menuDidHide(_ notification: Notification?) {
         NotificationCenter.default.removeObserver(self, name: UIMenuController.didHideMenuNotification, object: nil)
         setSelectedByMenu(false, animated: true)
     }
@@ -805,7 +805,7 @@
 
             // iPad popover points to delete button of container is availible. The scrollView occupies most of the
             // screen area and the popover is compressed.
-            = if action == .delete,
+            = if action == .delete(),
             let conversationImagesViewController = delegate as? ConversationImagesViewController {
             conversationImagesViewController.deleteButton
         } else {

wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationMessageToolboxCell.swift

@@ -102,7 +102,7 @@
     }
 
     func messageToolboxViewDidSelectDelete(_ sender: UIView?) {
-        perform(action: .delete, sender: sender)
+        perform(action: .delete(), sender: sender)
     }
 
     func messageToolboxViewDidSelectResend(_ messageToolboxView: MessageToolboxView) {
@@ -131,7 +131,7 @@
     weak var delegate: ConversationMessageCellDelegate?
     weak var actionController: ConversationMessageActionController?
 
     let containsHighlightableContent: Bool = false
     lazy var shouldAlignMessageContentForBubbles: Bool = ZMUserSession.shared()?.isChatBubbleSimpleEnabled ?? false
 
     let accessibilityIdentifier: String? = "MessageToolbox"

wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Content/Rich Content/ConversationMultipartMessageCell.swift

@@ -27,13 +27,14 @@ final class ConversationMultipartMessageCell: UIView, ConversationMessageCell {
 
     struct Configuration {
         var attachments: [MultipartMessageData.Attachment]
+        var onDeletion: (DeletionType) -> Void
     }
 
     private var containerView = UIView()
     weak var delegate: ConversationMessageCellDelegate?
     weak var message: ZMConversationMessage?
     weak var actionController: ConversationMessageActionController?
-
+    var onDeletion: ((DeletionType) -> Void)?
     var isSelected: Bool = false
 
     override init(frame: CGRect) {
@@ -83,6 +84,8 @@ final class ConversationMultipartMessageCell: UIView, ConversationMessageCell {
         with object: Configuration,
         animated: Bool
     ) {
+        onDeletion = object.onDeletion
+
         let attachments = object.attachments.map {
             WireCellsMessageAttachment(
                 nodeID: $0.nodeID,
@@ -139,12 +142,15 @@ final class ConversationMultipartMessageCellDescription: ConversationMessageCell
 
     let accessibilityIdentifier: String? = nil
     let accessibilityLabel: String? = nil
+    var supportsActions: Bool = true
 
     init(
-        multipartMessage: MultipartMessageData
+        multipartMessage: MultipartMessageData,
+        onDeletion: @escaping (DeletionType) -> Void
     ) {
         self.configuration = View.Configuration(
-            attachments: multipartMessage.attachments
+            attachments: multipartMessage.attachments,
+            onDeletion: onDeletion
         )
     }
 }

wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Content/Text/ConversationLinkAttachmentCell.swift

@@ -27,6 +27,7 @@
     struct Configuration: Equatable {
         var attachment: LinkAttachment
         var thumbnailResource: WireImageResource?
+        var onDeletion: ((DeletionType) -> Void)?
 
         static func == (lhs: Configuration, rhs: Configuration) -> Bool {
             lhs.attachment == rhs.attachment &&
@@ -50,6 +51,7 @@
     var isSelected: Bool = false
     var currentAttachment: LinkAttachment?
     var attachmentViewHeightRatioConstraint: NSLayoutConstraint?
+    var onDeletion: ((DeletionType) -> Void)?
 
     // MARK: - Initialization
 
@@ -96,7 +98,7 @@
             bottomAnchor.constraint(equalTo: attachmentView.bottomAnchor),
             widthConstraint
         ])
 
         if ZMUserSession.shared()?.isChatBubbleSimpleEnabled ?? false {
             NSLayoutConstraint.activate(chatBubbleConstraints)
         } else {
@@ -118,6 +120,7 @@
     // MARK: - Configuration
 
     func configure(with object: Configuration, animated: Bool) {
+        onDeletion = object.onDeletion
         currentAttachment = object.attachment
         attachmentView.titleLabel.text = object.attachment.title
         attachmentView.previewImageView.setImageResource(object.thumbnailResource, hideLoadingView: true)
@@ -180,14 +183,22 @@
     weak var actionController: ConversationMessageActionController?
 
     let supportsActions: Bool = true
     let containsHighlightableContent: Bool = true
     lazy var shouldAlignMessageContentForBubbles: Bool = ZMUserSession.shared()?.isChatBubbleSimpleEnabled ?? false
 
     let accessibilityIdentifier: String? = nil
     let accessibilityLabel: String? = nil
 
-    init(attachment: LinkAttachment, thumbnailResource: WireImageResource?) {
-        self.configuration = View.Configuration(attachment: attachment, thumbnailResource: thumbnailResource)
+    init(
+        attachment: LinkAttachment,
+        thumbnailResource: WireImageResource?,
+        onDeletion: ((DeletionType) -> Void)? = nil
+    ) {
+        self.configuration = View.Configuration(
+            attachment: attachment,
+            thumbnailResource: thumbnailResource,
+            onDeletion: onDeletion
+        )
         self.actionController = nil
     }
 }

wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Content/Text/ConversationLinkPreviewArticleCell.swift

@@ -27,6 +27,7 @@
         let showImage: Bool
         var message: ZMConversationMessage
         var isObfuscated: Bool
+        let onDeletion: ((DeletionType) -> Void)?
 
         static func == (lhs: Configuration, rhs: Configuration) -> Bool {
             lhs.message == rhs.message &&
@@ -50,6 +51,7 @@
     }
 
     var configuration: Configuration?
+    var onDeletion: ((DeletionType) -> Void)?
 
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -69,7 +71,7 @@
     }
 
     private func configureConstraints() {
         let margins = conversationHorizontalMargins
         let insets: UIEdgeInsets = ZMUserSession.shared()?.isChatBubbleSimpleEnabled ?? false
             ? .zero
             : UIEdgeInsets(top: 0, left: margins.left, bottom: 0, right: margins.right)
@@ -77,6 +79,7 @@
     }
 
     func configure(with object: Configuration, animated: Bool) {
+        onDeletion = object.onDeletion
         configuration = object
         articleView.configure(
             withTextMessageData: object.textMessageData,
@@ -128,7 +131,7 @@
     var bottomMargin: CGFloat = 0
 
     let supportsActions: Bool = true
     let containsHighlightableContent: Bool = true
     lazy var shouldAlignMessageContentForBubbles: Bool = ZMUserSession.shared()?.isChatBubbleSimpleEnabled ?? false
 
     var accessibilityIdentifier: String? {
@@ -137,14 +140,15 @@
 
     let accessibilityLabel: String?
 
-    init(message: ZMConversationMessage, data: TextMessageData) {
+    init(message: ZMConversationMessage, data: TextMessageData, onDeletion: ((DeletionType) -> Void)?) {
         let showImage = data.linkPreviewHasImage
         self.configuration = View
             .Configuration(
                 textMessageData: data,
                 showImage: showImage,
                 message: message,
-                isObfuscated: message.isObfuscated
+                isObfuscated: message.isObfuscated,
+                onDeletion: onDeletion
             )
         self.accessibilityLabel = L10n.Accessibility.ConversationSearch.LinkMessage.description
     }

wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Content/Text/ConversationQuoteCell.swift

@@ -37,6 +37,7 @@
 
         var quotedMessage: ZMConversationMessage?
         let accentColor: AccentColor
+        let onDeletion: ((DeletionType) -> Void)?
 
         static func == (lhs: Configuration, rhs: Configuration) -> Bool {
             lhs.accentColor == rhs.accentColor &&
@@ -304,6 +305,8 @@
     weak var message: ZMConversationMessage?
     weak var actionController: ConversationMessageActionController?
 
+    var onDeletion: ((DeletionType) -> Void)?
+
     override init(frame: CGRect) {
         self.contentView = ConversationReplyContentView()
         self.container = ReplyRoundCornersView(containedView: contentView)
@@ -324,7 +327,7 @@
     }
 
     private func configureConstraints() {
         let margins = conversationHorizontalMargins
         let insets: UIEdgeInsets = ZMUserSession.shared()?.isChatBubbleSimpleEnabled ?? false
             ? .zero
             : UIEdgeInsets(top: 0, left: margins.left, bottom: 0, right: margins.right)
@@ -332,6 +335,7 @@
     }
 
     func configure(with object: Configuration, animated: Bool) {
+        onDeletion = object.onDeletion
         contentView.configure(with: object)
     }
 
@@ -352,7 +356,7 @@
     var bottomMargin: CGFloat = 0
 
     let supportsActions = false
     let containsHighlightableContent: Bool = true
     lazy var shouldAlignMessageContentForBubbles: Bool = ZMUserSession.shared()?.isChatBubbleSimpleEnabled ?? false
 
     weak var message: ZMConversationMessage? {
@@ -369,11 +373,12 @@
     let accessibilityLabel: String? = L10n.Localizable.Content.Message.originalLabel
     let accessibilityIdentifier: String? = "ReplyCell"
 
-    init(quotedMessage: ZMConversationMessage?, accentColor: AccentColor) {
+    init(quotedMessage: ZMConversationMessage?, accentColor: AccentColor, onDeletion: ((DeletionType) -> Void)? = nil) {
         self.configuration = View
             .Configuration(
                 quotedMessage: quotedMessage,
-                accentColor: accentColor
+                accentColor: accentColor,
+                onDeletion: onDeletion
             )
     }
 }