feat(http): use a different plugin source with better features (#1921)

The show method returns a Observable, not a Promise.

.gitignore

@@ -3,5 +3,5 @@ node_modules/
 .idea
 .tmp
 aot/
-dist/
 scripts/ionic-native-bower
+dist/

CHANGELOG.md

@@ -1,3 +1,21 @@
+<a name="4.1.0"></a>
+# [4.1.0](https://github.com/ionic-team/ionic-native/compare/v4.0.1...v4.1.0) (2017-07-21)
+
+
+### Bug Fixes
+
+* **media:** add setRate method ([4af3d5b](https://github.com/ionic-team/ionic-native/commit/4af3d5b)), closes [#1825](https://github.com/ionic-team/ionic-native/issues/1825)
+
+
+### Features
+
+* **firebase:** add unregister method ([#1823](https://github.com/ionic-team/ionic-native/issues/1823)) ([6230958](https://github.com/ionic-team/ionic-native/commit/6230958))
+* **google-maps:** add missing features and fix wrong definitions ([#1815](https://github.com/ionic-team/ionic-native/issues/1815)) ([976401a](https://github.com/ionic-team/ionic-native/commit/976401a))
+* **hyper-track:** add HyperTrack plugin ([#1816](https://github.com/ionic-team/ionic-native/issues/1816)) ([47fa44c](https://github.com/ionic-team/ionic-native/commit/47fa44c))
+* **open-native-settings:** add Open Native Settings plugin ([0fa82e5](https://github.com/ionic-team/ionic-native/commit/0fa82e5)), closes [#1821](https://github.com/ionic-team/ionic-native/issues/1821)
+
+
+
 <a name="4.0.1"></a>
 ## [4.0.1](https://github.com/ionic-team/ionic-native/compare/v4.0.0...v4.0.1) (2017-07-15)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ionic-native",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
   "homepage": "https://ionicframework.com/",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",

src/@ionic-native/core/decorators.spec.ts

@@ -2,6 +2,7 @@ import 'core-js';
 import { Plugin, Cordova, CordovaProperty, CordovaCheck, CordovaInstance, InstanceProperty } from './decorators';
 import { IonicNativePlugin } from './ionic-native-plugin';
 import { ERR_CORDOVA_NOT_AVAILABLE, ERR_PLUGIN_NOT_INSTALLED } from './plugin';
+import { Observable } from 'rxjs/Observable';
 
 declare const window: any;
 
@@ -47,6 +48,17 @@ class TestPlugin extends IonicNativePlugin {
     return new TestObject(TestPlugin.getPlugin().create());
   }
 
+  @Cordova({
+    destruct: true
+  })
+  destructPromise(): Promise<any> { return; }
+
+  @Cordova({
+    destruct: true,
+    observable: true
+  })
+  destructObservable(): Observable<any> { return; }
+
 }
 
 function definePlugin() {
@@ -59,7 +71,9 @@ function definePlugin() {
       this.ping = (success: Function, error: Function) => success('pong');
       this.name = 'John Smith';
       return this;
-    }
+    },
+    destructPromise: (success: Function) => success('hello', 'world'),
+    destructObservable: (success: Function) => success('hello', 'world')
   };
 }
 
@@ -177,6 +191,30 @@ describe('Regular Decorators', () => {
 
   });
 
+  describe('CordovaOptions', () => {
+
+    describe('destruct', () => {
+
+      it('should destruct values returned by a Promise', (done) => {
+        plugin.destructPromise()
+          .then((args: any[]) => {
+            expect(args).toEqual(['hello', 'world']);
+            done();
+          });
+      });
+
+      it('should destruct values returned by an Observable', (done) => {
+        plugin.destructObservable()
+          .subscribe((args: any[]) => {
+            expect(args).toEqual(['hello', 'world']);
+            done();
+          });
+      });
+
+    });
+
+  });
+
 });
 
 describe('Instance Decorators', () => {

src/@ionic-native/core/decorators.ts

@@ -37,6 +37,7 @@ export interface PluginConfig {
 }
 
 export interface CordovaOptions {
+  destruct?: boolean;
   /**
    * Set to true if the wrapped method is a sync function
    */
@@ -252,7 +253,7 @@ export function Cordova(opts: CordovaOptions = {}) {
  *
  * Wrap an instance method
  */
-export function CordovaInstance(opts: any = {}) {
+export function CordovaInstance(opts: CordovaOptions = {}) {
   return (target: Object, methodName: string) => {
     return {
       value: function(...args: any[]) {

src/@ionic-native/core/plugin.ts

@@ -136,7 +136,11 @@ function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts
 function wrapPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
   let pluginResult: any, rej: Function;
   const p = getPromise((resolve: Function, reject: Function) => {
-    pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
+    if (opts.destruct) {
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
+    } else {
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
+    }
     rej = reject;
   });
   // Angular throws an error on unhandled rejection, but in this case we have already printed
@@ -166,7 +170,14 @@ function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts:
 
 function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
   return new Observable(observer => {
-    let pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+    let pluginResult;
+
+    if (opts.destruct) {
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
+    } else {
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+    }
+
     if (pluginResult && pluginResult.error) {
       observer.error(pluginResult.error);
       observer.complete();
@@ -266,7 +277,14 @@ export function wrapInstance(pluginObj: any, methodName: string, opts: any = {})
     } else if (opts.observable) {
 
       return new Observable(observer => {
-        let pluginResult = callInstance(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+
+        let pluginResult;
+
+        if (opts.destruct) {
+          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
+        } else {
+          pluginResult = callInstance(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+        }
 
         if (pluginResult && pluginResult.error) {
           observer.error(pluginResult.error);
@@ -287,9 +305,13 @@ export function wrapInstance(pluginObj: any, methodName: string, opts: any = {})
       });
 
     } else if (opts.otherPromise) {
-
       return getPromise((resolve: Function, reject: Function) => {
-        let result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+        let result;
+        if (opts.destruct) {
+          result = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
+        } else {
+          result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+        }
         if (result && !!result.then) {
           result.then(resolve, reject);
         } else {
@@ -298,8 +320,24 @@ export function wrapInstance(pluginObj: any, methodName: string, opts: any = {})
       });
 
     } else {
+      let pluginResult: any, rej: Function;
+      const p = getPromise((resolve: Function, reject: Function) => {
+        if (opts.destruct) {
+          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
+        } else {
+          pluginResult = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+        }
+        rej = reject;
+      });
+      // Angular throws an error on unhandled rejection, but in this case we have already printed
+      // a warning that Cordova is undefined or the plugin is uninstalled, so there is no reason
+      // to error
+      if (pluginResult && pluginResult.error) {
+        p.catch(() => { });
+        typeof rej === 'function' && rej(pluginResult.error);
+      }
+      return p;
 
-      return getPromise((resolve: Function, reject: Function) => callInstance(pluginObj, methodName, args, opts, resolve, reject));
 
     }
   };

src/@ionic-native/plugins/android-permissions/index.ts

@@ -19,7 +19,7 @@ import { Injectable } from '@angular/core';
  *
  * this.androidPermissions.checkPermission(this.androidPermissions.PERMISSION.CAMERA).then(
  *   success => console.log('Permission granted'),
- *   err => this.androidPermissions.requestPermissions(this.androidPermissions.PERMISSION.CAMERA)
+ *   err => this.androidPermissions.requestPermission(this.androidPermissions.PERMISSION.CAMERA)
  * );
  *
  * this.androidPermissions.requestPermissions([this.androidPermissions.PERMISSION.CAMERA, this.androidPermissions.PERMISSION.GET_ACCOUNTS]);

src/@ionic-native/plugins/background-geolocation/index.ts

@@ -264,7 +264,7 @@ export interface BackgroundGeolocationConfig {
  * BackgroundGeolocation must be called within app.ts and or before Geolocation. Otherwise the platform will not ask you for background tracking permission.
  *
  * ```typescript
- * import { BackgroundGeolocation, BackgroundGeolocationConfig } from '@ionic-native/background-geolocation';
+ * import { BackgroundGeolocation, BackgroundGeolocationConfig, BackgroundGeolocationResponse } from '@ionic-native/background-geolocation';
  *
  * constructor(private backgroundGeolocation: BackgroundGeolocation) { }
  *

src/@ionic-native/plugins/background-mode/index.ts

@@ -19,14 +19,14 @@ export interface BackgroundModeConfiguration {
   text?: String;
 
   /**
-   * This will look for <icon name>.png in platforms/android/res/drawable|mipmap
+   * This will look for `<icon name>.png` in platforms/android/res/drawable|mipmap
    */
   icon?: string;
 
   color?: string;
 
   /**
-   * By default the app will come to foreground when taping on the notification. If false, plugin wont come to foreground when tapped.
+   * By default the app will come to foreground when taping on the notification. If false, plugin won't come to foreground when tapped.
    */
   resume?: boolean;
 
@@ -50,7 +50,7 @@ export interface BackgroundModeConfiguration {
  * @name Background Mode
  * @description
  * Cordova plugin to prevent the app from going to sleep while in background.
- * Requires Cordova plugin: cordova-plugin-background-mode. For more info about plugin, vist: https://github.com/katzer/cordova-plugin-background-mode
+ * Requires Cordova plugin: cordova-plugin-background-mode. For more info about plugin, visit: https://github.com/katzer/cordova-plugin-background-mode
  *@usage
  * ```typescript
  * import { BackgroundMode } from '@ionic-native/background-mode';
@@ -179,7 +179,7 @@ export class BackgroundMode extends IonicNativePlugin {
   overrideBackButton(): void { }
 
   /**
-   * Exclude the app from the recent task list works on Android 5.0+.
+   * Exclude the app from the recent task list. Works on Android 5.0+.
    */
   @Cordova({
     platforms: ['Android'],

src/@ionic-native/plugins/card-io/index.ts

@@ -133,6 +133,11 @@ export interface CardIOResponse {
  * @name Card IO
  * @description
  * @usage
+ * Note: For use with iOS 10 + When building your app with the iOS 10 SDK +, you have to add some info to the info.plist file. This is due to increased security in iOS 10. Go to your app directory and search for the <your app name>Info.plist file. Add the following lines in the main <dict> element.
+ * ```xml
+ *<key>NSCameraUsageDescription</key>
+ *<string>To scan credit cards.</string>
+ *```
  * ```typescript
  * import { CardIO } from '@ionic-native/card-io';
  *
@@ -147,7 +152,7 @@ export interface CardIOResponse {
  *       if(res){
  *         let options = {
  *           requireExpiry: true,
- *           requireCCV: false,
+ *           requireCVV: false,
  *           requirePostalCode: false
  *         };
  *         CardIO.scan(options);

src/@ionic-native/plugins/clipboard/index.ts

@@ -32,7 +32,7 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
   plugin: 'cordova-clipboard',
   pluginRef: 'cordova.plugins.clipboard',
   repo: 'https://github.com/ihadeed/cordova-clipboard',
-  platforms: ['Android', 'iOS', 'Windows', 'Windows Phone 8']
+  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
 export class Clipboard extends IonicNativePlugin {

src/@ionic-native/plugins/fingerprint-aio/index.ts

@@ -17,6 +17,16 @@ export interface FingerprintOptions {
    * Disable 'use backup' option. Only for android (optional)
    */
   disableBackup?: boolean;
+
+  /**
+   * Title of fallback button. Only for iOS
+   */
+  localizedFallbackTitle?: string;
+
+  /**
+   * Description in authentication dialogue. Only for iOS
+   */
+  localizedReason?: string;
 }
 
 /**
@@ -36,7 +46,9 @@ export interface FingerprintOptions {
  * this.faio.show({
  *     clientId: 'Fingerprint-Demo',
  *     clientSecret: 'password', //Only necessary for Android
- *     disableBackup:true  //Only for Android(optional)
+ *     disableBackup:true,  //Only for Android(optional)
+ *     localizedFallbackTitle: 'Use Pin', //Only for iOS
+ *     localizedReason: 'Please authenticate' //Only for iOS
  * })
  * .then((result: any) => console.log(result))
  * .catch((error: any) => console.log(error));

src/@ionic-native/plugins/firebase/index.ts

@@ -107,6 +107,13 @@ export class Firebase extends IonicNativePlugin {
   @Cordova()
   unsubscribe(topic: string): Promise<any> { return; }
 
+  /**
+   * Unregister from firebase, used to stop receiving push notifications.
+   * Call this when you logout user from your app.
+   */
+  @Cordova()
+  unregister(): Promise<any> { return; }
+
   /**
    * Log an event using Analytics
    * @param type {string}

src/@ionic-native/plugins/geofence/index.ts

@@ -85,7 +85,7 @@ declare const window: any;
 @Injectable()
 export class Geofence extends IonicNativePlugin {
 
-  public TransitionType = {
+  TransitionType = {
     ENTER: 1,
     EXIT: 2,
     BOTH: 3
@@ -96,7 +96,7 @@ export class Geofence extends IonicNativePlugin {
    * @return {Observable<any>}
    */
   @CordovaFunctionOverride()
-  onTrasitionReceived(): Observable<any> { return; };
+  onTransitionReceived(): Observable<any> { return; };
 
   /**
    * Initializes the plugin. User will be prompted to allow the app to use location and notifications.
@@ -139,20 +139,6 @@ export class Geofence extends IonicNativePlugin {
   @Cordova()
   getWatched(): Promise<string> { return; };
 
-  /**
-   * Called when a geofence is crossed in the direction specified by `TransitType`.
-   *
-   * @returns {Observable<any>}
-   */
-  onTransitionReceived(): Observable<any> {
-
-    return new Observable<any>((observer) => {
-      window && window.geofence && (window.geofence.onTransitionReceived = observer.next.bind(observer));
-      return () => window.geofence.onTransitionReceived = () => { };
-    });
-
-  }
-
   /**
    * Called when the user clicks a geofence notification. iOS and Android only.
    *

src/@ionic-native/plugins/http/index.ts

@@ -59,9 +59,9 @@ export interface HTTPResponse {
  */
 @Plugin({
   pluginName: 'HTTP',
-  plugin: 'cordova-plugin-http',
+  plugin: 'cordova-plugin-advanced-http',
   pluginRef: 'cordovaHTTP',
-  repo: 'https://github.com/wymsee/cordova-HTTP',
+  repo: 'https://github.com/silkimen/cordova-plugin-advanced-http',
   platforms: ['Android', 'iOS']
 })
 @Injectable()
@@ -92,6 +92,34 @@ export class HTTP extends IonicNativePlugin {
   @Cordova({ sync: true })
   setHeader(header: string, value: string): void { }
 
+  /**
+   * Set the data serializer which will be used for all future POST and PUT requests. Takes a string representing the name of the serializer.
+   * @param serializer {string} The name of the serializer. Can be urlencoded or json
+   */
+  @Cordova({ sync: true })
+  setDataSerializer(serializer: string): void { }
+
+  /**
+   * Clear all cookies
+   */
+  @Cordova({ sync: true })
+  clearCookies(): void { }
+
+  /**
+   * Remove cookies
+   * @param url {string}
+   * @param cb
+   */
+  @Cordova({ sync: true })
+  removeCookies(url: string, cb: () => void): void { }
+
+  /**
+   * Set request timeout
+   * @param timeout {number} The timeout in seconds. Default 60
+   */
+  @Cordova({ sync: true })
+  setRequestTimeout(timeout: number): void { }
+
   /**
    * Enable or disable SSL Pinning. This defaults to false.
    *
@@ -131,7 +159,7 @@ export class HTTP extends IonicNativePlugin {
   post(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
 
   /**
-   *
+   * Make a GET request
    * @param url {string} The url to send the request to
    * @param parameters {Object} Parameters to send with the request
    * @param headers {Object} The headers to set for this request
@@ -140,6 +168,36 @@ export class HTTP extends IonicNativePlugin {
   @Cordova()
   get(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
 
+  /**
+   * Make a PUT request
+   * @param url {string} The url to send the request to
+   * @param body {Object} The body of the request
+   * @param headers {Object} The headers to set for this request
+   * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
+   */
+  @Cordova()
+  put(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
+
+  /**
+   * Make a DELETE request
+   * @param url {string} The url to send the request to
+   * @param parameters {Object} Parameters to send with the request
+   * @param headers {Object} The headers to set for this request
+   * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
+   */
+  @Cordova()
+  delete(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
+
+  /**
+   * Make a HEAD request
+   * @param url {string} The url to send the request to
+   * @param parameters {Object} Parameters to send with the request
+   * @param headers {Object} The headers to set for this request
+   * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
+   */
+  @Cordova()
+  head(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
+
   /**
    *
    * @param url {string} The url to send the request to

src/@ionic-native/plugins/hyper-track/index.ts

@@ -0,0 +1,180 @@
+import { Injectable } from '@angular/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
+/**
+ * @beta
+ * @name HyperTrack
+ * @description
+ * HyperTrack cordova plugin wrapper for Ionic Native. Location-based services provider.
+ * Make sure to include your publishable key at config.xml (see [HyperTrack Cordova Setup](https://docs.hypertrack.com/sdks/cordova/setup.html#step-2-configure-the-sdk)).
+ *
+ * @usage
+ * ```typescript
+ * import { HyperTrack } from '@ionic-native/hyper-track';
+ *
+ * constructor(private hyperTrack: HyperTrack) { }
+ *
+ * // Check if app has location permissions enabled
+ * this.hyperTrack.checkLocationPermission().then(response => {
+ *   // response (String) can be "true" or "false"
+ *   if (response != "true") {
+ *     // Ask for permissions
+ *     this.hyperTrack.requestPermissions().then(response => {}, error => {});
+ *   }
+ * }, error => {});
+ *
+ * // Check if app has location services enabled
+ * this.hyperTrack.checkLocationServices().then(response => {
+ *   // response (String) can be "true" or "false"
+ *   if (response != "true") {
+ *     // Request services to be enabled
+ *     this.hyperTrack.requestLocationServices().then(response => {}, error => {});
+ *   }
+ * }, error => {});
+ *
+ * // First set the current user. This can be done via getOrCreateUser() or setUserId()
+ * this.hyperTrack.setUserId("xxx").then(user => {
+ *   // user (String) is a String representation of a User's JSON
+ *
+ *   this.hyperTrack.startTracking().then(userId => {}, trackingError => {});
+ *
+ *   this.hyperTrack.createAndAssignAction('visit', 'lookupId','address', 20.12, -100.3).then(action => {
+ *     // Handle action. It's a String representation of the Action's JSON. For example:
+ *     // '{"eta":"Jul 17, 2017 12:50:03 PM","assigned_at":"Jul 17, 2017 12:34:38 PM",,"distance":"0.0",...}'
+ *   }, error => {});
+ *
+ *   // You can complete an action with completeAction() or completeActionWithLookupId()
+ *   this.hyperTrack.completeAction('action-id').then(response => {
+ *     // Handle response (String). Should be "OK".
+ *   }, error => {});
+ *
+ *   this.hyperTrack.getCurrentLocation().then(location => {
+ *     // Handle location. It's a String representation of a Location's JSON.For example:
+ *     // '{"mAccuracy":22.601,,"mLatitude":23.123456, "mLongitude":-100.1234567, ...}'
+ *   }, error => {});
+ *
+ *   this.hyperTrack.stopTracking().then(success => {
+ *     // Handle success (String). Should be "OK".
+ *   }, error => {});
+ * 
+ * }, error => {});* 
+ * ```
+ */
+@Plugin({
+  pluginName: 'HyperTrack',
+  plugin: 'cordova-plugin-hypertrack',
+  pluginRef: 'cordova.plugins.HyperTrack',
+  repo: 'https://github.com/hypertrack/hypertrack-cordova',
+  platforms: ['Android']
+})
+@Injectable()
+export class HyperTrack extends IonicNativePlugin {
+  /**
+   * Returns given text. For testing purposes.
+   * @param {String} text Given text to print
+   * @returns {Promise<any>} Returns a Promise that resolves with the result text (which is the same as the given text) if successful, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  helloWorld(text: String): Promise<String> { return; }
+
+  /**
+   * Create a new user to identify the current device or get a user from a lookup id.
+   * @param {String} name User's name
+   * @param {String} phone User's phone
+   * @param {String} photo User's photo as URL or a Base64 converted string
+   * @param {String} lookupId User's lookupId, which is used to check if a new user is to be created (in this case you could set it to an internal reference for the user that you can use later to identify it), or if one with an existing lookupId is to be used.
+   * @returns {Promise<any>} Returns a Promise that resolves with a string representation of the User's JSON, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  getOrCreateUser(name: String, phone: String, photo: String, lookupId: String): Promise<any> { return; }
+
+  /**
+   * Set UserId for the SDK created using HyperTrack APIs. This is useful if you already have a user previously created.
+   * @param {String} userId User's ID
+   * @returns {Promise<any>} Returns a Promise that resolves with an "OK" string if successful, or it gets rejected if an error ocurred. An "OK" response doesn't necessarily mean that the userId was found. It just means that it was set correctly.
+   */
+  @Cordova()
+  setUserId(userId: String): Promise<any> { return; }
+
+  /**
+   * Enable the SDK and start tracking. This will fail if there is no user set.
+   * @returns {Promise<any>} Returns a Promise that resolves with the userId (String) of the User being tracked if successful, or it gets rejected if an error ocurred. One example of an error is not setting a User with getOrCreateUser() or setUserId() before calling this function.
+   */
+  @Cordova()
+  startTracking(): Promise<any> { return; }
+
+  /**
+   * Create and assign an action to the current user using specified parameters
+   * @param {String} type The action type. Can be one from "pickup", "delivery", "dropoff", "visit", "stopover" or "task"
+   * @param {String} lookupId The Action's desired lookupId
+   * @param {String} expectedPlaceAddress The address of the Action
+   * @param {Number} expectedPlaceLatitude The latitude of the Action
+   * @param {Number} expectedPlaceLongitude The longitude of the Action
+   * @returns {Promise<any>} Returns a Promise that resolves with a string representation of the Action's JSON, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  createAndAssignAction(type: String, lookupId: String, expectedPlaceAddress: String, expectedPlaceLatitude: Number, expectedPlaceLongitude: Number): Promise<any> { return; }
+
+  /**
+   * Complete an action from the SDK by its ID
+   * @param {String} actionId ID of the Action that will be marked as completed
+   * @returns {Promise<any>} Returns a Promise that resolves with an "OK" string if successful, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  completeAction(actionId: String): Promise<any> { return; }
+
+  /**
+   * Complete an action from the SDK using Action's lookupId as parameter
+   * @param {String} lookupId Lookup ID of the Action that will be marked as completed
+   * @returns {Promise<any>} Returns a Promise that resolves with an "OK" string if successful, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  completeActionWithLookupId(lookupId: String): Promise<any> { return; }
+
+  /**
+   * Disable the SDK and stop tracking.
+   * Needs user setting (via getOrCreateUser() or setUserId()) first.
+   * @returns {Promise<any>} Returns a Promise that resolves with the an "OK" string if successful, or it gets rejected if an error ocurred. One example of an error is not setting a User with getOrCreateUser() or setUserId() before calling this function.
+   */
+  @Cordova()
+  stopTracking(): Promise<any> { return; }
+
+  /**
+   * Get user's current location from the SDK
+   * @returns {Promise<any>} Returns a Promise that resolves with a string representation of the Location's JSON, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  getCurrentLocation(): Promise<any> { return; }
+
+  /**
+   * Check if Location permission has been granted to the app (for Android).
+   * Returns "true" or "false" in success method accordingly.
+   * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if location permission was granted, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  checkLocationPermission(): Promise<any> { return; }
+
+  /**
+   * Request user to grant Location access to the app (for Anrdoid).
+   * For Android Marshmallow and above. In other platforms, the Promise is never resolved.
+   * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if Location access was given to the app, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  requestPermissions(): Promise<any> { return; }
+
+  /**
+   * Check if Location services are enabled on the device (for Android).
+   * Returns "true" or "false" in success method accordingly.
+   * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if location services are enabled, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  checkLocationServices(): Promise<any> { return; }
+
+  /**
+   * Request user to enable Location services on the device.
+   * For Android Marshmallow and above. In other platforms, the Promise is never resolved.
+   * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if Location services were enabled, or it gets rejected if an error ocurred.
+   */
+  @Cordova()
+  requestLocationServices(): Promise<any> { return; }
+}

src/@ionic-native/plugins/keychain-touch-id/index.ts

@@ -0,0 +1,88 @@
+import { Injectable } from '@angular/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
+/**
+ * @name Keychain Touch Id
+ * @description
+ * A cordova plugin adding the iOS TouchID / Android fingerprint to your
+ * app and allowing you to store a password securely in the device keychain.
+ *
+ * @usage
+ * ```typescript
+ * import { KeychainTouchId } from '@ionic-native/keychain-touch-id';
+ *
+ *
+ * constructor(private keychainTouchId: KeychainTouchId) { }
+ *
+ * ...
+ *
+ *
+ * this.keychainTouchId.isAvailable()
+ *   .then((res: any) => console.log(res))
+ *   .catch((error: any) => console.error(error));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'KeychainTouchId',
+  plugin: 'cordova-plugin-keychain-touch-id',
+  pluginRef: 'plugins.touchid',
+  repo: 'https://github.com/sjhoeksma/cordova-plugin-keychain-touch-id',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class KeychainTouchId extends IonicNativePlugin {
+
+  /**
+   * Check if Touch ID / Fingerprint is supported by the device
+   * @return {Promise<any>} Returns a promise that resolves when there is hardware support
+   */
+  @Cordova()
+  isAvailable(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Encrypts and Saves a password under the key in the device keychain, which can be retrieved after
+   * successful authentication using fingerprint
+   * @param key {string} the key you want to store
+   * @param password {string} the password you want to encrypt and store
+   * @return {Promise<any>} Returns a promise that resolves when there is a result
+   */
+  @Cordova()
+  save(key: string, password: string): Promise<any> { return; }
+
+  /**
+   * Opens the fingerprint dialog, for the given key, showing an additional message. Promise will resolve
+   * with the password stored in keychain or will resolve an error code, where -1 indicated not available.
+   * @param key {string} the key you want to retrieve from keychain
+   * @param message {string} a message to the user
+   * @return {Promise<any>} Returns a promise that resolves when the key value is successfully retrieved or an error
+   */
+  @Cordova()
+  verify(key: string, message: string): Promise<any> { return; }
+
+  /**
+   * Checks if there is a password stored within the keychain for the given key.
+   * @param key {string} the key you want to check from keychain
+   * @return {Promise<any>} Returns a promise that resolves with success if the key is available or failure if key is not.
+   */
+  @Cordova()
+  has(key: string): Promise<any> { return; }
+
+  /**
+   * Deletes the password stored under given key from the keychain.
+   * @param key {string} the key you want to delete from keychain
+   * @return {Promise<any>} Returns a promise that resolves with success if the key is deleted or failure if key is not
+   */
+  @Cordova()
+  delete(key: string): Promise<any> { return; }
+
+  /**
+   * Sets the language of the fingerprint dialog
+   * @param locale {string} locale subtag from [this list](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry).
+   */
+  @Cordova()
+  setLocale(locale: string): void {}
+
+}

src/@ionic-native/plugins/local-notifications/index.ts

@@ -324,5 +324,15 @@ export class LocalNotifications extends IonicNativePlugin {
   })
   on(eventName: string, callback: any): void { }
 
+  /**
+   * Removes a callback of a specific event
+   * @param eventName The name of the event. Available events: schedule, trigger, click, update, clear, clearall, cancel, cancelall
+   * @param callback Call back function. All events return notification and state parameter. clear and clearall return state parameter only.
+   */
+  @Cordova({
+    sync: true
+  })
+  un(eventName: string, callback: any): void { }
+
 
 }

src/@ionic-native/plugins/media/index.ts

@@ -114,6 +114,9 @@ export class MediaObject {
   @CordovaInstance({ sync: true })
   setVolume(volume: number): void { }
 
+  @CordovaInstance({ sync: true })
+  setRate(speedRate: number): void {}
+
   /**
    * Starts recording an audio file.
    */

src/@ionic-native/plugins/ms-adal/index.ts

@@ -137,7 +137,7 @@ export class AuthenticationContext {
   @CordovaInstance({
     otherPromise: true
   })
-  acquireTokenAsync(resourceUrl: string, clientId: string, redirectUrl: string, userId: string, extraQueryParameters?: any): Promise<AuthenticationResult> { return; }
+  acquireTokenAsync(resourceUrl: string, clientId: string, redirectUrl: string, userId?: string, extraQueryParameters?: any): Promise<AuthenticationResult> { return; }
 
   /**
    * Acquires token WITHOUT using interactive flow. It checks the cache to return existing result
@@ -152,6 +152,6 @@ export class AuthenticationContext {
   @CordovaInstance({
     otherPromise: true
   })
-  acquireTokenSilentAsync(resourceUrl: string, clientId: string, userId: string): Promise<AuthenticationResult> { return; }
+  acquireTokenSilentAsync(resourceUrl: string, clientId: string, userId?: string): Promise<AuthenticationResult> { return; }
 
 }

src/@ionic-native/plugins/native-geocoder/index.ts

@@ -15,7 +15,7 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
  * ...
  *
  * this.nativeGeocoder.reverseGeocode(52.5072095, 13.1452818)
- *   .then((result: NativeGeocoderReverseResult) => console.log('The address is ' + result.street + ' in ' + result.countryCode))
+ *   .then((result: NativeGeocoderReverseResult) => console.log(JSON.stringify(result)))
  *   .catch((error: any) => console.log(error));
  *
  * this.nativeGeocoder.forwardGeocode('Berlin')
@@ -40,7 +40,7 @@ export class NativeGeocoder extends IonicNativePlugin {
    * Reverse geocode a given latitude and longitude to find location address
    * @param latitude {number} The latitude
    * @param longitude {number} The longitude
-   * @return {Promise<any>}
+   * @return {Promise<NativeGeocoderReverseResult>}
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -50,48 +50,59 @@ export class NativeGeocoder extends IonicNativePlugin {
   /**
    * Forward geocode a given address to find coordinates
    * @param addressString {string} The address to be geocoded
-   * @return {Promise<any>}
+   * @return {Promise<NativeGeocoderForwardResult>}
    */
   @Cordova({
     callbackOrder: 'reverse'
   })
   forwardGeocode(addressString: string): Promise<NativeGeocoderForwardResult> { return; }
-
 }
 
 /**
  * Encapsulates format information about a reverse geocoding result.
+ * more Info: 
+ *  - https://developer.apple.com/documentation/corelocation/clplacemark
+ *  - https://developer.android.com/reference/android/location/Address.html
  */
 export interface NativeGeocoderReverseResult {
   /**
-   * The street.
+   * The country code.
    */
-  street: string;
-  /**
-   * The house number.
-   */
-  houseNumber: string;
-  /**
-   * The postal code.
-   */
-  postalCode: string;
-  /**
-   * The city.
-   */
-  city: string;
-  /**
-   * The district.
-   */
-  district: string;
+  countryCode: string;
   /**
    * The country name.
    */
   countryName: string;
   /**
-   * The country code.
+   * The postal code.
    */
-  countryCode: string;
+  postalCode: string;
+  /**
+   * The administrativeArea.
+   */
+  administrativeArea: string;
+  /**
+   * The subAdministrativeArea.
+   */
+  subAdministrativeArea: string;
+  /**
+   * The locality.
+   */
+  locality: string;
+  /**
+   * The subLocality.
+   */
+  subLocality: string;
+  /**
+   * The thoroughfare.
+   */
+  thoroughfare: string;
+  /**
+   * The subThoroughfare.
+   */
+  subThoroughfare: string;
 }
+
 /**
  * Encapsulates format information about a forward geocoding result.
  */

src/@ionic-native/plugins/nfc/index.ts

@@ -23,8 +23,17 @@ declare let window: any;
  *
  * ...
  *
- * let message = this.ndef.textRecord('Hello world');
- * this.nfc.share([message]).then(onSuccess).catch(onError);
+ * this.nfc.addNdefListener(() => {
+ *   console.log('successfully attached ndef listener');
+ * }, (err) => {
+ *   console.log('error attaching ndef listener', err);
+ * }).subscribe((event) => {
+ *   console.log('received ndef message. the tag contains: ', event.tag);
+ *   console.log('decoded tag id', this.nfc.bytesToHexString(event.tag.id));
+ *
+ *   let message = this.ndef.textRecord('Hello world');
+ *   this.nfc.share([message]).then(onSuccess).catch(onError);
+ * });
  *
  * ```
  */

src/@ionic-native/plugins/open-native-settings/index.ts

@@ -0,0 +1,111 @@
+import { Plugin, IonicNativePlugin, Cordova } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+/**
+ * @name Open Native Settings
+ * @description
+ * Plugin to open native screens of iOS/android settings 
+ * @usage 
+ * You can open any of these settings:
+ * ```
+ * "about", // ios
+    "accessibility", // ios, android
+    "account", // ios, android
+    "airplane_mode", // ios, android
+    "apn", // android
+    "application_details", // ios, android
+    "application_development", // android
+    "application", // android
+    "autolock", // ios
+    "battery_optimization", // android
+    "bluetooth", // ios, android
+    "castle", // ios
+    "captioning", // android
+    "cast", // android
+    "cellular_usage", // ios
+    "configuration_list", // ios
+    "data_roaming", // android
+    "date", // ios, android
+    "display", // ios, android
+    "dream", // android
+    "facetime", // ios
+    "home", // android
+    "keyboard", // ios, android
+    "keyboard_subtype", // android
+    "locale", // ios, android
+    "location", // ios, android
+    "locations", // ios
+    "manage_all_applications", // android
+    "manage_applications", // android
+    "memory_card", // android
+    "music", // ios
+    "music_equalizer", // ios
+    "music_volume", // ios
+    "network", // ios, android
+    "nike_ipod", // ios
+    "nfcsharing", // android
+    "nfc_payment", // android
+    "nfc_settings", // android
+    "notes", // ios
+    "notification_id", // ios
+    "passbook", // ios
+    "phone", // ios
+    "photos", // ios
+    "print", // android
+    "privacy", // android
+    "quick_launch", // android
+    "reset", // ios
+    "ringtone", // ios
+    "browser", // ios
+    "search", // ios, android
+    "security", // android
+    "settings", // ios, android
+    "show_regulatory_info",
+    "sound", // ios, android
+    "software_update", // ios
+    "storage", // ios, android
+    "store", // ios, android
+    "sync", // android
+    "tethering", // ios
+    "twitter", // ios
+    "touch", // ios
+    "usage", // ios, android
+    "user_dictionary", // android
+    "video", // ios
+    "voice_input", // android
+    "vpn", // ios
+    "wallpaper", // ios
+    "wifi_ip", // android
+    "wifi", // ios, android
+    "wireless" // android
+    ``` 
+ * ```typescript
+ * import { OpenNativeSettings } from '@ionic-native/open-native-settings';
+ *
+ *
+ * constructor(private openNativeSettings: OpenNativeSettings) { }
+ *
+ * ...
+ *
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'OpenNativeSettings',
+  plugin: 'cordova-open-native-settings',
+  pluginRef: 'cordova.plugins.settings',
+  repo: 'https://github.com/guyromb/Cordova-open-native-settings',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class OpenNativeSettings extends IonicNativePlugin {
+
+  /**
+   * Opens a setting dialog
+   * @param setting {string} setting name
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  open(setting: string): Promise<any> { return; }
+
+}

src/@ionic-native/plugins/paypal/index.ts

@@ -204,6 +204,12 @@ export class PayPalPayment {
    */
   items: Array<PayPalItem>;
 
+  /**
+  * Optional payee email, if your app is paying a third-party merchant.
+  * The payee's email. It must be a valid PayPal email address.
+  */
+  payeeEmail: string;
+
   /**
    * Optional customer shipping address, if your app wishes to provide this to the SDK.
    */

src/@ionic-native/plugins/phonegap-local-notification/index.ts

@@ -87,7 +87,7 @@ export interface LocalNotificationOptions {
  */
 @Plugin({
   pluginName: 'Phonegap Local Notifications',
-  plugin: 'phonegap-local-notifications',
+  plugin: 'phonegap-plugin-local-notification',
   pluginRef: 'Notification',
   repo: 'https://github.com/phonegap/phonegap-plugin-local-notification',
   platforms: ['Android', 'Browser', 'iOS', 'Windows']

src/@ionic-native/plugins/photo-library/index.ts

@@ -31,8 +31,8 @@ import { Injectable } from '@angular/core';
  *         console.log(libraryItem.albumIds);    // array of ids of appropriate AlbumItem, only of includeAlbumsData was used
  *       });
  *     },
- *     error: err => {},
- *     complete: () => { console.log('could not get photos'); }
+ *     error: err => { console.log('could not get photos'); },
+ *     complete: () => { console.log('done getting photos'); }
  *   });
  * })
  * .catch(err => console.log('permissions weren\'t granted'));

src/@ionic-native/plugins/push/index.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Cordova, Plugin, CordovaInstance, checkAvailability, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
-declare var window: any;
+declare const window: any;
 
 export type EventResponse = RegistrationEventResponse & NotificationEventResponse & Error;
 
@@ -188,10 +188,25 @@ export interface AndroidPushOptions {
   topics?: string[];
 }
 
+export interface BrowserPushOptions {
+  /**
+   * Optional. Your GCM API key if you are using VAPID keys.
+   */
+  applicationServerKey?: string;
+
+  /**
+   * URL for the push server you want to use.
+   * Default: http://push.api.phonegap.com/v1/push	Optional.
+   */
+  pushServiceURL?: string;
+
+}
+
 export interface PushOptions {
   ios?: IOSPushOptions;
   android?: AndroidPushOptions;
   windows?: any;
+  browser?: BrowserPushOptions;
 }
 
 export type PushEvent = 'registration' | 'error' | 'notification';
@@ -237,7 +252,10 @@ export type PushEvent = 'registration' | 'error' | 'notification';
  *        badge: true,
  *        sound: 'false'
  *    },
- *    windows: {}
+ *    windows: {},
+ *    browser: {
+ *        pushServiceURL: 'http://push.api.phonegap.com/v1/push'
+ *    }
  * };
  *
  * const pushObject: PushObject = this.push.init(options);
@@ -257,6 +275,7 @@ export type PushEvent = 'registration' | 'error' | 'notification';
  * NotificationEventAdditionalData
  * IOSPushOptions
  * AndroidPushOptions
+ * BrowserPushOptions
  * PushOptions
  */
 @Plugin({

src/@ionic-native/plugins/safari-view-controller/index.ts

@@ -38,7 +38,7 @@ export interface SafariViewControllerOptions {
  *           enterReaderModeIfAvailable: true,
  *           tintColor: '#ff0000'
  *         })
- *         .then((result: any) => {
+ *         .subscribe((result: any) => {
  *             if(result.event === 'opened') console.log('Opened');
  *             else if(result.event === 'loaded') console.log('Loaded');
  *             else if(result.event === 'closed') console.log('Closed');

src/@ionic-native/plugins/serial/index.ts

@@ -12,6 +12,12 @@ export interface SerialPermissionOptions {
 
 export interface SerialOpenOptions {
   baudRate: number;
+  dataBits: number;
+  stopBits: number;
+  parity: number;
+  dtr: boolean;
+  rts: boolean;
+  sleepOnPause: boolean;
 }
 
 /**
@@ -29,7 +35,13 @@ export interface SerialOpenOptions {
  *
  * this.serial.requestPermission().then(() => {
  *   this.serial.open({
- *     baudRate: 9800
+ *     baudRate: 9800,
+ *     dataBits: 4,
+ *     stopBits: 1,
+ *     parity: 0,
+ *     dtr: true,
+ *     rts: true,
+ *     sleepOnPause: false
  *   }).then(() => {
  *     console.log('Serial connection opened');
  *   });

src/@ionic-native/plugins/spinner-dialog/index.ts

@@ -29,7 +29,7 @@ export interface SpinnerDialogIOSOptions {
 @Plugin({
   pluginName: 'SpinnerDialog',
   plugin: 'cordova-plugin-native-spinner',
-  pluginRef: 'window.plugins.spinnerDialog',
+  pluginRef: 'SpinnerDialog',
   repo: 'https://github.com/greybax/cordova-plugin-native-spinner',
   platforms: ['Android', 'iOS', 'Windows Phone 8', 'Windows']
 })

src/@ionic-native/plugins/sqlite/index.ts

@@ -20,6 +20,10 @@ export interface SQLiteDatabaseConfig {
   * support opening pre-filled databases with https://github.com/litehelpers/cordova-sqlite-ext
   */
   createFromLocation?: number;
+  /**
+   * support encrypted databases with https://github.com/litehelpers/Cordova-sqlcipher-adapter
+   */
+  key?: string;
 }
 
 /**

src/@ionic-native/plugins/video-player/index.ts

@@ -11,7 +11,7 @@ export interface VideoOptions {
  */
   volume?: number;
   /**
-   * There are to options for the scaling mode. SCALE_TO_FIT which is default and SCALE_TO_FIT_WITH_CROPPING.
+   * There are two options for the scaling mode. SCALE_TO_FIT which is default and SCALE_TO_FIT_WITH_CROPPING.
    * These strings are the only ones which can be passed as option.
    */
   scalingMode?: number;