signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Allow canceling when picking a photo from recents.

Browse Source
This commit is contained in:
Nora Trapp 2019-08-16 12:44:27 -07:00
parent d19e48da5c
commit fd396aec1d
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift
View File

@ -135,7 +135,14 @@ class SendMediaNavigationController: OWSNavigationController {
navController.attachmentDraftCollection.append(.picker(attachment: libraryMedia))
navController.setViewControllers([navController.mediaLibraryViewController], animated: false)
navController.pushApprovalViewController(attachmentApprovalItems: [approvalItem], animated: false)
// Since we're starting on the approval view, include cancel to allow the user to immediately dismiss.
// If they choose to add more, `hasCancel` will go away and they'll enter the normal gallery flow.
navController.pushApprovalViewController(
attachmentApprovalItems: [approvalItem],
options: [.canAddMore, .hasCancel],
animated: false
)
return navController
}
@ -315,13 +322,17 @@ class SendMediaNavigationController: OWSNavigationController {
return vc
}()
private func pushApprovalViewController(attachmentApprovalItems: [AttachmentApprovalItem], animated: Bool) {
private func pushApprovalViewController(
attachmentApprovalItems: [AttachmentApprovalItem],
options: AttachmentApprovalViewControllerOptions = .canAddMore,
animated: Bool
) {
guard let sendMediaNavDelegate = self.sendMediaNavDelegate else {
owsFailDebug("sendMediaNavDelegate was unexpectedly nil")
return
}
let approvalViewController = AttachmentApprovalViewController(options: [.canAddMore],
let approvalViewController = AttachmentApprovalViewController(options: options,
sendButtonImageName: sendMediaNavDelegate.sendMediaNavApprovalButtonImageName,
attachmentApprovalItems: attachmentApprovalItems)
approvalViewController.approvalDelegate = self