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

Fix regression that caused crash when opening media library picker from chat.

Browse Source
This commit is contained in:
Igor Solomennikov 2022-02-23 17:29:26 -08:00
parent 4e1a48a785
commit 29f75ed03c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift
View File

@ -47,7 +47,7 @@ class PhotoCaptureViewController: OWSViewController, InteractiveDismissDelegate
weak var delegate: PhotoCaptureViewControllerDelegate?
weak var dataSource: PhotoCaptureViewControllerDataSource?
private var interactiveDismiss: PhotoCaptureInteractiveDismiss!
private var interactiveDismiss: PhotoCaptureInteractiveDismiss?
public lazy var photoCapture = PhotoCapture()
@ -88,9 +88,10 @@ class PhotoCaptureViewController: OWSViewController, InteractiveDismissDelegate
view.addGestureRecognizer(doubleTapToSwitchCameraGesture)
if let navController = self.navigationController {
interactiveDismiss = PhotoCaptureInteractiveDismiss(viewController: navController)
let interactiveDismiss = PhotoCaptureInteractiveDismiss(viewController: navController)
interactiveDismiss.interactiveDismissDelegate = self
interactiveDismiss.addGestureRecognizer(to: view)
self.interactiveDismiss = interactiveDismiss
}
tapToFocusGesture.require(toFail: doubleTapToSwitchCameraGesture)
@ -360,7 +361,7 @@ class PhotoCaptureViewController: OWSViewController, InteractiveDismissDelegate
override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
guard !interactiveDismiss.interactionInProgress else { return }
guard !(interactiveDismiss?.interactionInProgress ?? false) else { return }
// Clamp capture view to 16:9 on iPhones.
var previewFrame = view.bounds