pushwoosh-cordova-plugin 8.3.22 → 8.3.24

package/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.3.22
+cordova plugin add pushwoosh-cordova-plugin@8.3.24
 ```
 
 Using git:
 
 ```
-cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.22
+cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.24
 ```
 
 #### 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.3.22
+cordova plugin add pushwoosh-cordova-plugin@8.3.24
 ```
 
 ### Guide

package/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.3.22
+cordova plugin add pushwoosh-pgb-plugin@8.3.24
 ```
 
 ### Guide

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.22",
+  "version": "8.3.24",
   "description": "\n    This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).\n    ",
   "main":"www/PushNotification.js",
   "typings":"types/index.d.ts",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pushwoosh-cordova-plugin" version="8.3.22">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pushwoosh-cordova-plugin" version="8.3.24">
 
 	<name>Pushwoosh</name>
 
@@ -77,13 +77,13 @@
         <framework src="com.github.bumptech.glide:glide:4.10.0" />
         <framework src="org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.60" />
 
-        <framework src="com.pushwoosh:pushwoosh:6.7.3"/>
-		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.3"/>
-        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.3"/>
-		<framework src="com.pushwoosh:pushwoosh-badge:6.7.3"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.3"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.3"/>
-		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.3"/>
+        <framework src="com.pushwoosh:pushwoosh:6.7.4"/>
+		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.4"/>
+        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.4"/>
+		<framework src="com.pushwoosh:pushwoosh-badge:6.7.4"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.4"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.4"/>
+		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.4"/>
 	</platform>
 
 	<!-- ios -->

package/src/android/src/com/pushwoosh/plugin/pushnotifications/PushwooshNotificationServiceExtension.java

@@ -28,7 +28,7 @@ public class PushwooshNotificationServiceExtension extends NotificationServiceEx
 	@Override
 	protected boolean onMessageReceived(final PushMessage pushMessage) {
 		PushNotifications.messageReceived(pushMessage.toJson().toString());
-		return (!showForegroundPush && isAppOnForeground()) || super.onMessageReceived(pushMessage);
+		return (!showForegroundPush && !super.onMessageReceived(pushMessage) && isAppOnForeground());
 	}
 
 	@Override

package/src/ios/PushNotification.m

@@ -45,7 +45,7 @@
 
 @end
 
-@interface PushNotification() <PWMessagingDelegate>
+@interface PushNotification() <PWMessagingDelegate, UIApplicationDelegate>
 
 @property (nonatomic, retain) NSMutableDictionary *callbackIds;
 @property (nonatomic, retain) PushNotificationManager *pushManager;
@@ -55,6 +55,9 @@
 @property (nonatomic, assign) BOOL deviceReady;
 
 - (BOOL) application:(UIApplication *)application pwplugin_didRegisterUserNotificationSettings:(UIUserNotificationSettings *)settings;
+- (void) application:(UIApplication *)application pwplugin_didRegisterWithDeviceToken:(NSData *)deviceToken;
+- (void) application:(UIApplication *)application pwplugin_didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler;
+- (void) application:(UIApplication *)application pwplugin_didFailToRegisterForRemoteNotificationsWithError:(NSError *)error;
 
 @end
 
@@ -827,6 +830,30 @@ API_AVAILABLE(ios(10.0)) {
     }
 }
 
+void pwplugin_didReceiveRemoteNotification(id self, SEL _cmd, UIApplication * application, NSDictionary * userInfo, void (^completionHandler)(UIBackgroundFetchResult)) {
+    if ([self respondsToSelector:@selector(application:pwplugin_didReceiveRemoteNotification:fetchCompletionHandler:)]) {
+        [self application:application pwplugin_didReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler];
+    }
+    
+    [[Pushwoosh sharedInstance] handlePushReceived:userInfo];
+}
+
+void pwplugin_didRegisterWithDeviceToken(id self, SEL _cmd, id application, NSData *deviceToken) {
+    if ([self respondsToSelector:@selector(application: pwplugin_didRegisterWithDeviceToken:)]) {
+        [self application:application pwplugin_didRegisterWithDeviceToken:deviceToken];
+    }
+    
+    [[Pushwoosh sharedInstance] handlePushRegistration:deviceToken];
+}
+
+void pwplugin_didFailToRegisterForRemoteNotificationsWithError(id self, SEL _cmd, UIApplication *application, NSError *error) {
+    if ([self respondsToSelector:@selector(application:pwplugin_didFailToRegisterForRemoteNotificationsWithError:)]) {
+        [self application:application pwplugin_didFailToRegisterForRemoteNotificationsWithError:error];
+    }
+    
+    [[Pushwoosh sharedInstance] handlePushRegistrationFailure:error];
+}
+
 BOOL pwplugin_didRegisterUserNotificationSettings(id self, SEL _cmd, id application, id notificationSettings) {
 	PushNotification *pushHandler = pw_PushNotificationPlugin;
 	
@@ -876,6 +903,9 @@ BOOL pwplugin_didRegisterUserNotificationSettings(id self, SEL _cmd, id applicat
 	appDelegateClass = [delegate class];
 	
 	pushwoosh_swizzle([delegate class], @selector(application:didRegisterUserNotificationSettings:), @selector(application:pwplugin_didRegisterUserNotificationSettings:), (IMP)pwplugin_didRegisterUserNotificationSettings, "v@:::");
+    pushwoosh_swizzle([delegate class], @selector(application:didRegisterForRemoteNotificationsWithDeviceToken:), @selector(application:pwplugin_didRegisterWithDeviceToken:), (IMP)pwplugin_didRegisterWithDeviceToken, "v@:::");
+    pushwoosh_swizzle([delegate class], @selector(application:didFailToRegisterForRemoteNotificationsWithError:), @selector(application:pwplugin_didFailToRegisterForRemoteNotificationsWithError:), (IMP)pwplugin_didFailToRegisterForRemoteNotificationsWithError, "v@:::");
+    pushwoosh_swizzle([delegate class], @selector(application:didReceiveRemoteNotification:fetchCompletionHandler:), @selector(application:pwplugin_didReceiveRemoteNotification:fetchCompletionHandler:), (IMP)pwplugin_didReceiveRemoteNotification, "v@::::");
 }
 
 - (NSDictionary*)inboxMessageToDictionary:(NSObject<PWInboxMessageProtocol>*) message {