pushwoosh-react-native-plugin 6.1.25 → 6.1.26

package/.github/ISSUE_TEMPLATE/bug_report.yml

@@ -58,6 +58,7 @@ body:
       label: Your Pushwoosh React Native Plugin version
       description: Your React Native Plugin version which was integrated to the app. You may find it on the [releases page](https://github.com/Pushwoosh/pushwoosh-react-native-plugin/releases)
       options:
+        - 6.1.26
         - 6.1.25
         - 6.1.23
         - 6.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.25",
+  "version": "6.1.26",
   "description": "This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).",
   "main": "index.js",
   "types": "index.d.ts",

package/pushwoosh-react-native-plugin.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "pushwoosh-react-native-plugin"
-  s.version          = "6.1.25"
+  s.version          = "6.1.26"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'

package/src/android/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 ext {
-    pushwoosh = "6.7.0"
+    pushwoosh = "6.7.1"
 }
 
 dependencies {

package/src/ios/PushwooshPlugin/Pushwoosh.m

@@ -13,6 +13,7 @@
 #import <React/RCTConvert.h>
 
 #import <UserNotifications/UserNotifications.h>
+#import <Pushwoosh/PushNotificationManager.h>
 
 static id objectOrNull(id object) {
     if (object) {
@@ -33,6 +34,15 @@ static NSString * const kPushReceivedJSEvent = @"pushReceived";
 
 @implementation PushwooshPlugin
 
+API_AVAILABLE(ios(10))
+__weak id<UNUserNotificationCenterDelegate> _originalNotificationCenterDelegate;
+API_AVAILABLE(ios(10))
+  struct {
+    unsigned int willPresentNotification : 1;
+    unsigned int didReceiveNotificationResponse : 1;
+    unsigned int openSettingsForNotification : 1;
+  } _originalNotificationCenterDelegateResponds;
+
 #pragma mark - Pushwoosh RCTBridgeModule
 
 RCT_EXPORT_MODULE(Pushwoosh);
@@ -64,7 +74,28 @@ RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)suc
 
     // We set Pushwoosh UNUserNotificationCenter delegate unless CUSTOM is specified in the config
     if(![notificationHandling isEqualToString:@"CUSTOM"]) {
-        [UNUserNotificationCenter currentNotificationCenter].delegate = [PushNotificationManager pushManager].notificationCenterDelegate;
+        if (@available(iOS 10, *)) {
+
+            UNUserNotificationCenter *notificationCenter = [UNUserNotificationCenter currentNotificationCenter];
+            
+            if (notificationCenter.delegate != nil) {
+                _originalNotificationCenterDelegate = notificationCenter.delegate;
+                _originalNotificationCenterDelegateResponds.openSettingsForNotification =
+                (unsigned int)[_originalNotificationCenterDelegate
+                               respondsToSelector:@selector(userNotificationCenter:openSettingsForNotification:)];
+                _originalNotificationCenterDelegateResponds.willPresentNotification =
+                (unsigned int)[_originalNotificationCenterDelegate
+                               respondsToSelector:@selector(userNotificationCenter:
+                                                            willPresentNotification:withCompletionHandler:)];
+                _originalNotificationCenterDelegateResponds.didReceiveNotificationResponse =
+                (unsigned int)[_originalNotificationCenterDelegate
+                               respondsToSelector:@selector(userNotificationCenter:
+                                                            didReceiveNotificationResponse:withCompletionHandler:)];
+            }
+            
+            __strong PushwooshPlugin<UNUserNotificationCenterDelegate> *strongSelf = (PushwooshPlugin<UNUserNotificationCenterDelegate> *)self;
+            notificationCenter.delegate = (id<UNUserNotificationCenterDelegate>)strongSelf;
+        }
     }
 
     if (success) {
@@ -300,6 +331,119 @@ RCT_EXPORT_METHOD(performAction:(NSString*)code) {
     [PWInbox performActionForMessageWithCode:code];
 }
 
+#pragma mark - UNUserNotificationCenter Delegate Methods
+#pragma mark -
+
+#pragma mark - UNUserNotificationCenter Delegate Methods
+#pragma mark -
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+       willPresentNotification:(UNNotification *)notification
+         withCompletionHandler:
+(void (^)(UNNotificationPresentationOptions options))completionHandler
+API_AVAILABLE(ios(10.0)) {
+    
+    if ([self isRemoteNotification:notification] && [PWMessage isPushwooshMessage:notification.request.content.userInfo]) {
+        UNMutableNotificationContent *content = notification.request.content.mutableCopy;
+        
+        NSMutableDictionary *userInfo = content.userInfo.mutableCopy;
+        userInfo[@"pw_push"] = @(YES);
+        
+        content.userInfo = userInfo;
+        
+        //newsstand push
+        if (![self isContentAvailablePush:userInfo]) {
+            [[PWEventDispatcher sharedDispatcher] dispatchEvent:kPushReceivedEvent withArgs:@[ objectOrNull(userInfo) ]];
+            
+            [self sendJSEvent:kPushReceivedJSEvent withArgs:userInfo];
+        }
+        
+        completionHandler(UNNotificationPresentationOptionNone);
+    } else if ([PushNotificationManager pushManager].showPushnotificationAlert || [notification.request.content.userInfo objectForKey:@"pw_push"] == nil) {
+        completionHandler(UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionAlert | UNNotificationPresentationOptionSound);
+    } else {
+        completionHandler(UNNotificationPresentationOptionNone);
+    }
+    
+    if (_originalNotificationCenterDelegate != nil &&
+        _originalNotificationCenterDelegateResponds.willPresentNotification) {
+        [_originalNotificationCenterDelegate userNotificationCenter:center
+                                            willPresentNotification:notification
+                                              withCompletionHandler:completionHandler];
+    }
+}
+
+- (BOOL)isContentAvailablePush:(NSDictionary *)userInfo {
+    NSDictionary *apsDict = userInfo[@"aps"];
+    return apsDict[@"content-available"] != nil;
+}
+
+- (NSDictionary *)pushPayloadFromContent:(UNNotificationContent *)content {
+    return [[content.userInfo objectForKey:@"pw_push"] isKindOfClass:[NSDictionary class]] ? [content.userInfo objectForKey:@"pw_push"] : content.userInfo;
+}
+
+- (BOOL)isRemoteNotification:(UNNotification *)notification {
+    return [notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]];
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+didReceiveNotificationResponse:(UNNotificationResponse *)response
+         withCompletionHandler:(void (^)(void))completionHandler
+API_AVAILABLE(ios(10.0)) {
+    dispatch_block_t handlePushAcceptanceBlock = ^{
+        if (![response.actionIdentifier isEqualToString:UNNotificationDismissActionIdentifier]) {
+            if (![response.actionIdentifier isEqualToString:UNNotificationDefaultActionIdentifier] && [[PushNotificationManager pushManager].delegate respondsToSelector:@selector(onActionIdentifierReceived:withNotification:)]) {
+                [[PushNotificationManager pushManager].delegate onActionIdentifierReceived:response.actionIdentifier withNotification:[self pushPayloadFromContent:response.notification.request.content]];
+            }
+
+            [[PWEventDispatcher sharedDispatcher] dispatchEvent:kPushOpenEvent withArgs:@[ objectOrNull(response.notification.request.content.userInfo) ]];
+            
+            [self sendJSEvent:kPushOpenJSEvent withArgs:response.notification.request.content.userInfo];
+        }
+    };
+    
+    if ([self isRemoteNotification:response.notification]  && [PWMessage isPushwooshMessage:response.notification.request.content.userInfo]) {
+        if (![self isContentAvailablePush:response.notification.request.content.userInfo]) {
+            [[PWEventDispatcher sharedDispatcher] dispatchEvent:kPushOpenEvent withArgs:@[ objectOrNull(response.notification.request.content.userInfo) ]];
+            
+            [self sendJSEvent:kPushOpenJSEvent withArgs:response.notification.request.content.userInfo];
+        }
+        
+        handlePushAcceptanceBlock();
+    } else if ([response.notification.request.content.userInfo objectForKey:@"pw_push"]) {
+        handlePushAcceptanceBlock();
+    }
+
+    if (_originalNotificationCenterDelegate != nil &&
+        _originalNotificationCenterDelegateResponds.didReceiveNotificationResponse) {
+        [_originalNotificationCenterDelegate userNotificationCenter:center
+                                     didReceiveNotificationResponse:response
+                                              withCompletionHandler:completionHandler];
+    } else {
+        completionHandler();
+    }
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+   openSettingsForNotification:(nullable UNNotification *)notification
+API_AVAILABLE(ios(10.0)) {
+    if ([[PushNotificationManager pushManager].delegate respondsToSelector:@selector(pushManager:openSettingsForNotification:)]) {
+        #pragma clang diagnostic push
+        #pragma clang diagnostic ignored "-Wpartial-availability"
+        [[PushNotificationManager pushManager].delegate pushManager:[PushNotificationManager pushManager] openSettingsForNotification:notification];
+        #pragma clang diagnostic pop
+    }
+
+    if (_originalNotificationCenterDelegate != nil &&
+        _originalNotificationCenterDelegateResponds.openSettingsForNotification) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+        [_originalNotificationCenterDelegate userNotificationCenter:center
+                                        openSettingsForNotification:notification];
+#pragma clang diagnostic pop
+    }
+}
+
 - (NSDictionary*)inboxMessageToDictionary:(NSObject<PWInboxMessageProtocol>*) message {
     NSMutableDictionary* dictionary = [[NSMutableDictionary alloc] init];
     [dictionary setValue:@(message.type) forKey:@"type"];
@@ -581,18 +725,6 @@ RCT_EXPORT_METHOD(enableHuaweiPushNotifications) {
     [[PWEventDispatcher sharedDispatcher] dispatchEvent:kRegistrationErrorEvent withArgs:@[ objectOrNull([error localizedDescription]) ]];
 }
 
-- (void)onPushReceived:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
-    [[PWEventDispatcher sharedDispatcher] dispatchEvent:kPushReceivedEvent withArgs:@[ objectOrNull(pushNotification) ]];
-    
-    [self sendJSEvent:kPushReceivedJSEvent withArgs:pushNotification];
-}
-
-- (void)onPushAccepted:(PushNotificationManager *)manager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
-    [[PWEventDispatcher sharedDispatcher] dispatchEvent:kPushOpenEvent withArgs:@[ objectOrNull(pushNotification) ]];
-    
-    [self sendJSEvent:kPushOpenJSEvent withArgs:pushNotification];
-}
-
 #pragma mark - RCTEventEmitter
 
 - (void)sendJSEvent:(NSString*)event withArgs:(NSDictionary*)args {