diff --git a/README.md b/README.md index d5d907cd..18642bb2 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,13 @@ Cross-Platform push notifications by Pushwoosh for Cordova / PhoneGap Using npm (requires cordova 7.0+): ``` -cordova plugin add pushwoosh-cordova-plugin@8.0.0 +cordova plugin add pushwoosh-cordova-plugin@8.1.0 ``` Using git: ``` -cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.0.0 +cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.1.0 ``` #### Phonegap @@ -28,7 +28,7 @@ cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8. Using npm (requires phonegap 7.1+): ``` -cordova plugin add pushwoosh-cordova-plugin@8.0.0 +cordova plugin add pushwoosh-cordova-plugin@8.1.0 ``` ### Guide diff --git a/README_PGB.md b/README_PGB.md index 86284a79..8abf7fb0 100644 --- a/README_PGB.md +++ b/README_PGB.md @@ -14,7 +14,7 @@ Cross-Platform push notifications by Pushwoosh for PhoneGap Using npm (requires cordova 5.0+): ``` -cordova plugin add pushwoosh-pgb-plugin@8.0.0 +cordova plugin add pushwoosh-pgb-plugin@8.1.0 ``` ### Guide diff --git a/package.json b/package.json index 1eab17ee..98d0a7ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pushwoosh-cordova-plugin", - "version": "8.0.0", + "version": "8.1.0", "description": "\n This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).\n ", "cordova": { "id": "pushwoosh-cordova-plugin", diff --git a/plugin.xml b/plugin.xml index c92d50a3..1c190433 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,5 +1,5 @@ - + Pushwoosh @@ -65,12 +65,12 @@ - - - - - - + + + + + + diff --git a/src/ios/Pushwoosh.framework/Versions/A/Headers/PWInAppManager.h b/src/ios/Pushwoosh.framework/Versions/A/Headers/PWInAppManager.h index d4b11b8c..18e5b024 100644 --- a/src/ios/Pushwoosh.framework/Versions/A/Headers/PWInAppManager.h +++ b/src/ios/Pushwoosh.framework/Versions/A/Headers/PWInAppManager.h @@ -103,6 +103,29 @@ */ - (void)setUserId:(NSString *)userId; +/** + Set User indentifier. This could be Facebook ID, username or email, or any other user ID. + This allows data and events to be matched across multiple user devices. + If setUser succeeds competion is called with nil argument. If setUser fails completion is called with error. + */ +- (void)setUserId:(NSString *)userId completion:(void(^)(NSError * error))completion; + +/** + Set User indentifier. This could be Facebook ID, username or email, or any other user ID. + This allows data and events to be matched across multiple user devices. + + @param userId user identifier + @param emails user's emails array + */ +- (void)setUser:(NSString *)userId emails:(NSArray *)emails completion:(void(^)(NSError * error))completion; + +/** + Register emails list associated to the current user. + + @param emails user's emails array + */ +- (void)setEmails:(NSArray *)emails completion:(void(^)(NSError * error))completion; + /** Move all events from oldUserId to newUserId if doMerge is true. If doMerge is false all events for oldUserId are removed. @@ -140,6 +163,12 @@ */ - (void)addJavascriptInterface:(NSObject*)interface withName:(NSString*)name; +/** + Updates In-App messages storage on a device + */ + +- (void)reloadInAppsWithCompletion: (void (^)(NSError *error))completion; + #endif @end diff --git a/src/ios/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h b/src/ios/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h index 03d24238..6fe3df24 100644 --- a/src/ios/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h +++ b/src/ios/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h @@ -81,6 +81,14 @@ typedef void (^PushwooshErrorHandler)(NSError *error); */ - (void)onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification DEPRECATED_ATTRIBUTE; +/** + Tells the delegate that a custom action was triggered when opening a notification. + + @param identifier NSString containing an ID of a clicked button. This ID is set by a user when creating a category in the Pushwoosh Control Panel + @param notification NSDictionary with push payload. +*/ +- (void)onActionIdentifierReceived:(NSString *)identifier withNotification:(NSDictionary *)notification; + /** Tells the delegate that the user has pressed on the push notification banner. diff --git a/src/ios/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h b/src/ios/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h index 634b6226..65e258bb 100644 --- a/src/ios/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h +++ b/src/ios/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h @@ -19,7 +19,7 @@ #endif -#define PUSHWOOSH_VERSION @"6.0.6" +#define PUSHWOOSH_VERSION @"6.1.1" @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy; @@ -238,6 +238,10 @@ Unregisters from push notifications. */ - (void)setTags:(NSDictionary *)tags completion:(void (^)(NSError *error))completion; +- (void)setEmailTags:(NSDictionary *)tags forEmail:(NSString *)email; + +- (void)setEmailTags:(NSDictionary *)tags forEmail:(NSString *)email completion:(void(^)(NSError *error))completion; + /** Get tags from server. Calls delegate method if exists and handler (block). @@ -343,9 +347,89 @@ Unregisters from push notifications. /** Set User indentifier. This could be Facebook ID, username or email, or any other user ID. This allows data and events to be matched across multiple user devices. + If setUserId succeeds competion is called with nil argument. If setUserId fails completion is called with error. + + @param userId user identifier + */ +- (void)setUserId:(NSString *)userId completion:(void(^)(NSError * error))completion; + +/** + Set User indentifier. This could be Facebook ID, username or email, or any other user ID. + This allows data and events to be matched across multiple user devices. + + @param userId user identifier */ - (void)setUserId:(NSString *)userId; +/** + Set User indentifier. This could be Facebook ID, username or email, or any other user ID. + This allows data and events to be matched across multiple user devices. + If setUser succeeds competion is called with nil argument. If setUser fails completion is called with error. + + @param userId user identifier + @param emails user's emails array + */ +- (void)setUser:(NSString *)userId emails:(NSArray *)emails completion:(void(^)(NSError * error))completion; + + +/** + Set User indentifier. This could be Facebook ID, username or email, or any other user ID. + This allows data and events to be matched across multiple user devices. + + @param userId user identifier + @param emails user's emails array + */ +- (void)setUser:(NSString *)userId emails:(NSArray *)emails; + +/** + Set User indentifier. This could be Facebook ID, username or email, or any other user ID. + This allows data and events to be matched across multiple user devices. + If setUser succeeds competion is called with nil argument. If setUser fails completion is called with error. + + @param userId user identifier + @param email user's email string + */ +- (void)setUser:(NSString *)userId email:(NSString *)email completion:(void(^)(NSError * error))completion; + +/** + Set User indentifier. This could be Facebook ID, username or email, or any other user ID. + This allows data and events to be matched across multiple user devices. + + @param userId user identifier + @param email user's email string + */ +- (void)setUser:(NSString *)userId email:(NSString *)email; + +/** + Register emails list associated to the current user. + If setEmails succeeds competion is called with nil argument. If setEmails fails completion is called with error. + + @param emails user's emails array + */ +- (void)setEmails:(NSArray *)emails completion:(void(^)(NSError * error))completion; + +/** + Register emails list associated to the current user. + + @param emails user's emails array + */ +- (void)setEmails:(NSArray *)emails; + +/** + Register email associated to the current user. Email should be a string and could not be null or empty. + If setEmail succeeds competion is called with nil argument. If setEmail fails completion is called with error. + + @param email user's email string + */ +- (void)setEmail:(NSString *)email completion:(void(^)(NSError * error))completion; + +/** + Register email associated to the current user. Email should be a string and could not be null or empty. + + @param email user's email string + */ +- (void)setEmail:(NSString *)email; + /** Move all events from oldUserId to newUserId if doMerge is true. If doMerge is false all events for oldUserId are removed. diff --git a/src/ios/Pushwoosh.framework/Versions/A/libPushwoosh.a b/src/ios/Pushwoosh.framework/Versions/A/libPushwoosh.a index 07260805..1a791466 100644 Binary files a/src/ios/Pushwoosh.framework/Versions/A/libPushwoosh.a and b/src/ios/Pushwoosh.framework/Versions/A/libPushwoosh.a differ