Merge branch 'master' of github.com:driftyco/ionic-native

This commit is contained in:
Ibby Hadeed 2017-03-29 19:11:01 -04:00
commit 612cb963e1
3 changed files with 33 additions and 5 deletions

View File

@ -70,7 +70,7 @@ export interface AdMobFreeRewardVideoConfig {
* *
* @usage * @usage
* ``` * ```
* import { AdMobFree, AdMobFreeBannerConfig } from 'ionic-native'; * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free';
* *
* *
* constructor(private admobFree: AdMobFree) { } * constructor(private admobFree: AdMobFree) { }

View File

@ -17,9 +17,16 @@ declare var cordova: any;
* *
* ... * ...
* *
* this.jinsMeme.setAppClientID(appClientId: string, clientSecret: string) * this.jinsMeme.setAppClientID(appClientId: string, clientSecret: string).then(
* .then(this.jinsMeme.startScan()) * // Bluetooth should be enabled and the JINS MEME powered on (blinking blue light)
* .catch(console.log('jinsMeme.setAppClientID authentication error!')); * 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'));
* *
* ``` * ```
*/ */
@ -34,7 +41,8 @@ declare var cordova: any;
export class JinsMeme { export class JinsMeme {
/** /**
* Authentication and authorization of App and SDK. * 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} setAppClientID
*@param {string} clientSecret *@param {string} clientSecret

View File

@ -41,6 +41,26 @@ export class SecureStorageObject {
}) })
remove(reference: string): Promise<any> { return; } remove(reference: string): Promise<any> { return; }
/**
* Get all references from the storage.
* @returns {Promise<any>}
*/
@CordovaInstance({
callbackOrder: 'reverse'
})
keys(): Promise<any> { return; }
/**
* Clear all references from the storage.
* @returns {Promise<any>}
*/
@CordovaInstance({
callbackOrder: 'reverse'
})
clear(): Promise<any> { return; }
} }
/** /**