clean

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)
+        let approvalVC = AttachmentApprovalViewController.wrappedInNavController(attachments: [ attachment ], approvalDelegate: self)
-        sendMediaNavController.modalPresentationStyle = .fullScreen
+        approvalVC.modalPresentationStyle = .fullScreen
-        self.present(sendMediaNavController, animated: true, completion: nil)
+        self.present(approvalVC, animated: true, completion: nil)
     }
     
     func sendMediaNavDidCancel(_ sendMediaNavigationController: SendMediaNavigationController) {

Session/Media Viewing & Editing/SendMediaNavigationController.swift

@@ -59,17 +59,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 {
         let navController = SendMediaNavigationController()