oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clean

This commit is contained in:
Ryan Zhao 2021-12-14 15:12:48 +11:00
parent d74af622bc
commit 5803eae134
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Session/Conversations/ConversationVC+Interaction.swift
View File

@ -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) {

11
Session/Media Viewing & Editing/SendMediaNavigationController.swift
View File

@ -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 {