Merge pull request #73 from surdu/perm-promise

requestPermissions now returns Promise

Author: Dimitar Tachev

src/camera.android.ts

@@ -5,6 +5,7 @@ import * as imageSourceModule from "tns-core-modules/image-source/image-source";
 import * as imageAssetModule from "tns-core-modules/image-asset/image-asset";
 import * as trace from "tns-core-modules/trace/trace";
 import * as platform from "tns-core-modules/platform/platform";
+import * as permissions from "nativescript-permissions";
 
 let REQUEST_IMAGE_CAPTURE = 3453;
 let REQUEST_REQUIRED_PERMISSIONS = 1234;
@@ -155,17 +156,10 @@ export let isAvailable = function () {
 };
 
 export let requestPermissions = function () {
-    if ((<any>android.support.v4.content.ContextCompat).checkSelfPermission(applicationModule.android.currentContext,
-        (<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE) !== android.content.pm.PackageManager.PERMISSION_GRANTED ||
-        (<any>android.support.v4.content.ContextCompat).checkSelfPermission(applicationModule.android.currentContext,
-            (<any>android).Manifest.permission.CAMERA) !== android.content.pm.PackageManager.PERMISSION_GRANTED) {
-
-        (<any>android.support.v4.app.ActivityCompat).requestPermissions(applicationModule.android.currentContext, [
-            (<any>android).Manifest.permission.CAMERA,
-            (<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE
-        ],
-            REQUEST_REQUIRED_PERMISSIONS);
-    }
+    return permissions.requestPermissions([
+      (<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE,
+      (<any>android).Manifest.permission.CAMERA
+    ]);
 };
 
 let createDateTimeStamp = function () {

src/camera.ios.ts

@@ -189,19 +189,38 @@ export let isAvailable = function () {
 };
 
 export let requestPermissions = function () {
-    let authStatus = PHPhotoLibrary.authorizationStatus();
-    if (authStatus === PHAuthorizationStatus.NotDetermined) {
-        PHPhotoLibrary.requestAuthorization((auth) => {
-            if (auth === PHAuthorizationStatus.Authorized) {
-                if (trace.isEnabled()) {
-                    trace.write("Application can access photo library assets.", trace.categories.Debug);
-                }
-                return;
-            }
-        });
-    } else if (authStatus !== PHAuthorizationStatus.Authorized) {
-        if (trace.isEnabled()) {
-            trace.write("Application can not access photo library assets.", trace.categories.Debug);
+    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;
+        }
+      }
+    });
 };

src/package.json

@@ -40,6 +40,9 @@
         "images"
     ],
     "author": "NativeScript team",
+    "dependencies": {
+      "nativescript-permissions": "^1.2.3"
+    },
     "devDependencies": {
         "tns-core-modules": "^3.0.0",
         "tns-platform-declarations": "^3.0.0",