Add permissions request #15

Author: EddyVerbruggen

src/health-data.android.ts

@@ -14,7 +14,14 @@ import getApplicationContext = ad.getApplicationContext;
 
 const GOOGLE_FIT_PERMISSIONS_REQUEST_CODE = 2;
 
-declare const com: any;
+declare const android, com, global: any;
+
+const AppPackageName = useAndroidX() ? global.androidx.core.app : android.support.v4.app;
+const ContentPackageName = useAndroidX() ? global.androidx.core.content : android.support.v4.content;
+
+function useAndroidX () {
+  return global.androidx && global.androidx.appcompat;
+}
 
 // android imports
 const DataReadRequest = com.google.android.gms.fitness.request.DataReadRequest;
@@ -57,7 +64,13 @@ export class HealthData extends Common implements HealthDataApi {
   }
 
   requestAuthorization(types: Array<HealthDataType>): Promise<boolean> {
-    return new Promise<boolean>((resolve, reject) => {
+    return Promise.all([
+      this.requestHardwarePermissions(),
+      this.requestAuthorizationInternal(types)
+    ]).then(results => Promise.resolve(results[0] && results[1]));
+  }
+
+  requestAuthorizationInternal(types: Array<HealthDataType>): Promise<boolean> {    return new Promise<boolean>((resolve, reject) => {
       const fitnessOptionsBuilder = FitnessOptions.builder();
 
       types.filter(t => t.accessType === "read" || t.accessType === "readAndWrite")
@@ -90,7 +103,7 @@ export class HealthData extends Common implements HealthDataApi {
     return new Promise((resolve, reject) => {
       try {
         // make sure the user is authorized
-        this.requestAuthorization([{name: opts.dataType, accessType: "read"}]).then(authorized => {
+        this.requestAuthorizationInternal([{name: opts.dataType, accessType: "read"}]).then(authorized => {
           if (!authorized) {
             reject("Not authorized");
             return;
@@ -221,6 +234,60 @@ export class HealthData extends Common implements HealthDataApi {
     const typeOfData = acceptableDataTypesForCommonity[pluginType];
     return aggregatedDataTypes[typeOfData];
   }
+
+  private requestHardwarePermissions(): Promise<boolean> {
+    return this.requestPermissionFor(this.permissionsNeeded()
+        .filter(permission => !this.wasPermissionGranted(permission)));
+  }
+
+  private wasPermissionGranted(permission: any) {
+    let hasPermission = android.os.Build.VERSION.SDK_INT < 23; // Android M. (6.0)
+    if (!hasPermission) {
+      hasPermission = android.content.pm.PackageManager.PERMISSION_GRANTED ===
+          ContentPackageName.ContextCompat.checkSelfPermission(
+              utils.ad.getApplicationContext(),
+              permission);
+    }
+    return hasPermission;
+  }
+
+  private wasPermissionsGrantedForAll(): boolean {
+    return this.permissionsNeeded().every(permission => this.wasPermissionGranted(permission));
+  }
+
+  private requestPermissionFor(permissions: any[]): Promise<boolean> {
+    return new Promise<boolean>((resolve, reject) => {
+      if (!this.wasPermissionsGrantedForAll()) {
+        const activityRequestPermissionsHandler = args => {
+          application.android.off(application.AndroidApplication.activityRequestPermissionsEvent, activityRequestPermissionsHandler);
+          resolve(true);
+        };
+
+        application.android.on(application.AndroidApplication.activityRequestPermissionsEvent, activityRequestPermissionsHandler);
+
+        AppPackageName.ActivityCompat.requestPermissions(
+            application.android.foregroundActivity,
+            permissions,
+            235 // irrelevant since we simply invoke onPermissionGranted
+        );
+      } else {
+        resolve(true);
+      }
+    });
+  }
+
+  private permissionsNeeded(): any[] {
+    const permissions = [
+      android.Manifest.permission.ACCESS_FINE_LOCATION,
+      android.Manifest.permission.ACCESS_NETWORK_STATE,
+      android.Manifest.permission.GET_ACCOUNTS];
+
+    if (android.os.Build.VERSION.SDK_INT > 19) {
+      permissions.push(android.Manifest.permission.BODY_SENSORS);
+    }
+
+    return permissions;
+  }
 }
 
 const aggregatedDataTypes = {

src/package.json

@@ -20,8 +20,8 @@
     "demo.ios": "npm i && npm run tsc && cd ../demo && tns run ios",
     "demo.android": "npm i && npm run tsc && cd ../demo && tns run android",
     "clean": "rm -rf node_modules && cd ../demo && rm -rf hooks node_modules platforms && cd ../src && npm run plugin.link",
-    "demo.ng.ios": "npm i && npm run tsc && npm run package && cd ../demo-ng && tns run ios",
-    "demo.ng.android": "npm i && npm run tsc && npm run package && cd ../demo-ng && tns run android",
+    "demo.ng.ios": "npm i && npm run tsc && npm run package && cd ../demo-ng && tns plugin remove nativescript-health-data && tns plugin add ../publish/package/*.tgz && tns run ios",
+    "demo.ng.android": "npm i && npm run tsc && npm run package && cd ../demo-ng && tns plugin remove nativescript-health-data && tns plugin add ../publish/package/*.tgz && tns run android",
     "plugin.ng.link": "npm link && cd ../demo-ng && npm link nativescript-health-data && cd ../src",
     "package": "cd ../publish && ./pack.sh",
     "setup": "npm i && npm run tsc && cd ../demo-ng && npm i"

src/references.d.ts

@@ -1,2 +1,2 @@
 /// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
-/// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
+/// <reference path="./node_modules/tns-platform-declarations/android-20.d.ts" />