Merge pull request #21398 from wordpress-mobile/task/fix-camera-permissions

Fix an issue with camera not working without "All Photos" permission

Author: kean

RELEASE-NOTES.txt

@@ -3,6 +3,7 @@
 * [*] Remove the "New Photo Post" app quick action [#21369](https://github.com/wordpress-mobile/WordPress-iOS/pull/21369)
 * [*] (Internal) Fix unbounded growth of number media observers in Post Editor (performance issue) [#21352](https://github.com/wordpress-mobile/WordPress-iOS/pull/21352)
 * [**] [internal] Fix a crash when disconnecting the app from the "Connected Applications" on WordPress.com. [#21375]
+* [*] Fix an issue where the "Take Photo" flow was not working without the "All Photos" access [#21398](https://github.com/wordpress-mobile/WordPress-iOS/pull/21398)
 
 23.1
 -----

WordPress/Classes/Utility/Media/Blog+VideoLimits.swift

@@ -1,11 +1,31 @@
+import CoreMedia
+import AVFoundation
+
 extension Blog {
+    /// Maximum allowed duration for video uploads on free sites, in seconds (5 mins).
+    static let maximumVideoDurationForFreeSites: TimeInterval = 300
 
-    /// returns true if the blog is allowed to upload the given asset, true otherwise
+    /// Returns `true` if the blog is allowed to upload the given asset.
     func canUploadAsset(_ asset: WPMediaAsset) -> Bool {
         return canUploadAsset(asset.exceedsFreeSitesAllowance())
     }
 
+    /// Returns `true` if the blog is allowed to upload the video at the given URL.
+    func canUploadVideo(from videoURL: URL) -> Bool {
+        let asset = AVAsset(url: videoURL)
+        let duration = CMTimeGetSeconds(asset.duration)
+        let exceedsAllowance = duration > Blog.maximumVideoDurationForFreeSites
+        return canUploadAsset(exceedsAllowance)
+    }
+
     public func canUploadAsset(_ assetExceedsFreeSitesAllowance: Bool) -> Bool {
         return hasPaidPlan || !isHostedAtWPcom || !assetExceedsFreeSitesAllowance
     }
 }
+
+private extension WPMediaAsset {
+    ///  Returns true if the asset is a video and its duration is longer than the maximum allowed duration on free sites.
+    func exceedsFreeSitesAllowance() -> Bool {
+        assetType() == .video && duration() > Blog.maximumVideoDurationForFreeSites
+    }
+}

WordPress/Classes/Utility/Media/WPMediaAsset+VideoLimits.swift

@@ -119,8 +119,8 @@ class GutenbergMediaInserterHelper: NSObject {
         callback(media)
     }
 
-    func insertFromDevice(url: URL, callback: @escaping MediaPickerDidPickMediaCallback) {
-        guard let media = insert(exportableAsset: url as NSURL, source: .otherApps) else {
+    func insertFromDevice(url: URL, callback: @escaping MediaPickerDidPickMediaCallback, source: MediaSource = .otherApps) {
+        guard let media = insert(exportableAsset: url as NSURL, source: source) else {
             callback([])
             return
         }

WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaInserterHelper.swift

@@ -105,31 +105,42 @@ class GutenbergMediaPickerHelper: NSObject {
         context.present(picker, animated: true)
     }
 
-    private lazy var cameraPicker: WPMediaPickerViewController = {
-        let cameraPicker = WPMediaPickerViewController()
-        cameraPicker.options = WPMediaPickerOptions.withDefaults()
-        cameraPicker.mediaPickerDelegate = self
-        cameraPicker.dataSource = WPPHAssetDataSource.sharedInstance()
-        return cameraPicker
-    }()
-
     func presentCameraCaptureFullScreen(animated: Bool,
                                         filter: WPMediaType,
                                         callback: @escaping GutenbergMediaPickerHelperCallback) {
+        didPickMediaCallback = callback
+        MediaPickerMenu(viewController: context, filter: .init(filter))
+            .showCamera(delegate: self)
+    }
+}
 
-        guard UIImagePickerController.isSourceTypeAvailable(.camera) else {
-            callback(nil)
-            return
+extension GutenbergMediaPickerHelper: ImagePickerControllerDelegate {
+    func imagePicker(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
+        context.dismiss(animated: true) {
+            guard let mediaType = info[.mediaType] as? String else {
+                return
+            }
+            switch mediaType {
+            case UTType.image.identifier:
+                if let image = info[.originalImage] as? UIImage {
+                    self.didPickMediaCallback?([image])
+                    self.didPickMediaCallback = nil
+                }
+
+            case UTType.movie.identifier:
+                guard let videoURL = info[.mediaURL] as? URL else {
+                    return
+                }
+                guard self.post.blog.canUploadVideo(from: videoURL) else {
+                    self.presentVideoLimitExceededAfterCapture(on: self.context)
+                    return
+                }
+                self.didPickMediaCallback?([videoURL])
+                self.didPickMediaCallback = nil
+            default:
+                break
+            }
         }
-
-        didPickMediaCallback = callback
-        //reset the selected assets from previous uses
-        cameraPicker.resetState(false)
-        cameraPicker.modalPresentationStyle = .currentContext
-        cameraPicker.viewControllerToUseToPresent = context
-        cameraPicker.options.filter = filter
-        cameraPicker.options.allowMultipleSelection = false
-        cameraPicker.showCapture()
     }
 }
 
@@ -142,14 +153,8 @@ extension GutenbergMediaPickerHelper: VideoLimitsAlertPresenter {}
 extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate {
 
     func mediaPickerController(_ picker: WPMediaPickerViewController, didFinishPicking assets: [WPMediaAsset]) {
-        if picker == cameraPicker,
-           let asset = assets.first,
-           !post.blog.canUploadAsset(asset) {
-                presentVideoLimitExceededAfterCapture(on: self.context)
-        } else {
-            invokeMediaPickerCallback(asset: assets)
-            picker.dismiss(animated: true, completion: nil)
-        }
+        invokeMediaPickerCallback(asset: assets)
+        picker.dismiss(animated: true, completion: nil)
     }
 
     open func mediaPickerController(_ picker: WPMediaPickerViewController, handleError error: Error) -> Bool {
@@ -165,8 +170,7 @@ extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate {
     }
 
     func mediaPickerControllerShouldShowCustomHeaderView(_ picker: WPMediaPickerViewController) -> Bool {
-        guard FeatureFlag.mediaPickerPermissionsNotice.enabled,
-              picker !== cameraPicker else {
+        guard FeatureFlag.mediaPickerPermissionsNotice.enabled else {
             return false
         }
 
@@ -189,13 +193,11 @@ extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate {
     }
 
     func mediaPickerController(_ picker: WPMediaPickerViewController, shouldShowOverlayViewForCellFor asset: WPMediaAsset) -> Bool {
-        picker !== cameraPicker && !post.blog.canUploadAsset(asset)
+        !post.blog.canUploadAsset(asset)
     }
 
     func mediaPickerController(_ picker: WPMediaPickerViewController, shouldSelect asset: WPMediaAsset) -> Bool {
-        if picker !== cameraPicker,
-            !post.blog.canUploadAsset(asset) {
-
+        if !post.blog.canUploadAsset(asset) {
             presentVideoLimitExceededFromPicker(on: picker)
             return false
         }

WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift

@@ -650,12 +650,12 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
                                                        filter: filter,
                                                        dataSourceType: .mediaLibrary,
                                                        allowMultipleSelection: allowMultipleSelection,
-                                                       callback: {(assets) in
-                                                        guard let media = assets as? [Media] else {
-                                                            callback(nil)
-                                                            return
-                                                        }
-                                                        self.mediaInserterHelper.insertFromSiteMediaLibrary(media: media, callback: callback)
+                                                       callback: { [weak self] assets in
+            guard let self, let media = assets as? [Media] else {
+                callback(nil)
+                return
+            }
+            self.mediaInserterHelper.insertFromSiteMediaLibrary(media: media, callback: callback)
         })
     }
 
@@ -665,24 +665,27 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
                                                        filter: filter,
                                                        dataSourceType: .device,
                                                        allowMultipleSelection: allowMultipleSelection,
-                                                       callback: { assets in
-            guard let assets, !assets.isEmpty else {
+                                                       callback: { [weak self] assets in
+            guard let self, let assets, !assets.isEmpty else {
                 return callback(nil)
             }
             self.mediaInserterHelper.insertFromDevice(assets, callback: callback)
         })
     }
 
     func gutenbergDidRequestMediaFromCameraPicker(filter: WPMediaType, with callback: @escaping MediaPickerDidPickMediaCallback) {
-        mediaPickerHelper.presentCameraCaptureFullScreen(animated: true,
-                                                         filter: filter,
-                                                         callback: {(assets) in
-                                                            guard let phAsset = assets?.first as? PHAsset else {
-                                                                callback(nil)
-                                                                return
-                                                            }
-                                                            self.mediaInserterHelper.insertFromDevice(asset: phAsset, callback: callback)
-        })
+        mediaPickerHelper.presentCameraCaptureFullScreen(animated: true, filter: filter) { [weak self] assets in
+            guard let self, let asset = assets?.first else {
+                return callback(nil)
+            }
+            if let asset = asset as? PHAsset {
+                self.mediaInserterHelper.insertFromDevice(asset: asset, callback: callback)
+            } else if let image = asset as? UIImage {
+                self.mediaInserterHelper.insertFromImage(image: image, callback: callback, source: .camera)
+            } else if let url = asset as? URL {
+                self.mediaInserterHelper.insertFromDevice(url: url, callback: callback, source: .camera)
+            }
+        }
     }
 
     func gutenbergDidRequestMediaEditor(with mediaUrl: URL, callback: @escaping MediaPickerDidPickMediaCallback) {

WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift

@@ -4,12 +4,11 @@ import PhotosUI
 
 /// Prepares the alert controller that will be presented when tapping the "+" button in Media Library
 final class MediaLibraryMediaPickingCoordinator {
-    typealias PickersDelegate = StockPhotosPickerDelegate & WPMediaPickerViewControllerDelegate & TenorPickerDelegate & PHPickerViewControllerDelegate
+    typealias PickersDelegate = StockPhotosPickerDelegate & WPMediaPickerViewControllerDelegate & TenorPickerDelegate & PHPickerViewControllerDelegate & ImagePickerControllerDelegate
     private weak var delegate: PickersDelegate?
     private var tenor: TenorPicker?
 
     private var stockPhotos: StockPhotosPicker?
-    private let cameraCapture = CameraCaptureCoordinator()
     private let mediaLibrary = MediaLibraryPicker()
 
     init(delegate: PickersDelegate) {
@@ -30,7 +29,7 @@ final class MediaLibraryMediaPickingCoordinator {
             menuAlert.title = quotaUsageDescription
         }
 
-        if WPMediaCapturePresenter.isCaptureAvailable() {
+        if UIImagePickerController.isSourceTypeAvailable(.camera) {
             menuAlert.addAction(cameraAction(origin: origin, blog: blog))
         }
 
@@ -88,7 +87,8 @@ final class MediaLibraryMediaPickingCoordinator {
     }
 
     private func showCameraCapture(origin: UIViewController, blog: Blog) {
-        cameraCapture.presentMediaCapture(origin: origin, blog: blog)
+        MediaPickerMenu(viewController: origin)
+            .showCamera(delegate: self)
     }
 
     private func showStockPhotos(origin: UIViewController, blog: Blog) {
@@ -147,3 +147,9 @@ extension MediaLibraryMediaPickingCoordinator: PHPickerViewControllerDelegate {
         delegate?.picker(picker, didFinishPicking: results)
     }
 }
+
+extension MediaLibraryMediaPickingCoordinator: ImagePickerControllerDelegate {
+    func imagePicker(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
+        delegate?.imagePicker(picker, didFinishPickingMediaWithInfo: info)
+    }
+}

WordPress/Classes/ViewRelated/Media/CameraCaptureCoordinator.swift

@@ -24,8 +24,6 @@ class MediaLibraryViewController: WPMediaPickerViewController {
 
     fileprivate var selectedAsset: Media? = nil
 
-    fileprivate var capturePresenter: WPMediaCapturePresenter?
-
     // After 99% progress, we'll count a media item as being uploaded, and we'll
     // show an indeterminate spinner as the server processes it.
     fileprivate static let uploadCompleteProgress: Double = 0.99
@@ -474,6 +472,8 @@ class MediaLibraryViewController: WPMediaPickerViewController {
     }
 }
 
+// MARK: - PHPickerViewControllerDelegate
+
 extension MediaLibraryViewController: PHPickerViewControllerDelegate {
     func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
         dismiss(animated: true)
@@ -485,6 +485,42 @@ extension MediaLibraryViewController: PHPickerViewControllerDelegate {
     }
 }
 
+// MARK: - ImagePickerControllerDelegate
+
+extension MediaLibraryViewController: ImagePickerControllerDelegate {
+    func imagePicker(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
+        dismiss(animated: true)
+
+        func addAsset(from exportableAsset: ExportableAsset) {
+            let info = MediaAnalyticsInfo(origin: .mediaLibrary(.camera), selectionMethod: .fullScreenPicker)
+            MediaCoordinator.shared.addMedia(from: exportableAsset, to: blog, analyticsInfo: info)
+        }
+
+        guard let mediaType = info[.mediaType] as? String else {
+            return
+        }
+        switch mediaType {
+        case UTType.image.identifier:
+            if let image = info[.originalImage] as? UIImage {
+                addAsset(from: image)
+            }
+
+        case UTType.movie.identifier:
+            guard let videoURL = info[.mediaURL] as? URL else {
+                return
+            }
+            guard self.blog.canUploadVideo(from: videoURL) else {
+                self.presentVideoLimitExceededAfterCapture(on: self)
+                return
+            }
+            addAsset(from: videoURL as NSURL)
+        default:
+            break
+        }
+    }
+}
+
+
 // MARK: - UIDocumentPickerDelegate
 
 extension MediaLibraryViewController: UIDocumentPickerDelegate {