Merge branch 'master' into v5

This commit is contained in:
Daniel
2018-06-22 18:13:47 +02:00
parent f7afd1f066
commit f3ef2a877d
31 changed files with 815 additions and 117 deletions
@@ -228,4 +228,14 @@ export class WebIntent extends IonicNativePlugin {
getIntent(): Promise<any> {
return;
}
/**
* Send a result back to the Intent that started this Activity.
* The data can be passed using 'extras'.
* @returns {Promise<any>}
*/
@Cordova()
sendResult({ extras: {}}): Promise<any> {
return;
}
}