From 5803eae134279d1765df83746dba2d1f95b60d12 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Tue, 14 Dec 2021 15:12:48 +1100 Subject: [PATCH] clean --- .../Conversations/ConversationVC+Interaction.swift | 6 +++--- .../SendMediaNavigationController.swift | 11 ----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 5a56aab8e..61ff20d9f 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -54,9 +54,9 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc let dataSource = DataSourceValue.dataSource(with: imageData, utiType: kUTTypeJPEG as String) let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: kUTTypeJPEG as String, imageQuality: .medium) - let sendMediaNavController = SendMediaNavigationController.showingWithImage(attachment, delegate: self) - sendMediaNavController.modalPresentationStyle = .fullScreen - self.present(sendMediaNavController, animated: true, completion: nil) + let approvalVC = AttachmentApprovalViewController.wrappedInNavController(attachments: [ attachment ], approvalDelegate: self) + approvalVC.modalPresentationStyle = .fullScreen + self.present(approvalVC, animated: true, completion: nil) } func sendMediaNavDidCancel(_ sendMediaNavigationController: SendMediaNavigationController) { diff --git a/Session/Media Viewing & Editing/SendMediaNavigationController.swift b/Session/Media Viewing & Editing/SendMediaNavigationController.swift index ff49dc45c..de975713e 100644 --- a/Session/Media Viewing & Editing/SendMediaNavigationController.swift +++ b/Session/Media Viewing & Editing/SendMediaNavigationController.swift @@ -58,17 +58,6 @@ class SendMediaNavigationController: OWSNavigationController { @objc public weak var sendMediaNavDelegate: SendMediaNavDelegate? - - @objc class func showingWithImage(_ attachment: SignalAttachment, delegate: SendMediaNavDelegate) -> SendMediaNavigationController { - let navController = SendMediaNavigationController() - navController.sendMediaNavDelegate = delegate - let approvalViewController = AttachmentApprovalViewController(mode: .modal, attachments: [ attachment ]) - approvalViewController.approvalDelegate = navController - approvalViewController.messageText = delegate.sendMediaNavInitialMessageText(navController) - navController.setViewControllers([approvalViewController], animated: false) - - return navController - } @objc public class func showingCameraFirst() -> SendMediaNavigationController {