chore(): update changelog

closes #1385

.github/CONTRIBUTING.md

@@ -4,8 +4,8 @@
 #### There are no rules, but here are a few things to consider:
 ###### Before you submit an issue:
 * Do a quick search to see if there are similar issues
-* Make sure that you are waiting for `deviceready` to fire before interacting with any plugin. If you are using Ionic 2, this can be done using [the `Platform.ready()` function](http://ionicframework.com/docs/v2/api/platform/Platform/#ready).
-* **Check that you are using the latest version of** `ionic-native`, you can install the latest version by running `npm i --save ionic-native@latest`
+* Make sure that you are waiting for `deviceready` to fire before interacting with any plugin. If you are using Ionic 2, this can be done using [the `Platform.ready()` function](http://ionicframework.com/docs/api/platform/Platform/#ready).
+* **Check that you are using the latest version of** `ionic-native`, you can install the latest version by running `npm i --save @ionic-native/core@latest`
 
 ###### Still having problems? submit an issue with the following details:
 * Short description of the issue
@@ -16,4 +16,4 @@
 ## Feature request?
 Have a plugin you'd like to see supported? Since Ionic Native is a thin wrapper around existing Cordova plugins, adding support for new plugins is as easy as creating a new wrapper for whatever plugin you'd like to add.
 
-Take a look at our [Developer Guide](https://github.com/driftyco/ionic-native/blob/master/DEVELOPER.md) for more info on adding new plugins.
+Take a look at our [Developer Guide](https://github.com/driftyco/ionic-native/blob/master/DEVELOPER.md) for more info on adding new plugins.

CHANGELOG.md

@@ -1,3 +1,82 @@
+<a name="3.6.0"></a>
+# [3.6.0](https://github.com/driftyco/ionic-native/compare/v3.5.0...v3.6.0) (2017-04-27)
+
+
+### Bug Fixes
+
+* **media:** function 'create' never returns media object (#1419) ([b58149f](https://github.com/driftyco/ionic-native/commit/b58149f))
+
+
+### Features
+
+* **keychain:** add Keychain plugin (#1420) ([16dc71a](https://github.com/driftyco/ionic-native/commit/16dc71a))
+* add IonicNativePlugin base class (#1425) ([17366a2](https://github.com/driftyco/ionic-native/commit/17366a2))
+
+
+
+<a name="3.5.0"></a>
+# [3.5.0](https://github.com/driftyco/ionic-native/compare/v3.4.4...v3.5.0) (2017-04-18)
+
+
+### Bug Fixes
+
+* **core:** fix bug when checking if plugin exists (#1348) ([4bd6aab](https://github.com/driftyco/ionic-native/commit/4bd6aab)), closes [#1348](https://github.com/driftyco/ionic-native/issues/1348)
+* **media:** fix issue with create method ([6bba72d](https://github.com/driftyco/ionic-native/commit/6bba72d)), closes [#1333](https://github.com/driftyco/ionic-native/issues/1333)
+* **rollbar:** fix pluginRef ([f396940](https://github.com/driftyco/ionic-native/commit/f396940))
+
+
+### Features
+
+* **action-sheet:** update to newest version ([9c92580](https://github.com/driftyco/ionic-native/commit/9c92580))
+* **background-fetch:** add status method ([6168eae](https://github.com/driftyco/ionic-native/commit/6168eae))
+
+
+
+<a name="3.4.4"></a>
+## [3.4.4](https://github.com/driftyco/ionic-native/compare/v3.4.3...v3.4.4) (2017-03-30)
+
+
+### Bug Fixes
+
+* **push:** hasPermission is part of Push object ([145577f](https://github.com/driftyco/ionic-native/commit/145577f))
+
+
+
+<a name="3.4.3"></a>
+## [3.4.3](https://github.com/driftyco/ionic-native/compare/v3.4.2...v3.4.3) (2017-03-29)
+
+
+### Bug Fixes
+
+* **admob:** add missing license property ([2b94ffd](https://github.com/driftyco/ionic-native/commit/2b94ffd)), closes [#1291](https://github.com/driftyco/ionic-native/issues/1291)
+* **app-preferences:** fix bug with fetch method ([65cf94b](https://github.com/driftyco/ionic-native/commit/65cf94b)), closes [#1299](https://github.com/driftyco/ionic-native/issues/1299)
+* **push:** add missing plugin decorator ([208748a](https://github.com/driftyco/ionic-native/commit/208748a)), closes [#1297](https://github.com/driftyco/ionic-native/issues/1297)
+* **secure-storage:** return unfunctional SecureStorageObject if plugin doesn't exist ([b91757e](https://github.com/driftyco/ionic-native/commit/b91757e))
+
+
+### Features
+
+* **secure-storage:** add keys() and clear() methods (#1281) ([8b31d72](https://github.com/driftyco/ionic-native/commit/8b31d72))
+
+
+
+<a name="3.4.2"></a>
+## [3.4.2](https://github.com/driftyco/ionic-native/compare/v3.4.1...v3.4.2) (2017-03-28)
+
+
+
+<a name="3.4.1"></a>
+## [3.4.1](https://github.com/driftyco/ionic-native/compare/v3.4.0...v3.4.1) (2017-03-28)
+
+
+### Bug Fixes
+
+* **admob:** fix event listeners ([b53af8e](https://github.com/driftyco/ionic-native/commit/b53af8e)), closes [#1165](https://github.com/driftyco/ionic-native/issues/1165)
+* **network:** fix onchange method ([006f7dc](https://github.com/driftyco/ionic-native/commit/006f7dc)), closes [#1173](https://github.com/driftyco/ionic-native/issues/1173)
+* **network:** remove ontypechange method ([19bc841](https://github.com/driftyco/ionic-native/commit/19bc841))
+
+
+
 <a name="3.4.0"></a>
 # [3.4.0](https://github.com/driftyco/ionic-native/compare/v3.3.2...v3.4.0) (2017-03-28)
 

DEVELOPER.md

@@ -17,6 +17,7 @@ gulp plugin:create -n PluginName
 gulp plugin:create -m -n PluginName
 ```
 
+Running the command above will create a new directory `src/@ionic-native/plugins/plugin-name/` with a single file in there: `index.ts`. This file is where all the plugin definitions should be.
 
 Let's take a look at the existing plugin wrapper for Geolocation to see what goes into an Ionic Native plugin (comments have been removed for clarity):
 
@@ -110,7 +111,7 @@ The `@Cordova` decorator has a few more options now.
 
 ### Testing your changes
 
-You need to run `npm run build` in the `ionic-native` project, this will create a `dist` directory. Then, you must go to your ionic application folder and replace your current `node_modules/ionic-native/dist/` with the newly generated one.
+You need to run `npm run build` in the `ionic-native` project, this will create a `dist` directory. The `dist` directory will contain a sub directory `@ionic-native` with all the packages compiled in there. Copy the package(s) you created/modified to your app's node_modules under the `@ionic-native` directory. (e.g. `cp -r dist/@ionic-native/plugin-name ../my-app/node_modules/@ionic-native/`).
 
 ### Cleaning the code
 
@@ -147,4 +148,65 @@ The subject contains succinct description of the change:
 * use the imperative, present tense: "change" not "changed" nor "changes"
 * do not capitalize first letter
 * do not place a period (.) at the end
-* entire length of the commit message must not go over 50 characters
+* entire length of the commit message must not go over 50 characters
+
+
+### Ionic Native Decorators
+
+#### Plugin
+A decorator to wrap the main plugin class, and any other classes that will use `@Cordova` or `@CordovaProperty` decorators. This decorator accepts the following configuration:
+- *pluginName*: Plugin name, this should match the class name
+- *plugin*: The plugin's NPM package, or Github URL if NPM is not available.
+- *pluginRef*: The plugin object reference. Example: 'cordova.file'.
+- *repo*: The plugin's Github Repository URL
+- *install*: (optional) Install command. This is used in case a plugin has a custom install command (takes variables).
+- *platforms*: An array of strings indicating the supported platforms. 
+
+#### Cordova
+Checks if the plugin and the method are available before executing. By default, the decorator will wrap the callbacks of the function and return a Promise. This decorator takes the following configuration options:
+- **observable**: set to true to return an Observable
+- **clearFunction**: an optional name of a method to clear the observable we returned
+- **clearWithArgs**: This can be used if clearFunction is set. Set this to true to call the clearFunction with the same arguments used in the initial function.
+- **sync**: set to true if the method should return the value as-is without wrapping with Observable/Promise
+- **callbackOrder**: set to `reverse` if the success and error callbacks are the first two arguements of the method
+- **callbackStyle**: set to `node` if the plugin has one callback with a node style (e.g: `function(err, result){}`), or set to `object` if the callbacks are part of an object
+- **successName**: Success function property name. This must be set if callbackStyle is set to object.
+- **errorName**: Error function property name. This must be set if callbackStyle is set to object.
+- **successIndex**: Set a custom index for the success callback function. This doesn't work if callbackOrder or callbackStyle are set.
+- **errorIndex**: Set a custom index for the error callback function. This doesn't work if callbackOrder or callbackStyle are set.
+- **eventObservable**: set to true to return an observable that wraps an event listener
+- **event**: Event name, this must be set if eventObservable is set to true
+- **element**: Element to attach the event listener to, this is optional, defaults to `window`
+- **otherPromise**: Set to true if the wrapped method returns a promise
+- **platforms**: array of strings indicating supported platforms. Specify this if the supported platforms doesn't match the plugin's supported platforms.
+
+Example:
+```ts
+@Cordova()
+someMethod(): Promise<any> { return; }
+
+@Cordova({ sync: true })
+syncMethod(): number { }
+```
+
+#### CordovaProperty
+Checks if the plugin and property exist before getting/setting the property's value
+
+Example:
+```ts
+@CordovaProperty
+someProperty: string;
+```
+
+#### CordovaCheck
+Checks if the plugin exists before performing a custom written method. By default, the method will return a promise that will reject with an error if the plugin is not available.  This wrapper accepts two optional configurations:
+- **observable**: set to true to return an empty Observable if the plugin isn't available
+- **sync**: set to true to return nothing if the plugin isn't available
+
+Example:
+```ts
+@CordovaCheck()
+someMethod(): Promise<any> {
+  // anything here will only run if the plugin is available
+}
+```

README.md

@@ -14,11 +14,11 @@ Run following command to install Ionic Native in your project.
 npm install @ionic-native/core --save
 ```
 
-You also need to install the Ionic Native package for each plugin you want to add. Please see the [Ionic Native documentation](http://ionicframework.com/docs/v2/native/) for complete instructions on how to add and use the plugins.
+You also need to install the Ionic Native package for each plugin you want to add. Please see the [Ionic Native documentation](http://ionicframework.com/docs/native/) for complete instructions on how to add and use the plugins.
 
 ## Documentation
 
-For the full Ionic Native documentation, please visit [http://ionicframework.com/docs/v2/native/](http://ionicframework.com/docs/v2/native/).
+For the full Ionic Native documentation, please visit [http://ionicframework.com/docs/native/](http://ionicframework.com/docs/native/).
 
 ### Basic Usage
 

circle.yml

@@ -1,26 +1,38 @@
-machine:
-  node:
-    version: 5.5.0
-  ruby:
-    version: 2.1.2
-
-general:
-  branches:
-    only:
-      - master # ignore PRs and branches
-
-dependencies:
- pre:
-   - ./scripts/docs/prepare.sh
- cache_directories:
-   - "~/ionic-site" # cache ionic-site
-
-test:
-  override:
-    - echo "No tests to run"
-
-deployment:
- staging:
-   branch: master
-   commands:
-     - ./scripts/docs/update_docs.sh
+version: 2
+jobs:
+  build:
+    working_directory: ~/ionic-native/
+    docker:
+      - image: node:7
+    steps:
+      - checkout
+      - restore_cache:
+         key: ionic-site
+      - run:
+         name: Prepare ionic-site repo
+         command: ./scripts/docs/prepare.sh
+      - save_cache:
+         key: ionic-site
+         paths:
+         - ~/ionic-site/
+      - restore_cache:
+         key: node_modules_{{ checksum "package.json" }}
+      - run:
+         name: Install node modules
+         command: npm i
+      - save_cache:
+         key: node_modules_{{ checksum "package.json" }}
+         paths:
+         - ~/ionic-native/node_modules/
+      - run:
+          name: Run tslint
+          command: npm run lint
+      - add_ssh_keys
+      - deploy:
+          name: Update docs
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              ./scripts/docs/update_docs.sh
+            else
+              echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."
+            fi

package.json

@@ -1,12 +1,12 @@
 {
   "name": "ionic-native",
-  "version": "3.4.0",
+  "version": "3.6.0",
   "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
   "license": "MIT",
   "devDependencies": {
-    "@angular/compiler": "2.4.8",
-    "@angular/compiler-cli": "2.4.8",
-    "@angular/core": "2.4.8",
+    "@angular/compiler": "4.0.0",
+    "@angular/compiler-cli": "4.0.0",
+    "@angular/core": "4.0.0",
     "canonical-path": "0.0.2",
     "child-process-promise": "2.2.0",
     "conventional-changelog-cli": "1.2.0",
@@ -27,12 +27,12 @@
     "q": "1.4.1",
     "queue": "4.2.1",
     "rimraf": "2.5.4",
-    "rxjs": "5.0.1",
+    "rxjs": "5.1.1",
     "semver": "5.3.0",
     "tslint": "3.15.1",
     "tslint-ionic-rules": "0.0.7",
-    "typescript": "2.0.09",
-    "zone.js": "0.7.2"
+    "typescript": "2.2.1",
+    "zone.js": "^0.8.4"
   },
   "scripts": {
     "start": "npm run test:watch",

scripts/build/build.js

@@ -40,7 +40,6 @@ PLUGIN_PACKAGE_JSON.peerDependencies = PLUGIN_PEER_DEPS;
 console.log('Making new TMP directory');
 fs.mkdirpSync(BUILD_TMP);
 
-
 // Prepare and copy the core module's package.json
 console.log('Preparing core module package.json');
 CORE_PACKAGE_JSON.version = IONIC_NATIVE_VERSION;
@@ -51,6 +50,11 @@ fs.writeJsonSync(path.resolve(BUILD_CORE_DIST, 'package.json'), CORE_PACKAGE_JSO
 // Fetch a list of the plugins
 const PLUGINS = fs.readdirSync(PLUGINS_PATH);
 
+// Build specific list of plugins to build from arguments, if any
+let pluginsToBuild = process.argv.slice(2);
+if (!pluginsToBuild.length) {
+  pluginsToBuild = PLUGINS;
+}
 
 // Create a queue to process tasks
 const QUEUE = queue({
@@ -116,7 +120,7 @@ const addPluginToQueue = pluginName => {
 
 };
 
-PLUGINS.forEach(addPluginToQueue);
+pluginsToBuild.forEach(addPluginToQueue);
 
 QUEUE.start((err) => {
 

scripts/config.json

@@ -1,6 +1,6 @@
 {
   "sitePath": "../ionic-site",
-  "v2DocsDir": "docs/v2/native",
-  "docsDest": "../ionic-site/content/docs/v2/native",
+  "v2DocsDir": "docs/native",
+  "docsDest": "../ionic-site/content/docs/native",
   "pluginDir": "dist/@ionic-native"
 }

scripts/docs/prepare.sh

@@ -30,7 +30,7 @@ function run {
     git pull origin master
   fi
 
-  git rm -rf content/docs/v2/native/*/ || true
+  git rm -rf content/docs/native/*/ || true
 
 }
 

scripts/docs/processors/jekyll.js

@@ -19,7 +19,7 @@ module.exports = function jekyll(renderDocsProcessor) {
 
       docs.forEach(doc => {
         doc.outputPath = doc.outputPath.toLowerCase().replace(/\s/g, '-');
-        doc.URL = doc.outputPath.replace('docs/v2//', 'docs/v2/')
+        doc.URL = doc.outputPath.replace('docs//', 'docs/')
           .replace('/index.md', '')
           .replace('content/', '');
       });
@@ -29,7 +29,7 @@ module.exports = function jekyll(renderDocsProcessor) {
         docType: 'nativeMenu',
         id: 'native_menu',
         template: 'native_menu.template.html',
-        outputPath: 'content/_includes/v2_fluid/native_menu.html'
+        outputPath: 'content/_includes/fluid/native_menu.html'
       });
 
       return docs;

scripts/docs/templates/common.template.html

@@ -1,5 +1,5 @@
 ---
-layout: "v2_fluid/docs_base"
+layout: "fluid/docs_base"
 version: "<$ version.current.name $>"
 versionHref: "<$ version.current.href.replace('content/','') $>"
 path: "<$ doc.path $>"
@@ -165,7 +165,7 @@ docType: "<$ doc.docType $>"
 <@ endif @>
 
 <# --- Install commands --- #>
-<pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add <$ prop.plugin $><@ endif @>
+<pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add --save <$ prop.plugin $><@ endif @>
 $ npm install --save @ionic-native/<$ doc.npmId $>
 </code></pre>
 <p>Repo:

scripts/docs/templates/native_menu.template.html

@@ -1,8 +1,8 @@
 <li class="capitalize {% if page.id == 'overview' %}active{% endif %}">
-  <a href="/docs/v2/native/">Overview</a>
+  <a href="/docs/native/">Overview</a>
 </li>
 <li class="capitalize {% if page.id == 'mocking' %}active{% endif %}">
-  <a href="/docs/v2/native/browser.html">Browser Usage</a>
+  <a href="/docs/native/browser.html">Browser Usage</a>
 </li>
 <@- for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
 <li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">

scripts/docs/templates/readme.template.md

@@ -20,7 +20,7 @@ $ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add <$ prop.plug
 $ npm install --save @ionic-native/<$ doc.npmId $>
 ```
 
-## [Usage Documentation](https://ionicframework.com/docs/v2/native/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/')|replace('index.ts','')|replace('src/@ionic-native/plugins/','') $>)
+## [Usage Documentation](https://ionicframework.com/docs/native/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/')|replace('index.ts','')|replace('src/@ionic-native/plugins/','') $>)
 
 Plugin Repo: [<$ prop.repo $>](<$ prop.repo $>)
 

scripts/templates/wrap-min.tmpl

@@ -1,4 +1,4 @@
-import { Plugin } from '@ionic-native/core';
+import { Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
 /**
@@ -25,6 +25,6 @@ import { Injectable } from '@angular/core';
   platforms: []
 })
 @Injectable()
-export class $PluginName {
+export class $PluginName extends IonicNativePlugin {
 
 }

scripts/templates/wrap.tmpl

@@ -10,7 +10,7 @@
  * - Remove this note
  *
  */
-import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty } from '@ionic-native/core';
+import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 
@@ -44,7 +44,7 @@ import { Observable } from 'rxjs/Observable';
   install: '', // OPTIONAL install command, in case the plugin requires variables
 })
 @Injectable()
-export class $PluginName {
+export class $PluginName extends IonicNativePlugin {
 
   /**
    * This function does something

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

@@ -1,3 +1,4 @@
 export * from './plugin';
 export * from './decorators';
 export * from './util';
+export * from './ionic-native-plugin';

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

@@ -0,0 +1,41 @@
+export class IonicNativePlugin {
+
+  static pluginName: string;
+
+  static pluginRef: string;
+
+  static plugin: string;
+
+  static repo: string;
+
+  static platforms: string[];
+
+  static install: string;
+
+  /**
+   * Returns a boolean that indicates whether the plugin is installed
+   * @return {boolean}
+   */
+  static installed(): boolean { return false; }
+
+  /**
+   * Returns the original plugin object
+   */
+  static getPlugin(): any {}
+
+  /**
+   * Returns the plugin's name
+   */
+  static getPluginName(): string { return; }
+
+  /**
+   * Returns the plugin's reference
+   */
+  static getPluginRef(): string { return; }
+
+  /**
+   * Returns the plugin's install name
+   */
+  static getPluginInstallName(): string { return; }
+
+}

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

@@ -32,7 +32,7 @@ export function checkAvailability(plugin: any, methodName?: string, pluginName?:
 
   pluginInstance = getPlugin(pluginRef);
 
-  if (!pluginInstance || (!!methodName && pluginInstance[methodName] === 'undefined')) {
+  if (!pluginInstance || (!!methodName && typeof pluginInstance[methodName] === 'undefined')) {
     if (!window.cordova) {
       cordovaWarn(pluginName, methodName);
       return {
@@ -54,7 +54,7 @@ export function checkAvailability(plugin: any, methodName?: string, pluginName?:
  * @private
  */
 export function instanceAvailability(pluginObj: any, methodName?: string): boolean {
-  return pluginObj._objectInstance && (!methodName || pluginObj._objectInstance[methodName] !== 'undefined');
+  return pluginObj._objectInstance && (!methodName || typeof pluginObj._objectInstance[methodName] !== 'undefined');
 }
 
 function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Function): any {

src/@ionic-native/plugins/action-sheet/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin, CordovaProperty } from '@ionic-native/core';
+import { Cordova, Plugin, CordovaProperty, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ActionSheetOptions {
 
@@ -13,6 +13,11 @@ export interface ActionSheetOptions {
    */
   title?: string;
 
+  /**
+   * The subtitle for the actionsheet (IOS only)
+   */
+  subtitle?: string;
+
   /**
    * Theme to be used on Android
    */
@@ -43,6 +48,10 @@ export interface ActionSheetOptions {
    */
   position?: number[];
 
+  /**
+   * Choose if destructive button will be the last
+   */
+  destructiveButtonLast: boolean;
 }
 
 /**
@@ -65,10 +74,12 @@ export interface ActionSheetOptions {
  *
  * const options: ActionSheetOptions = {
  *   title: 'What do you want with this image?',
+ *   subtitle: 'Choose an action',
  *   buttonLabels: buttonLabels,
  *   addCancelButtonWithLabel: 'Cancel',
  *   addDestructiveButtonWithLabel: 'Delete',
- *   androidTheme: this.actionSheet.ANDROID_THEMES.THEME_HOLO_DARK
+ *   androidTheme: this.actionSheet.ANDROID_THEMES.THEME_HOLO_DARK,
+ *   destructiveButtonLast: true
  * };
  *
  * this.actionSheet.show(options).then((buttonIndex: number) => {
@@ -83,10 +94,10 @@ export interface ActionSheetOptions {
   plugin: 'cordova-plugin-actionsheet',
   pluginRef: 'plugins.actionsheet',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-actionsheet',
-  platforms: ['Android', 'iOS', 'Windows Phone 8']
+  platforms: ['Android', 'iOS', 'Windows Phone 8', 'Browser']
 })
 @Injectable()
-export class ActionSheet {
+export class ActionSheet extends IonicNativePlugin {
 
   @CordovaProperty
   ANDROID_THEMES: {

src/@ionic-native/plugins/admob-free/index.ts

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromEvent';
@@ -65,12 +65,12 @@ export interface AdMobFreeRewardVideoConfig {
 }
 
 /**
- * @name AdbMobFree
+ * @name AdMob Free
  * @description
  *
  * @usage
  * ```
- * import { AdMobFree, AdMobFreeBannerConfig } from 'ionic-native';
+ * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free';
  *
  *
  * constructor(private admobFree: AdMobFree) { }
@@ -105,7 +105,7 @@ export interface AdMobFreeRewardVideoConfig {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class AdMobFree {
+export class AdMobFree extends IonicNativePlugin {
 
   /**
    * Convenience constructor to get event names
@@ -171,8 +171,6 @@ export class AdMobFree {
 })
 export class AdMobFreeBanner {
 
-
-
   /**
    * Update config.
    * @param options

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export type AdSize = 'SMART_BANNER' | 'BANNER' | 'MEDIUM_RECTANGLE' | 'FULL_BANNER' | 'LEADERBOARD' | 'SKYSCRAPER' | 'CUSTOM';
@@ -66,6 +66,11 @@ export interface AdMobOptions {
    */
   adExtras?: AdExtras;
 
+  /**
+   * License key for the plugin
+   */
+  license?: any;
+
 }
 
 export interface AdExtras {
@@ -90,7 +95,7 @@ export interface AdExtras {
  * Plugin for Google Ads, including AdMob / DFP (doubleclick for publisher) and mediations to other Ad networks.
  * @usage
  * ```typescript
- * import { AdMob, AdMobOptions, AdSize, AdExtras } from '@ionic-native/ad-mob';
+ * import { AdMob, AdMobOptions, AdSize, AdExtras } from '@ionic-native/admob';
  *
  * constructor(private admob: AdMob){}
  *
@@ -118,7 +123,7 @@ export interface AdExtras {
   platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
-export class AdMob {
+export class AdMob extends IonicNativePlugin {
 
   AD_POSITION: {
     NO_CHANGE: number;
@@ -242,7 +247,8 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdFailLoad'
+    event: 'onAdFailLoad',
+    element: document
   })
   onAdFailLoad(): Observable<any> { return; }
 
@@ -252,7 +258,8 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdLoaded'
+    event: 'onAdLoaded',
+    element: document
   })
   onAdLoaded(): Observable<any> { return; }
 
@@ -262,7 +269,8 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdPresent'
+    event: 'onAdPresent',
+    element: document
   })
   onAdPresent(): Observable<any> { return; }
 
@@ -272,7 +280,8 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdLeaveApp'
+    event: 'onAdLeaveApp',
+    element: document
   })
   onAdLeaveApp(): Observable<any> { return; }
 
@@ -282,7 +291,8 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdDismiss'
+    event: 'onAdDismiss',
+    element: document
   })
   onAdDismiss(): Observable<any> { return; }
 

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

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
 export interface AlipayOrder {
@@ -103,7 +103,7 @@ export interface AlipayOrder {
   install: 'ionic plugin add https://github.com/xueron/cordova-alipay-base --variable APP_ID=your_app_id'
 })
 @Injectable()
-export class Alipay {
+export class Alipay extends IonicNativePlugin {
   /**
    * Open Alipay to perform App pay
    * @param order { AlipayOrder } alipay options

src/@ionic-native/plugins/android-fingerprint-auth/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 
 export interface AFAAuthOptions {
@@ -148,7 +148,7 @@ export interface AFAEncryptResponse {
   platforms: ['Android']
 })
 @Injectable()
-export class AndroidFingerprintAuth {
+export class AndroidFingerprintAuth extends IonicNativePlugin {
 
   /**
    * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.

src/@ionic-native/plugins/android-full-screen/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Android Full Screen
@@ -29,7 +29,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android']
 })
 @Injectable()
-export class AndroidFullScreen {
+export class AndroidFullScreen extends IonicNativePlugin {
   /**
    * Is this plugin supported?
    * @return {Promise<void>}

src/@ionic-native/plugins/app-availability/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name App Availability
@@ -40,7 +40,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class AppAvailability {
+export class AppAvailability extends IonicNativePlugin {
 
   /**
    * Checks if an app is available on device

src/@ionic-native/plugins/app-preferences/index.ts

@@ -1,4 +1,4 @@
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Injectable } from '@angular/core';
 
@@ -27,7 +27,7 @@ import { Injectable } from '@angular/core';
   platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'OS X', 'Windows 8', 'Windows Phone']
 })
 @Injectable()
-export class AppPreferences {
+export class AppPreferences extends IonicNativePlugin {
 
   /**
    * Get a preference value
@@ -37,7 +37,6 @@ export class AppPreferences {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({
-    sync: true,
     callbackOrder: 'reverse'
   })
   fetch(dict: string, key?: string): Promise<any> { return; }

src/@ionic-native/plugins/app-rate/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, CordovaProperty, Plugin } from '@ionic-native/core';
+import { Cordova, CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 
 declare var window;
@@ -134,7 +134,7 @@ export interface AppUrls {
   platforms: ['Android', 'iOS', 'Windows (experimental)']
 })
 @Injectable()
-export class AppRate {
+export class AppRate extends IonicNativePlugin {
 
   /**
    * Configure various settings for the Rating View.

src/@ionic-native/plugins/app-update/index.ts

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
 /**
@@ -42,7 +42,7 @@ import { Injectable } from '@angular/core';
   platforms: ['Android']
 })
 @Injectable()
-export class AppUpdate {
+export class AppUpdate extends IonicNativePlugin {
   /**
    * Check and update
    * @param updateUrl {string} update api url

src/@ionic-native/plugins/app-version/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 
 
@@ -34,7 +34,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class AppVersion {
+export class AppVersion extends IonicNativePlugin {
 
   /**
    * Returns the name of the app

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

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 
@@ -31,7 +31,7 @@ import { Injectable } from '@angular/core';
   platforms: [ 'iOS', 'Android' ]
 })
 @Injectable()
-export class Appodeal {
+export class Appodeal extends IonicNativePlugin {
   // available types of advertisements
   readonly AD_TYPES = {
     INTERSTITIAL: 1,

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

@@ -1,4 +1,4 @@
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
 declare var window;
@@ -63,7 +63,7 @@ export interface BackgroundFetchConfig {
   platforms: ['iOS']
 })
 @Injectable()
-export class BackgroundFetch {
+export class BackgroundFetch extends IonicNativePlugin {
 
 
   /**
@@ -100,4 +100,11 @@ export class BackgroundFetch {
   })
   finish(): void { }
 
+  /**
+   * Return the status of the background-fetch
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  status(): Promise<any> { return; }
+
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare var window;
@@ -311,7 +311,7 @@ export interface BackgroundGeolocationConfig {
   platforms: ['iOS', 'Android', 'Windows Phone 8']
 })
 @Injectable()
-export class BackgroundGeolocation {
+export class BackgroundGeolocation extends IonicNativePlugin {
 
   /**

    * Set location service provider @see https://github.com/mauron85/cordova-plugin-background-geolocation/wiki/Android-providers


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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 
@@ -73,7 +73,7 @@ export interface BackgroundModeConfiguration {
   platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
-export class BackgroundMode {
+export class BackgroundMode extends IonicNativePlugin {
 
   /**
    * Enable the background mode.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 
 /**
@@ -32,7 +32,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android']
 })
 @Injectable()
-export class Backlight {
+export class Backlight extends IonicNativePlugin {
 
   /**
    * This function turns backlight on

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 
 /**
@@ -30,7 +30,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS', 'Browser', 'Windows', 'Amazon FireOS', 'Windows Phone 8']
 })
 @Injectable()
-export class Badge {
+export class Badge extends IonicNativePlugin {
 
   /**
    * Clear the badge of the app icon.

src/@ionic-native/plugins/barcode-scanner/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 
 export interface BarcodeScannerOptions {
@@ -89,7 +89,7 @@ export interface BarcodeScannerOptions {
   platforms: ['Android', 'iOS', 'Windows Phone 8', 'Windows 10', 'Windows 8', 'BlackBerry 10', 'Browser']
 })
 @Injectable()
-export class BarcodeScanner {
+export class BarcodeScanner extends IonicNativePlugin {
 
   Encode: {
     TEXT_TYPE: string;

src/@ionic-native/plugins/base64-to-gallery/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Base64 To Gallery
@@ -28,7 +28,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
-export class Base64ToGallery {
+export class Base64ToGallery extends IonicNativePlugin {
 
   /**
    * Converts a base64 string to an image file in the device gallery

src/@ionic-native/plugins/battery-status/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface BatteryStatusResponse {
@@ -32,7 +32,7 @@ export interface BatteryStatusResponse {
  *
  * // watch change in battery status
  * let subscription = this.batteryStatus.onChange().subscribe(
- *  (status: StatusObject) => {
+ *  (status: BatteryStatusResponse) => {
  *    console.log(status.level, status.isPlugged);
  *  }
  * );
@@ -52,7 +52,7 @@ export interface BatteryStatusResponse {
   platforms: ['Amazon Fire OS', 'iOS', 'Android', 'BlackBerry 10', 'Windows Phone 7', 'Windows Phone 8', 'Windows', 'Firefox OS', 'Browser']
 })
 @Injectable()
-export class BatteryStatus {
+export class BatteryStatus extends IonicNativePlugin {
 
   /**
    * Watch the change in battery level

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -176,7 +176,7 @@ import { Observable } from 'rxjs/Observable';
   platforms: ['iOS', 'Android']
 })
 @Injectable()
-export class BLE {
+export class BLE extends IonicNativePlugin {
 
   /**
    * Scan and discover BLE peripherals for the specified amount of time.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -38,7 +38,7 @@ import { Observable } from 'rxjs/Observable';
   platforms: ['Android', 'iOS', 'Windows Phone', 'Browser']
 })
 @Injectable()
-export class BluetoothSerial {
+export class BluetoothSerial extends IonicNativePlugin {
 
   /**
    * Connect to a Bluetooth device

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Brightness
@@ -29,7 +29,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Brightness {
+export class Brightness extends IonicNativePlugin {
 
   /**
    * Sets the brightness of the display.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -31,7 +31,7 @@ import { Observable } from 'rxjs/Observable';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Broadcaster {
+export class Broadcaster extends IonicNativePlugin {
 
   /**
    * This function listen to an event sent from the native code

src/@ionic-native/plugins/browser-tab/index.ts

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
 /**
@@ -40,7 +40,7 @@ import { Injectable } from '@angular/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class BrowserTab {
+export class BrowserTab extends IonicNativePlugin {
 
   /**
    * Check if BrowserTab option is available

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CalendarOptions {
 
@@ -60,7 +60,7 @@ export interface CalendarOptions {
  *
  * @usage
  * ```
- * import {Calendar} from '@ionic-native/calendar';
+ * import { Calendar } from '@ionic-native/calendar';
  *
  * constructor(private calendar: Calendar) { }
  *
@@ -81,7 +81,7 @@ export interface CalendarOptions {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Calendar {
+export class Calendar extends IonicNativePlugin {
 
   /**
    * This function checks if we have permission to read/write from/to the calendar.

src/@ionic-native/plugins/call-number/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Call Number
  * @description
@@ -7,7 +7,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
  *
  * @usage
  * ```
- * import {CallNumber} from '@ionic-native/call-number';
+ * import { CallNumber } from '@ionic-native/call-number';
  *
  * constructor(private callNumber: CallNumber) { }
  *
@@ -28,7 +28,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['iOS', 'Android']
 })
 @Injectable()
-export class CallNumber {
+export class CallNumber extends IonicNativePlugin {
 
   /**
    * Calls a phone number

src/@ionic-native/plugins/camera-preview/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CameraPreviewDimensions {
   /** The width of the camera preview, default to window.screen.width */
@@ -132,7 +132,39 @@ export interface CameraPreviewPictureOptions {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class CameraPreview {
+export class CameraPreview extends IonicNativePlugin {
+
+  EXPOSURE_MODES = {
+    LOCK: 'lock', // IOS Only
+    AUTO: 'auto', // IOS Only
+    CONTINUOUS: 'continuous',
+    CUSTOM: 'custom'
+  };
+
+  FLASH_MODE = {
+    OFF: 'off',
+    ON: 'on',
+    AUTO: 'auto',
+    RED_EYE: 'red-eye',
+    TORCH: 'torch' // Android Only
+  };
+
+  COLOR_EFFECT = {
+    AQUA: 'aqua', // Android Only
+    BLACKBOARD: 'blackboard', // Android Only
+    MONO: 'mono',
+    NEGATIVE: 'negative',
+    NONE: 'none',
+    POSTERIZE: 'posterize',
+    SEPIA: 'sepia',
+    SOLARIZE: 'solarize', // Android Only
+    WHITEBOARD: 'whiteboard' // Android Only
+  };
+
+  CAMERA_DIRECTION = {
+    BACK: 'back',
+    FRONT: 'front'
+  };
 
   /**
    * Starts the camera preview instance.
@@ -149,40 +181,28 @@ export class CameraPreview {
    * Stops the camera preview instance. (iOS & Android)
    * @return {Promise<any>}
    */
-  @Cordova({
-    successIndex: 0,
-    errorIndex: 1
-  })
+  @Cordova()
   stopCamera(): Promise<any> { return; }
 
   /**
    * Switch from the rear camera and front camera, if available.
    * @return {Promise<any>}
    */
-  @Cordova({
-    successIndex: 0,
-    errorIndex: 1
-  })
+  @Cordova()
   switchCamera(): Promise<any> { return; }
 
   /**
    * Hide the camera preview box.
    * @return {Promise<any>}
    */
-  @Cordova({
-    successIndex: 0,
-    errorIndex: 1
-  })
+  @Cordova()
   hide(): Promise<any> { return; }
 
   /**
    * Show the camera preview box.
    * @return {Promise<any>}
    */
-  @Cordova({
-    successIndex: 0,
-    errorIndex: 1
-  })
+  @Cordova()
   show(): Promise<any> { return; }
 
   /**
@@ -220,6 +240,19 @@ export class CameraPreview {
   })
   setZoom(zoom?: number): Promise<any> { return; }
 
+/**
+   * Get the maximum zoom (Android)
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getMaxZoom(): Promise<any> { return; }
+
+  /**
+   * Get current zoom (Android)
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getZoom(): Promise<any> { return; }
 
   /**
    * Set the preview Size
@@ -228,8 +261,7 @@ export class CameraPreview {
    */
   @Cordova({
     successIndex: 1,
-    errorIndex: 2,
-    platforms: ['Android']
+    errorIndex: 2
   })
   setPreviewSize(dimensions?: CameraPreviewDimensions): Promise<any> { return; }
 
@@ -244,4 +276,68 @@ export class CameraPreview {
   })
   setFlashMode(flashMode?: string): Promise<any> { return; }
 
+  /**
+   * Get supported picture sizes
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getSupportedPictureSizes(): Promise<any> { return; }
+
+  /**
+   * Get supported flash modes
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getSupportedFlashModes(): Promise<any> { return; }
+
+  /**
+   * Get exposure mode
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getExposureMode(): Promise<any> { return; }
+
+  /**
+   * Get exposure modes
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getExposureModes(): Promise<any> { return; }
+
+  /**
+   * Set exposure mode
+   * @param [lock] {string}
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 2
+  })
+  setExposureMode(lock?: string): Promise<any> { return; }
+
+  /**
+   * Get exposure compensation (Android)
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getExposureCompensation(): Promise<any> { return; }
+
+  /**
+   * Set exposure compensation (Android)
+   * @param [exposureCompensation] {number}
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 2
+  })
+  setExposureCompensation(exposureCompensation?: number): Promise<any> { return; }
+
+  /**
+   * Get exposure compensation range (Android)
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getExposureCompensationRange(): Promise<any> { return; }
+
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CameraOptions {
   /** Picture quality in range 0-100. Default is 50 */
@@ -128,7 +128,7 @@ export interface CameraPopoverOptions {
   platforms: ['Android', 'BlackBerry', 'Browser', 'Firefox', 'FireOS', 'iOS', 'Windows', 'Windows Phone 8', 'Ubuntu']
 })
 @Injectable()
-export class Camera {
+export class Camera extends IonicNativePlugin {
 
   /**
    * Constant for possible destination types

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CardIOOptions {
 
@@ -167,7 +167,7 @@ export interface CardIOResponse {
   platforms: ['iOS', 'Android']
 })
 @Injectable()
-export class CardIO {
+export class CardIO extends IonicNativePlugin {
 
   /**
    * Check whether card scanning is currently available. (May vary by

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Clipboard
  * @description
@@ -37,7 +37,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Amazon Fire OS', 'iOS', 'Android', 'BlackBerry 10', 'Windows Phone 7', 'Windows Phone 8', 'Windows', 'Firefox OS', 'Browser']
 })
 @Injectable()
-export class Clipboard {
+export class Clipboard extends IonicNativePlugin {
 
   /**
    * Copies the given text

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 namespace Http {
   export const enum Verb {
@@ -427,7 +427,7 @@ export interface DownloadProgress {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class CodePush {
+export class CodePush extends IonicNativePlugin {
 
   /**
    * Get the current package information.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CordovaInstance, InstanceProperty, Plugin, getPromise, InstanceCheck, checkAvailability, CordovaCheck } from '@ionic-native/core';
+import { CordovaInstance, InstanceProperty, Plugin, getPromise, InstanceCheck, checkAvailability, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 
 declare var window: any,
   navigator: any;
@@ -294,7 +294,7 @@ export class ContactFindOptions implements IContactFindOptions {
   platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows 8', 'Windows Phone']
 })
 @Injectable()
-export class Contacts {
+export class Contacts extends IonicNativePlugin {
 
   /**
    * Create a single contact.

src/@ionic-native/plugins/couchbase-lite/index.ts

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
 
@@ -29,7 +29,7 @@ import { Injectable } from '@angular/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class CouchbaseLite {
+export class CouchbaseLite extends IonicNativePlugin {
 
   /**
    * Get the database url

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

@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Crop
  * @description Crops images
  * @usage
  * ```
- * import {Crop} from '@ionic-native/crop';
+ * import { Crop } from '@ionic-native/crop';
  *
  * constructor(private crop: Crop) { }
  *
@@ -27,7 +27,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Crop {
+export class Crop extends IonicNativePlugin {
 
   /**
    * Crops an image

src/@ionic-native/plugins/date-picker/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {Cordova, Plugin} from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface DatePickerOptions {
   /**
@@ -154,7 +154,7 @@ export interface DatePickerOptions {
   platforms: ['Android', 'iOS', 'Windows']
 })
 @Injectable()
-export class DatePicker {
+export class DatePicker extends IonicNativePlugin {
 
   /**
    * @hidden

src/@ionic-native/plugins/db-meter/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -42,7 +42,7 @@ import { Observable } from 'rxjs/Observable';
   platforms: ['iOS', 'Android']
 })
 @Injectable()
-export class DBMeter {
+export class DBMeter extends IonicNativePlugin {
 
   /**
    * Starts listening

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeeplinkMatch {
@@ -83,7 +83,7 @@ export interface DeeplinkMatch {
   installVariables: ['URL_SCHEME', 'DEEPLINK_SCHEME', 'DEEPLINK_HOST', 'ANDROID_PATH_PREFIX']
 })
 @Injectable()
-export class Deeplinks {
+export class Deeplinks extends IonicNativePlugin {
 
   /**
    * Define a set of paths to match against incoming deeplinks.

src/@ionic-native/plugins/device-accounts/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Device Accounts
@@ -28,7 +28,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android']
 })
 @Injectable()
-export class DeviceAccounts {
+export class DeviceAccounts extends IonicNativePlugin {
 
   /**
    *  Gets all accounts registered on the Android Device

src/@ionic-native/plugins/device-feedback/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Device Feedback
  * @description
@@ -38,7 +38,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android']
 })
 @Injectable()
-export class DeviceFeedback {
+export class DeviceFeedback extends IonicNativePlugin {
 
   /**
    * Provide sound feedback to user, nevertheless respect user's settings and current active device profile as native feedback do.

src/@ionic-native/plugins/device-motion/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeviceMotionAccelerationData {
@@ -75,7 +75,7 @@ export interface DeviceMotionAccelerometerOptions {
   platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
-export class DeviceMotion {
+export class DeviceMotion extends IonicNativePlugin {
 
   /**
    * Get the current acceleration along the x, y, and z axes.

src/@ionic-native/plugins/device-orientation/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeviceOrientationCompassHeading {
@@ -80,7 +80,7 @@ export interface DeviceOrientationCompassOptions {
   platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
-export class DeviceOrientation {
+export class DeviceOrientation extends IonicNativePlugin {
 
   /**
    * Get the current compass heading.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CordovaProperty, Plugin } from '@ionic-native/core';
+import { CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 declare var window: any;
 
@@ -27,7 +27,7 @@ declare var window: any;
   platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'OS X', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
-export class Device {
+export class Device extends IonicNativePlugin {
 
   /** Get the version of Cordova running on the device. */
   @CordovaProperty

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {Cordova, Plugin, CordovaProperty} from '@ionic-native/core';
+import { Cordova, Plugin, CordovaProperty, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Diagnostic
@@ -42,7 +42,7 @@ import {Cordova, Plugin, CordovaProperty} from '@ionic-native/core';
   platforms: ['Android', 'iOS', 'Windows']
 })
 @Injectable()
-export class Diagnostic {
+export class Diagnostic extends IonicNativePlugin {
 
   permission = {
     READ_CALENDAR: 'READ_CALENDAR',

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 
 export interface DialogsPromptCallback {
@@ -49,7 +49,7 @@ export interface DialogsPromptCallback {
   platforms: ['Android', 'BlackBerry 10', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
-export class Dialogs {
+export class Dialogs extends IonicNativePlugin {
 
   /**
    * Shows a custom alert or dialog box.

src/@ionic-native/plugins/email-composer/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin, CordovaCheck } from '@ionic-native/core';
+import { Cordova, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 
 declare var cordova: any;
 
@@ -79,7 +79,7 @@ export interface EmailComposerOptions {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class EmailComposer {
+export class EmailComposer extends IonicNativePlugin {
 
   /**
    * Verifies if sending emails is supported on the device.

src/@ionic-native/plugins/estimote-beacons/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface EstimoteBeaconRegion {
@@ -47,7 +47,7 @@ export interface EstimoteBeaconRegion {
   platforms: ['iOS', 'Android']
 })
 @Injectable()
-export class EstimoteBeacons {
+export class EstimoteBeacons extends IonicNativePlugin {
 
   /** Proximity value */
   ProximityUnknown = 0;

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface FacebookLoginResponse {
 
@@ -117,7 +117,7 @@ export interface FacebookLoginResponse {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Facebook {
+export class Facebook extends IonicNativePlugin {
 
   /**
    * Browser wrapper

src/@ionic-native/plugins/file-chooser/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name File Chooser
@@ -29,7 +29,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android']
 })
 @Injectable()
-export class FileChooser {
+export class FileChooser extends IonicNativePlugin {
 
   /**
    * Open a file

src/@ionic-native/plugins/file-opener/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name File Opener
@@ -28,7 +28,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android', 'iOS', 'Windows', 'Windows Phone 8']
 })
 @Injectable()
-export class FileOpener {
+export class FileOpener extends IonicNativePlugin {
 
   /**
    * Open an file

src/@ionic-native/plugins/file-path/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 declare var window: any;
 
@@ -18,8 +18,8 @@ declare var window: any;
  * ...
  *
  * this.filePath.resolveNativePath(path)
- *   .then(filePath => console.log(filePath);
- *   .catch(err => console.log(err);
+ *   .then(filePath => console.log(filePath))
+ *   .catch(err => console.log(err));
  *
  * ```
  */
@@ -31,7 +31,7 @@ declare var window: any;
   platforms: ['Android']
 })
 @Injectable()
-export class FilePath {
+export class FilePath extends IonicNativePlugin {
 
   /**
    * Resolve native path for given content URL/path.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CordovaProperty, Plugin, CordovaCheck } from '@ionic-native/core';
+import { CordovaProperty, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 
 declare var window: any;
 declare var cordova: any;
@@ -371,7 +371,7 @@ export declare var FileError: {
   platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'OS X', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
-export class File {
+export class File extends IonicNativePlugin {
 
   /**
    *  Read-only directory where the application is installed.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 
 export interface FingerprintOptions {
@@ -30,7 +30,7 @@ export interface FingerprintOptions {
  * ```typescript
  * import { FingerprintAIO } from '@ionic-native/fingerprint-aio';
  *
- * constructor(private faio: FingerpirntAIO) { }
+ * constructor(private faio: FingerprintAIO) { }
  *
  * ...
  *
@@ -54,7 +54,7 @@ export interface FingerprintOptions {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class FingerprintAIO {
+export class FingerprintAIO extends IonicNativePlugin {
 
   /**
    * Check if fingerprint authentication is available

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -32,7 +32,7 @@ import { Observable } from 'rxjs/Observable';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Firebase {
+export class Firebase extends IonicNativePlugin {
 
   /**
    * Get the device token

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Flashlight
@@ -11,7 +11,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
  * ```typescript
  * import { Flashlight } from '@ionic-native/flashlight';
  *
- * constructor(private flashlight: FlashLight) { }
+ * constructor(private flashlight: Flashlight) { }
  *
  * ...
  *
@@ -28,7 +28,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
-export class Flashlight {
+export class Flashlight extends IonicNativePlugin {
 
   /**
    * Checks if the flashlight is available

src/@ionic-native/plugins/flurry-analytics/index.ts

@@ -0,0 +1,221 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+export interface FlurryAnalyticsOptions {
+  /** Flurry API key is required */
+  appKey: string;
+  /**
+   * Overrides the version of the app
+   */
+  version?: string;
+  /**
+   * How long can the app be paused before a new session is created,
+   * must be less than or equal to five for Android devices
+   */
+  continueSessionSeconds?: number;
+  /**
+   * Set id of the user
+   */
+  userId?: string;
+  /**
+   * Set gender of the user
+   * Valid values are "m", "M", "f" and "F"
+   */
+  gender?: string;
+  /**
+   * Set age of the user
+   */
+  age?: number;
+  /**
+   * Set error for log
+   * Values: VERBOSE, DEBUG, INFO, WARN, ERROR
+   */
+  logLevel?: string;
+  /**
+   * Defaults to false
+   */
+  enableLogging?: boolean;
+  /**
+   * Should every event show up the app's log, defaults to true
+   */
+  enableEventLogging?: boolean;
+  /**
+   * Should app crashes be recorded in flurry, defaults to false, iOS only
+   */
+  enableCrashReporting?: boolean;
+  /**
+   * Should the session continue when the app is the background, defaults to false, iOS only
+   */
+  enableBackgroundSessions?: boolean;
+  /**
+   * Should data be pushed to flurry when the app closes, defaults to true, iOS only
+   */
+  reportSessionsOnClose?: boolean;
+  /**
+   * Should data be pushed to flurry when the app is paused, defaults to true, iOS only
+   */
+  reportSessionsOnPause?: boolean;
+}
+
+export interface FlurryAnalyticsLocation {
+  latitude: number;
+  longitude: number;
+  /**
+   * Set altitude
+   * It is optional and use only for iOS
+   */
+  verticalAccuracy?: number;
+  /**
+   * Set radius about 2d point
+   * It is optional and use only for iOS
+   */
+  horizontalAccuracy?: number;
+}
+
+/**
+ * @name Flurry Analytics
+ * @description
+ * This plugin connects to Flurry Analytics SDK
+ *
+ * @usage
+ * ```
+ * import { FlurryAnalytics } from 'ionic-native/flurry-analytics';
+ *
+ * constructor(private flurryAnalytics: FlurryAnalytics) { }
+ *
+ * ...
+ *
+ * constant options: FlurryAnalyticsOptions = {
+ *  reportSessionsOnClose: true,
+ *  enableLogging: true
+ * }
+ *
+ * FlurryAnalytics.init('12345678965412303214', options)
+ *   .then((something: any) => doSomething(something))
+ *   .catch((error: any) => console.log(error));
+ *
+ * ```
+ * @interfaces
+ * FlurryAnalyticsOptions
+ * FlurryAnalyticsLocation
+ */
+@Plugin({
+  pluginName: 'FlurryAnalyticsPlugin',
+  plugin: 'cordova-plugin-flurryanalytics',
+  pluginRef: 'fa',
+  repo: 'https://github.com/blakgeek/cordova-plugin-flurryanalytics.git',
+  platforms: ['Android', 'iOS', 'Browser']
+})
+@Injectable()
+export class FlurryAnalytics extends IonicNativePlugin {
+
+  /**
+   * Set the setting for Flurry Analytics
+   * @param appKey {string} API key is required
+   * @param options {FlurryAnalyticsOptions} is optional
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  init(appKey: string, options?: FlurryAnalyticsOptions): Promise<any> {
+    return;
+  }
+
+  /**
+   * This function set the Event
+   * @param eventName {string} The param to configure name of Event
+   * @param params {Object} optional
+   * @return {Promise<any>} Returns a promise that resolves when event is set
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 0
+  })
+  logEvent(eventName: string, params?: any): Promise<any> {
+    return;
+  }
+
+  /**
+   * This function start a timed event
+   * @param eventName
+   * @param params {Object} optional
+   * @return {Promise<any>} Returns a promise that resolves when timed event is started tracking
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 0
+  })
+  startTimedEvent(eventName: string, params?: Object): Promise<any> {
+    return;
+  }
+
+  /**
+   * This function complete a timed event
+   * @param eventName
+   * @param params {Object} optional
+   * @return {Promise<any>} Returns a promise that resolves when timed event is ended tracking
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 0
+  })
+  endTimedEvent(eventName: string, params?: Object): Promise<any> {
+    return;
+  }
+
+  /**
+   * This function log an error
+   * @param code
+   * @param message
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 0
+  })
+  logError(code, message): Promise<any> {
+    return;
+  }
+
+  /**
+   * This function log a page view
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  logPageView(): Promise<any> {
+    return;
+  }
+
+  /**
+   * This function set the location for the event
+   * (this is will only be used for very course grained statistics like city)
+   * @param location
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 0
+  })
+  setLocation(location: FlurryAnalyticsLocation): Promise<any> {
+    return;
+  }
+
+  /**
+   * This function start the session
+   * Only needed for older versions of Android
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  startSession(): Promise<any> {
+    return;
+  }
+
+  /**
+   * This function end the session
+   * Only needed for older versions of Android
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  endSession(): Promise<any> {
+    return;
+  }
+}

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin, CordovaFunctionOverride } from '@ionic-native/core';
+import { Cordova, Plugin, CordovaFunctionOverride, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare var window: any;
@@ -83,7 +83,7 @@ declare var window: any;
   platforms: ['Android', 'iOS', 'Windows Phone 8', 'Windows Phone']
 })
 @Injectable()
-export class Geofence {
+export class Geofence extends IonicNativePlugin {
 
   public TransitionType = {
     ENTER: 1,

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare var navigator: any;
@@ -156,7 +156,7 @@ export interface GeolocationOptions {
   platforms: ['Android', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
-export class Geolocation {
+export class Geolocation extends IonicNativePlugin {
 
   /**
    * Get the device's current position.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Globalization
@@ -29,7 +29,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Firefox OS', 'iOS', 'Windows Phone 8', 'Widnows', 'Browser']
 })
 @Injectable()
-export class Globalization {
+export class Globalization extends IonicNativePlugin {
 
   /**
    * Returns the BCP-47 compliant language identifier tag to the successCallback with a properties object as a parameter. That object should have a value property with a String value.

src/@ionic-native/plugins/google-analytics/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 declare var window;
 
@@ -22,6 +22,7 @@ declare var window;
  * this.ga.startTrackerWithId('YOUR_TRACKER_ID')
  *    .then(() => {
  *      console.log('Google analytics is ready now');
+        this.ga.trackView('test');
  *      // Tracker is ready
  *      // You can now track pages or set additional information such as AppVersion or UserId
  *    })
@@ -38,7 +39,7 @@ declare var window;
   platforms: ['Android', 'iOS', 'Browser']
 })
 @Injectable()
-export class GoogleAnalytics {
+export class GoogleAnalytics extends IonicNativePlugin {
 
   /**
    * In your 'deviceready' handler, set up your Analytics tracker.

src/@ionic-native/plugins/google-maps/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, CordovaInstance, CordovaCheck, Plugin, InstanceProperty, InstanceCheck, checkAvailability } from '@ionic-native/core';
+import { Cordova, CordovaInstance, CordovaCheck, Plugin, InstanceProperty, InstanceCheck, checkAvailability, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromEvent';
 
@@ -384,7 +384,7 @@ export class GoogleMap {
  * export class MapPage {
  *  constructor(private googleMaps: GoogleMaps) {}
  *
- * // Load map only after view is initialize
+ * // Load map only after view is initialized
  * ngAfterViewInit() {
  *  this.loadMap();
  * }
@@ -455,7 +455,7 @@ export class GoogleMap {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class GoogleMaps {
+export class GoogleMaps extends IonicNativePlugin {
 
   /**
    * Checks if a map object has been created and is available.
@@ -1749,7 +1749,7 @@ export interface GeocoderResult {
  */
 @Plugin({
   pluginName: 'Geocoder',
-  pluginRef: 'plugins.google.maps.Geocoder',
+  pluginRef: 'plugin.google.maps.Geocoder',
   plugin: 'cordova-plugin-googlemaps',
   repo: ''
 })

src/@ionic-native/plugins/google-plus/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Google Plus
@@ -12,7 +12,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
  *
  * ...
  *
- * this.googlePlus.login()
+ * this.googlePlus.login({})
  *   .then(res => console.log(res))
  *   .catch(err => console.error(err));
  *
@@ -28,7 +28,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   installVariables: ['REVERSED_CLIENT_ID']
 })
 @Injectable()
-export class GooglePlus {
+export class GooglePlus extends IonicNativePlugin {
 
   /**
    * The login function walks the user through the Google Auth process.

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

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Injectable } from '@angular/core';
 
@@ -81,7 +81,7 @@ export interface GyroscopeOptions {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Gyroscope {
+export class Gyroscope extends IonicNativePlugin {
 
   /**
    * Watching for gyroscope sensor changes

src/@ionic-native/plugins/header-color/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Header Color
@@ -25,7 +25,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android']
 })
 @Injectable()
-export class HeaderColor {
+export class HeaderColor extends IonicNativePlugin {
 
   /**
    * Set a color to the task header

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

@@ -1,6 +1,21 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
+/**
+ * @hidden
+ */
+export interface HealthDataType {
+  /**
+  * Read only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
+  */
+  read?: string[];
+
+  /**
+  * Write only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
+  */
+  write?: string[];
+}
+
 /**
  * @hidden
  */
@@ -154,9 +169,19 @@ export interface HealthData {
  * ...
  *
  * this.health.isAvailable()
+ * .then((available:boolean) => {
+ *   console.log(available);
+ *   this.health.requestAuthorization([
+ *     'distance', 'nutrition',  //read and write permissions
+ *     {
+ *       read: ['steps'],       //read only permission
+ *       write: ['height', 'weight']  //write only permission
+ *     }
+ *   ])
  *   .then(res => console.log(res))
  *   .catch(e => console.log(e));
- *
+ * })
+ * .catch(e => console.log(e));
  *
  * ```
  * See description at https://github.com/dariosalvi78/cordova-plugin-health for a full list of Datatypes and see examples.
@@ -175,7 +200,7 @@ export interface HealthData {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Health {
+export class Health extends IonicNativePlugin {
 
   /**
    * Tells if either Google Fit or HealthKit are available.
@@ -204,7 +229,7 @@ export class Health {
   promptInstallFit(): Promise<any> { return; }
 
   /**
-   * Requests read and write access to a set of data types. It is recommendable to always explain why the app
+   * Requests read and/or write access to a set of data types. It is recommendable to always explain why the app
    * needs access to the data before asking the user to authorize it.
    * This function must be called before using the query and store functions, even if the authorization has already
    * been given at some point in the past.
@@ -219,22 +244,25 @@ export class Health {
    * In Android 6 and over, this function will also ask for some dynamic permissions if needed
    * (e.g. in the case of "distance", it will need access to ACCESS_FINE_LOCATION).
    *
-   * @param {Array<String>} datatypes a list of data types you want to be granted access to
-   *
+   * @param {Array<string | HealthDataType>} datatypes a list of data types you want to be granted access to.
    * @return {Promise<any>}
    */
   @Cordova()
-  requestAuthorization(datatypes: Array<string>): Promise<any> { return; }
+  requestAuthorization(datatypes: Array<string | HealthDataType>): Promise<any> { return; }
 
   /**
    * Check if the app has authorization to read/write a set of datatypes.
-   * This function is similar to requestAuthorization() and has similar quirks.
    *
-   * @param {Array<String>} datatypes a list of data types you want to be granted access to
+   * Quirks of isAuthorized()
+   *
+   * In iOS, this function will only check authorization status for writeable data.
+   * Read-only data will always be considered as not authorized. This is an intended behaviour of HealthKit.
+   *
+   * @param {Array<string | HealthDataType>} datatypes a list of data types you want to check access of, same as in requestAuthorization
    * @return {Promise<boolean>} Returns a promise that resolves with a boolean that indicates the authorization status
    */
   @Cordova()
-  isAuthorized(datatypes: Array<string>): Promise<boolean> { return; }
+  isAuthorized(datatypes: Array<string | HealthDataType>): Promise<boolean> { return; }
 
   /**
    * Gets all the data points of a certain data type within a certain time window.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface HotspotConnectionInfo {
 
@@ -133,7 +133,7 @@ export interface HotspotDevice {
   platforms: ['Android']
 })
 @Injectable()
-export class Hotspot {
+export class Hotspot extends IonicNativePlugin {
 
   /**
    * @returns {Promise<boolean>}

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface HTTPResponse {
   /**
@@ -65,7 +65,7 @@ export interface HTTPResponse {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class HTTP {
+export class HTTP extends IonicNativePlugin {
 
   /**
    * This returns an object representing a basic HTTP Authorization header of the form.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface HttpdOptions {
@@ -55,7 +55,7 @@ export interface HttpdOptions {
   platforms: ['iOS', 'Android']
 })
 @Injectable()
-export class Httpd {
+export class Httpd extends IonicNativePlugin {
 
   /**
    * Starts a web server.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin, CordovaCheck } from '@ionic-native/core';
+import { Cordova, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare var cordova: any;
@@ -286,7 +286,7 @@ export interface IBeaconDelegate {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class IBeacon {
+export class IBeacon extends IonicNativePlugin {
 
   /**
    * Instances of this class are delegates between the {@link LocationManager} and

src/@ionic-native/plugins/image-picker/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 
 export interface ImagePickerOptions {
@@ -63,7 +63,7 @@ export interface ImagePickerOptions {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class ImagePicker {
+export class ImagePicker extends IonicNativePlugin {
   /**
    * Pick pictures from the library.
    * @param {ImagePickerOptions} options

src/@ionic-native/plugins/image-resizer/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ImageResizerOptions {
     /**
@@ -80,7 +80,7 @@ export interface ImageResizerOptions {
   platforms: ['Android', 'iOS', 'Windows']
 })
 @Injectable()
-export class ImageResizer {
+export class ImageResizer extends IonicNativePlugin {
   /**
    * @returns {Promise<any>}
    */

src/@ionic-native/plugins/in-app-browser/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, CordovaInstance } from '@ionic-native/core';
+import { Plugin, CordovaInstance, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromEvent';
 
@@ -166,7 +166,7 @@ export class InAppBrowserObject {
   platforms: ['Amazon', 'Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'OS X', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
-export class InAppBrowser {
+export class InAppBrowser extends IonicNativePlugin {
 
   /**
    * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.

src/@ionic-native/plugins/in-app-purchase/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 
 /**
@@ -61,7 +61,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   repo: 'https://github.com/AlexDisler/cordova-plugin-inapppurchase'
 })
 @Injectable()
-export class InAppPurchase {
+export class InAppPurchase extends IonicNativePlugin {
 
   /**
    * Retrieves a list of full product data from Apple/Google. This method must be called before making purchases.

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 
 /**
@@ -37,7 +37,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
-export class Insomnia {
+export class Insomnia extends IonicNativePlugin {
 
   /**
    * Keeps awake the application

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Instagram
@@ -27,7 +27,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Instagram {
+export class Instagram extends IonicNativePlugin {
 
   /**
    * Detect if the Instagram application is installed on the device.

src/@ionic-native/plugins/intel-security/index.ts

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
 declare var window: any;
@@ -49,18 +49,17 @@ export interface IntelSecurityDataOptions {
  * let storageID = 'id';
  *
  * this.intelSecurity.data.createFromData({ data: 'Sample Data' })
- *   .then((instanceID: Number) => this.IntelSecurity.storage.write({ id: storageId, instanceID: instanceID }))
+ *   .then((instanceID: Number) => this.intelSecurity.storage.write({ id: storageId, instanceID: instanceID }))
  *   .catch((error: any) => console.log(error));
  *
  * this.intelSecurity.storage.read({id: storageID })
- *   .then(this.intelSecurity.data.getData)
+ *   .then((instanceID: number) => this.intelSec.data.getData(instanceID))
  *   .then((data: string) => console.log(data)) // Resolves to 'Sample Data'
  *   .catch((error: any) => console.log(error));
  *
  * this.intelSecurity.storage.delete({ id: storageID })
  *   .then(() => console.log('Deleted Successfully'))
  *   .catch((error: any) => console.log(error));
- *
  * ```
  * @classes
  * IntelSecurityData
@@ -76,7 +75,7 @@ export interface IntelSecurityDataOptions {
   platforms: ['Android', 'iOS', 'Windows']
 })
 @Injectable()
-export class IntelSecurity {
+export class IntelSecurity extends IonicNativePlugin {
 
   /**
    * returns an IntelSecurityStorage object

src/@ionic-native/plugins/is-debug/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Is Debug
@@ -29,7 +29,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class IsDebug {
+export class IsDebug extends IonicNativePlugin {
 
   /**
    * Determine if an app was installed via xcode / eclipse / the ionic CLI etc

src/@ionic-native/plugins/jins-meme/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova, CordovaCheck } from '@ionic-native/core';
+import { Plugin, Cordova, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare var cordova: any;
@@ -17,9 +17,16 @@ declare var cordova: any;
  *
  * ...
  *
- * this.jinsMeme.setAppClientID(appClientId: string, clientSecret: string)
- *   .then(this.jinsMeme.startScan())
- *   .catch(console.log('jinsMeme.setAppClientID authentication error!'));
+ * this.jinsMeme.setAppClientID(appClientId: string, clientSecret: string).then(
+ *   // Bluetooth should be enabled and the JINS MEME powered on (blinking blue light)
+ *   this.jinsMeme.startScan().subscribe((meme_addr) => {
+ *     this.jinsMeme.connect(meme_addr).subscribe((connectResult) => {
+ *       this.memeService.startDataReport().subscribe((dataReport) => {
+ *         console.log(dataReport);
+ *       });
+ *     });
+ *   });
+ * .catch(console.log('jinsMeme.setAppClientID authentication error'));
  *
  * ```
  */
@@ -31,10 +38,11 @@ declare var cordova: any;
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class JinsMeme {
+export class JinsMeme extends IonicNativePlugin {
   /**
    * Authentication and authorization of App and SDK.
-   * Must call this method at first.
+   * Must call this method first.
+   * Sign up for an app ID (and get an app/client secret) at developers.jins.com
    *
    *@param {string} setAppClientID
    *@param {string} clientSecret

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 
@@ -28,7 +28,7 @@ import { Observable } from 'rxjs/Observable';
   platforms: ['Android', 'BlackBerry 10', 'iOS', 'Windows']
 })
 @Injectable()
-export class Keyboard {
+export class Keyboard extends IonicNativePlugin {
 
   /**
    * Hide the keyboard accessory bar with the next, previous and done buttons.

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

@@ -0,0 +1,94 @@
+import { Injectable } from '@angular/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
+
+/**
+ * @name Keychain
+ * @description
+ * Get and set data in the iOS Keychain
+ *
+ * Requires Cordova plugin: `cordova-plugin-ios-keychain`. For more info, please see the [Keychain plugin docs](https://github.com/driftyco/cordova-plugin-ios-keychain).
+ *
+ * @usage
+ * ```typescript
+ * import { Keychain } from '@ionic-native/keychain';
+ *
+ * constructor(private keychain: Keychain) { }
+ *
+ * ...
+ *
+ * this.keychain.set(key, value).then(() => {
+ *   this.keychain.get(key)
+ *     .then(value => console.log('Got value', value))
+ *     .catch(err => console.error('Error getting', err));
+ * })
+ * .catch(err => console.error('Error setting', err));
+ * ```
+ */
+@Plugin({
+  pluginName: 'Keychain',
+  plugin: 'cordova-plugin-ios-keychain',
+  pluginRef: 'window.Keychain',
+  repo: 'https://github.com/driftyco/cordova-plugin-ios-keychain/',
+  platforms: ['iOS']
+})
+@Injectable()
+export class Keychain extends IonicNativePlugin {
+
+  /**
+   * Retrieves a value for a key
+   *
+   * @param {string} key the key to retrieve
+   * @param {string} [touchIDMessage] the message to show underneath the TouchID prompt (if any)
+   */
+  @Cordova({
+    callbackOrder: 'reverse'
+  })
+  get(key: string, touchIDMessage?: string): Promise<any> { return; }
+
+  /**
+   * Sets a value for a key
+   *
+   * @param {string} key the key to set
+   * @param {string|number|boolean} value the value to set
+   * @param {boolean} [useTouchID] whether to store the value with security such that TouchID will be needed to grab it
+   */
+  @Cordova({
+    callbackOrder: 'reverse'
+  })
+  set(key: string, value: string|number|boolean, useTouchID?: boolean): Promise<any> { return; }
+
+  /**
+   * Gets a JSON value for a key
+   *
+   * @param {string} key the key to retrieve
+   * @param {string} touchIDMessage the message to show underneath the TouchID prompt (if any)
+   */
+  @Cordova({
+    callbackOrder: 'reverse'
+  })
+  getJson(key: string, touchIDMessage?: string): Promise<any> { return; }
+
+  /**
+   * Sets a JSON value for a key
+   *
+   * @param {string} key the key to set
+   * @param {any} obj value the value to set
+   * @param {boolean} [useTouchId] Wether to store the value with security such that TouchID will be needed to grab it
+   */
+  @Cordova({
+    callbackOrder: 'reverse'
+  })
+  setJson(key: string, obj: any, useTouchId?: boolean): Promise<any> { return; }
+
+  /**
+   * Removes a value for a key
+   *
+   * @param {string} key the key to remove
+   */
+  @Cordova({
+    callbackOrder: 'reverse'
+  })
+  remove(key: string): Promise<any> { return; }
+
+}

src/@ionic-native/plugins/launch-navigator/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface LaunchNavigatorOptions {
 
@@ -95,7 +95,7 @@ export interface LaunchNavigatorOptions {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class LaunchNavigator {
+export class LaunchNavigator extends IonicNativePlugin {
 
   /**
    * Launches navigator app

src/@ionic-native/plugins/launch-review/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Launch Review
@@ -30,7 +30,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class LaunchReview {
+export class LaunchReview extends IonicNativePlugin {
 
   /**
    * Launch store app using given app ID