fix(ios): set camera configuration in main thread (#2167)

ionic-team · Nov 12, 2019 · c57da0e · c57da0e
1 parent 52f2bc6
commit c57da0e
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/ios/Capacitor/Capacitor/Plugins/Camera.swift b/ios/Capacitor/Capacitor/Plugins/Camera.swift
@@ -128,25 +128,26 @@ public class CAPCameraPlugin : CAPPlugin, UIImagePickerControllerDelegate, UINav
 
     AVCaptureDevice.requestAccess(for: .video) { granted in
         if granted {
-          let presentationStyle = call.getString("presentationStyle")
-          if presentationStyle != nil && presentationStyle == "popover" {
-            self.configurePicker()
-          } else {
-            self.imagePicker!.modalPresentationStyle = .fullScreen
-          }
+          DispatchQueue.main.async {
+            let presentationStyle = call.getString("presentationStyle")
+            if presentationStyle != nil && presentationStyle == "popover" {
+              self.configurePicker()
+            } else {
+              self.imagePicker!.modalPresentationStyle = .fullScreen
+            }
 
-          self.imagePicker!.sourceType = .camera
+            self.imagePicker!.sourceType = .camera
 
-          if self.settings.direction.rawValue == "REAR" {
-            if UIImagePickerController.isCameraDeviceAvailable(.rear) {
-              self.imagePicker!.cameraDevice = .rear
-            }
-          } else if self.settings.direction.rawValue == "FRONT" {
-            if UIImagePickerController.isCameraDeviceAvailable(.front) {
-              self.imagePicker!.cameraDevice = .front
+            if self.settings.direction.rawValue == "REAR" {
+              if UIImagePickerController.isCameraDeviceAvailable(.rear) {
+                self.imagePicker!.cameraDevice = .rear
+              }
+            } else if self.settings.direction.rawValue == "FRONT" {
+              if UIImagePickerController.isCameraDeviceAvailable(.front) {
+                self.imagePicker!.cameraDevice = .front
+              }
             }
-          }
-          DispatchQueue.main.async {
+
             self.bridge.viewController.present(self.imagePicker!, animated: true, completion: nil)
           }
         } else {