Merge pull request #79 from NativeScript/tachev/request-camera-permis…

…sions-ios Request camera permission before opening the camera. Fix issue #51.
NativeScript · Dec 6, 2017 · f688ea2 · f688ea2
2 parents 13db880 + fd7af8a
commit f688ea2
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 31 deletions.
diff --git a/src/camera.ios.ts b/src/camera.ios.ts
@@ -176,38 +176,76 @@ export let isAvailable = function () {
 };
 
 export let requestPermissions = function () {
-    return new Promise(function(resolve, reject) {
-      let authStatus = PHPhotoLibrary.authorizationStatus();
-      switch (authStatus) {
-        case PHAuthorizationStatus.NotDetermined: {
-          PHPhotoLibrary.requestAuthorization((auth) => {
-              if (auth === PHAuthorizationStatus.Authorized) {
-                  if (trace.isEnabled()) {
-                      trace.write("Application can access photo library assets.", trace.categories.Debug);
-                  }
-                  resolve();
-              }
-              else {
+    return new Promise(function (resolve, reject) {
+        requestPhotosPermissions().then(() => {
+            requestCameraPermissions().then(resolve, reject);
+        }, reject);
+    });
+};
+
+let requestPhotosPermissions = function () {
+    return new Promise(function (resolve, reject) {
+        let authStatus = PHPhotoLibrary.authorizationStatus();
+        switch (authStatus) {
+            case PHAuthorizationStatus.NotDetermined: {
+                PHPhotoLibrary.requestAuthorization((auth) => {
+                    if (auth === PHAuthorizationStatus.Authorized) {
+                        if (trace.isEnabled()) {
+                            trace.write("Application can access photo library assets.", trace.categories.Debug);
+                        }
+                        resolve();
+                    }
+                    else {
+                        reject();
+                    }
+                });
+                break;
+            }
+            case PHAuthorizationStatus.Authorized: {
+                if (trace.isEnabled()) {
+                    trace.write("Application can access photo library assets.", trace.categories.Debug);
+                }
+                resolve();
+                break;
+            }
+            case PHAuthorizationStatus.Restricted:
+            case PHAuthorizationStatus.Denied: {
+                if (trace.isEnabled()) {
+                    trace.write("Application can not access photo library assets.", trace.categories.Debug);
+                }
                 reject();
-              }
-          });
-          break;
-        }
-        case PHAuthorizationStatus.Authorized: {
-          if (trace.isEnabled()) {
-              trace.write("Application can access photo library assets.", trace.categories.Debug);
-          }
-          resolve();
-          break;
+                break;
+            }
         }
-        case PHAuthorizationStatus.Restricted:
-        case PHAuthorizationStatus.Denied: {
-          if (trace.isEnabled()) {
-              trace.write("Application can not access photo library assets.", trace.categories.Debug);
-          }
-          reject();
-          break;
+    });
+};
+
+let requestCameraPermissions = function () {
+    return new Promise(function (resolve, reject) {
+        let cameraStatus = AVCaptureDevice.authorizationStatusForMediaType(AVMediaTypeVideo);
+        switch (cameraStatus) {
+            case AVAuthorizationStatus.NotDetermined: {
+                AVCaptureDevice.requestAccessForMediaTypeCompletionHandler(AVMediaTypeVideo, (granted) => {
+                    if (granted) {
+                        resolve();
+                    } else {
+                        reject();
+                    }
+                });
+                break;
+            }
+            case AVAuthorizationStatus.Authorized: {
+                resolve();
+                break;
+            }
+            case AVAuthorizationStatus.Restricted:
+            case AVAuthorizationStatus.Denied: {
+                if (trace.isEnabled()) {
+                    trace.write("Application can not access Camera assets.", trace.categories.Debug);
+                }
+                reject();
+                break;
+            }
         }
-      }
     });
 };
diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nativescript-camera",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "description": "Provides API for using device camera",
     "repository": {
         "type": "git",