Merge branch 'master' into v5

This commit is contained in:
Daniel
2018-09-17 18:23:18 +02:00
parent 46b1a7385c
commit 039c6d40af
76 changed files with 846 additions and 494 deletions
+2 -2
View File
@@ -257,7 +257,7 @@ export class Health extends IonicNativePlugin {
* @return {Promise<any>}
*/
@Cordova()
requestAuthorization(datatypes: string[] | HealthDataType[]): Promise<any> {
requestAuthorization(datatypes: (string | HealthDataType)[]): Promise<any> {
return;
}
@@ -273,7 +273,7 @@ export class Health extends IonicNativePlugin {
* @return {Promise<boolean>} Returns a promise that resolves with a boolean that indicates the authorization status
*/
@Cordova()
isAuthorized(datatypes: string[] | HealthDataType[]): Promise<boolean> {
isAuthorized(datatypes: (string | HealthDataType)[]): Promise<boolean> {
return;
}