Skip saving to and loading from library access if allow library access is off.

Author: wwt-mobile-team

ALCameraViewController/ViewController/CameraViewController.swift

@@ -155,8 +155,11 @@ open class CameraViewController: UIViewController {
         view.translatesAutoresizingMaskIntoConstraints = false
         return view
     }()
+	
+	private let allowsLibraryAccess: Bool
 
 	public init(croppingEnabled: Bool, allowsLibraryAccess: Bool = true, allowsSwapCameraOrientation: Bool = true, completion: @escaping CameraViewCompletion) {
+		self.allowsLibraryAccess = allowsLibraryAccess
         super.init(nibName: nil, bundle: nil)
         onCompletion = completion
         allowCropping = croppingEnabled
@@ -504,6 +507,7 @@ open class CameraViewController: UIViewController {
         let spinner = showSpinner()
         cameraView.preview.isHidden = true
 
+		if allowsLibraryAccess {
         _ = SingleImageSaver()
             .setImage(image)
             .onSuccess { [weak self] asset in
@@ -517,8 +521,12 @@ open class CameraViewController: UIViewController {
                 self?.hideSpinner(spinner)
             }
             .save()
+		} else {
+			self.layoutCameraResult(uiImage: image)
+			self.hideSpinner(spinner)
+		}
     }
-    
+	
     internal func close() {
         onCompletion?(nil, nil)
         onCompletion = nil
@@ -560,13 +568,37 @@ open class CameraViewController: UIViewController {
         cameraView.swapCameraInput()
         flashButton.isHidden = cameraView.currentPosition == AVCaptureDevicePosition.front
     }
-    
+	
+	internal func layoutCameraResult(uiImage: UIImage) {
+		cameraView.stopSession()
+		startConfirmController(uiImage: uiImage)
+		toggleButtons(enabled: true)
+	}
+	
     internal func layoutCameraResult(asset: PHAsset) {
         cameraView.stopSession()
         startConfirmController(asset: asset)
         toggleButtons(enabled: true)
     }
-    
+	
+	private func startConfirmController(uiImage: UIImage) {
+		let confirmViewController = ConfirmViewController(image: uiImage, allowsCropping: allowCropping)
+		confirmViewController.onComplete = { [weak self] image, asset in
+			defer {
+				self?.dismiss(animated: true, completion: nil)
+			}
+			
+			guard let image = image else {
+				return
+			}
+			
+			self?.onCompletion?(image, asset)
+			self?.onCompletion = nil
+		}
+		confirmViewController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve
+		present(confirmViewController, animated: true, completion: nil)
+	}
+	
     private func startConfirmController(asset: PHAsset) {
         let confirmViewController = ConfirmViewController(asset: asset, allowsCropping: allowCropping)
         confirmViewController.onComplete = { [weak self] image, asset in

ALCameraViewController/ViewController/ConfirmViewController.swift

@@ -24,15 +24,26 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 
     public var onComplete: CameraViewCompletion?
 
-    var asset: PHAsset!
-    
+	let asset: PHAsset?
+	let image: UIImage?
+	
+	public init(image: UIImage, allowsCropping: Bool) {
+		self.allowsCropping = allowsCropping
+		self.asset = nil
+		self.image = image
+		super.init(nibName: "ConfirmViewController", bundle: CameraGlobals.shared.bundle)
+	}
+	
     public init(asset: PHAsset, allowsCropping: Bool) {
         self.allowsCropping = allowsCropping
         self.asset = asset
+		self.image = nil
         super.init(nibName: "ConfirmViewController", bundle: CameraGlobals.shared.bundle)
     }
 
     public required init?(coder aDecoder: NSCoder) {
+		asset = nil
+		image = nil
         super.init(coder: aDecoder)
     }
 
@@ -55,28 +66,30 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 
         cropOverlay.isHidden = true
 
-        guard let asset = asset else {
-            return
-        }
-        
         let spinner = showSpinner()
 
         disable()
 
-        _ = SingleImageFetcher()
-            .setAsset(asset)
-            .setTargetSize(largestPhotoSize())
-            .onSuccess { [weak self] image in
-                self?.configureWithImage(image)
-                self?.hideSpinner(spinner)
-                self?.enable()
-            }
-            .onFailure { [weak self] error in
-                self?.hideSpinner(spinner)
-            }
-            .fetch()
+		if let asset = asset {
+			_ = SingleImageFetcher()
+				.setAsset(asset)
+				.setTargetSize(largestPhotoSize())
+				.onSuccess { [weak self] image in
+					self?.configureWithImage(image)
+					self?.hideSpinner(spinner)
+					self?.enable()
+				}
+				.onFailure { [weak self] error in
+					self?.hideSpinner(spinner)
+				}
+				.fetch()
+		} else if let image = image {
+			self.configureWithImage(image)
+			self.hideSpinner(spinner)
+			self.enable()
+		}
     }
-    
+	
     public override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
         let scale = calculateMinimumScale(view.frame.size)
@@ -216,20 +229,28 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 
         let spinner = showSpinner()
 
-        var fetcher = SingleImageFetcher()
-            .onSuccess { [weak self] image in
-                self?.onComplete?(image, self?.asset)
-                self?.hideSpinner(spinner)
-                self?.enable()
-           }
-            .onFailure { [weak self] error in
-                self?.hideSpinner(spinner)
-                self?.showNoImageScreen(error)
-            }
-            .setAsset(asset)
-        
+		var fetcher: SingleImageFetcher? = nil
+		
+		if let asset = asset {
+			fetcher = SingleImageFetcher()
+				.onSuccess { [weak self] image in
+					self?.onComplete?(image, self?.asset)
+					self?.hideSpinner(spinner)
+					self?.enable()
+				}
+				.onFailure { [weak self] error in
+					self?.hideSpinner(spinner)
+					self?.showNoImageScreen(error)
+				}
+				.setAsset(asset)
+		} else {
+			self.onComplete?(image, nil)
+			self.hideSpinner(spinner)
+			self.enable()
+		}
+		
         if allowsCropping {
-            
+			
             var cropRect = cropOverlay.frame
             cropRect.origin.x += scrollView.contentOffset.x
             cropRect.origin.y += scrollView.contentOffset.y
@@ -242,10 +263,10 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 
             let rect = normalizedRect(CGRect(x: normalizedX, y: normalizedY, width: normalizedWidth, height: normalizedHeight), orientation: imageView.image!.imageOrientation)
 
-            fetcher = fetcher.setCropRect(rect)
+            fetcher = fetcher?.setCropRect(rect)
         }
 
-        fetcher = fetcher.fetch()
+        fetcher = fetcher?.fetch()
     }
 
     public func viewForZooming(in scrollView: UIScrollView) -> UIView? {