pushwoosh-react-native-plugin 6.1.32 → 6.1.34

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.34
         - 6.1.32
         - 6.1.31
         - 6.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.32",
+  "version": "6.1.34",
   "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.32"
+  s.version          = "6.1.34"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'
@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'React'
-  s.dependency 'PushwooshXCFramework'
+  s.dependency 'PushwooshXCFramework', '6.7.9'
   s.dependency 'PushwooshInboxUIXCFramework'
 end

package/src/android/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 ext {
-    pushwoosh = "6.7.10"
+    pushwoosh = "6.7.14"
 }
 
 dependencies {

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/PushwooshNotificationServiceExtension.java

@@ -17,7 +17,7 @@ public class PushwooshNotificationServiceExtension extends NotificationServiceEx
 			ApplicationInfo ai = getApplicationContext().getPackageManager().getApplicationInfo(packageName, PackageManager.GET_META_DATA);
 
 			if (ai.metaData != null) {
-				showForegroundPush = ai.metaData.getBoolean("PW_BROADCAST_PUSH", false) || ai.metaData.getBoolean("com.pushwoosh.foreground_push", false);
+				showForegroundPush = ai.metaData.getBoolean("PW_BROADCAST_PUSH", true) || ai.metaData.getBoolean("com.pushwoosh.foreground_push", true);
 			}
 		} catch (Exception e) {
 			PWLog.exception(e);

package/src/ios/PushwooshPlugin/Pushwoosh.h

@@ -8,15 +8,15 @@
 
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
-#import <Pushwoosh/Pushwoosh.h>
+#import <PushwooshFramework/PushwooshFramework.h>
 
-#if __has_include(<Pushwoosh/PushNotificationManager.h>)
-#import <Pushwoosh/PushNotificationManager.h>
-#import <Pushwoosh/PWInAppManager.h>
+#if __has_include(<PushwooshFramework/PushNotificationManager.h>)
+#import <PushwooshFramework/PushNotificationManager.h>
+#import <PushwooshFramework/PWInAppManager.h>
 #import <PushwooshInboxUI/PushwooshInboxUI.h>
-#import <Pushwoosh/PWGDPRManager.h>
-#import <Pushwoosh/PWInlineInAppView.h>
-#import <Pushwoosh/PWInbox.h>
+#import <PushwooshFramework/PWGDPRManager.h>
+#import <PushwooshFramework/PWInlineInAppView.h>
+#import <PushwooshFramework/PWInbox.h>
 #else
 #import "PushNotificationManager.h"
 #import "PWInAppManager.h"

package/src/ios/PushwooshPlugin/Pushwoosh.m

@@ -13,10 +13,12 @@
 #import <React/RCTConvert.h>
 
 #import <UserNotifications/UserNotifications.h>
-#import <Pushwoosh/PushNotificationManager.h>
+#import <PushwooshFramework/PushNotificationManager.h>
 
 #import <objc/runtime.h>
 
+#define kPushwooshPluginImplementationInfoPlistKey @"Pushwoosh_PLUGIN_NOTIFICATION_HANDLER"
+
 static id objectOrNull(id object) {
     if (object) {
         return object;
@@ -56,16 +58,18 @@ void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, cons
     }
 }
 
-@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;
+@implementation PushwooshPlugin {
+    NSString *lastPushwooshHash;
+    
+    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
 
@@ -75,6 +79,10 @@ RCT_EXPORT_MODULE(Pushwoosh);
     return dispatch_get_main_queue();
 }
 
++ (NSString *)getPluginImplementationInfoPlistKey {
+    return [[NSBundle mainBundle] objectForInfoDictionaryKey:kPushwooshPluginImplementationInfoPlistKey];
+}
+
 RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)error) {
     NSString *appCode = config[@"pw_appid"];
     NSString *notificationHandling = config[@"pw_notification_handling"];
@@ -100,35 +108,39 @@ 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"]) {
-        if (@available(iOS 10, *)) {
-            BOOL shouldReplaceDelegate = YES;
-
-            UNUserNotificationCenter *notificationCenter = [UNUserNotificationCenter currentNotificationCenter];
-
+        if (![PushwooshPlugin getPluginImplementationInfoPlistKey]) {
+            [UNUserNotificationCenter currentNotificationCenter].delegate = [PushNotificationManager pushManager].notificationCenterDelegate;
+        } else {
+            if (@available(iOS 10, *)) {
+                BOOL shouldReplaceDelegate = YES;
+                
+                UNUserNotificationCenter *notificationCenter = [UNUserNotificationCenter currentNotificationCenter];
+                
 #if !TARGET_OS_OSX
-            if ([notificationCenter.delegate conformsToProtocol:@protocol(PushNotificationDelegate)]) {
-                shouldReplaceDelegate = NO;
-            }
+                if ([notificationCenter.delegate conformsToProtocol:@protocol(PushNotificationDelegate)]) {
+                    shouldReplaceDelegate = NO;
+                }
 #endif
-            
-            if (notificationCenter.delegate != nil && shouldReplaceDelegate) {
-                _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:)];
-            }
-            
-            if (shouldReplaceDelegate) {
-                __strong PushwooshPlugin<UNUserNotificationCenterDelegate> *strongSelf = (PushwooshPlugin<UNUserNotificationCenterDelegate> *)self;
-                notificationCenter.delegate = (id<UNUserNotificationCenterDelegate>)strongSelf;
+                
+                if (notificationCenter.delegate != nil && shouldReplaceDelegate) {
+                    _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:)];
+                }
+                
+                if (shouldReplaceDelegate) {
+                    __strong PushwooshPlugin<UNUserNotificationCenterDelegate> *strongSelf = (PushwooshPlugin<UNUserNotificationCenterDelegate> *)self;
+                    notificationCenter.delegate = (id<UNUserNotificationCenterDelegate>)strongSelf;
+                }
             }
         }
     }
@@ -460,12 +472,37 @@ void pwplugin_didFailToRegisterForRemoteNotificationsWithError(id self, SEL _cmd
 (void (^)(UNNotificationPresentationOptions options))completionHandler
 API_AVAILABLE(ios(10.0)) {
     
-    if ([self isRemoteNotification:notification] && [PWMessage isPushwooshMessage:notification.request.content.userInfo]) {
-        completionHandler(UNNotificationPresentationOptionNone);
-    } else if ([PushNotificationManager pushManager].showPushnotificationAlert || [notification.request.content.userInfo objectForKey:@"pw_push"] == nil) {
-        completionHandler(UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionAlert | UNNotificationPresentationOptionSound);
-    } else {
-        completionHandler(UNNotificationPresentationOptionNone);
+    UNMutableNotificationContent *content = notification.request.content.mutableCopy;
+    BOOL isPushwooshMessage = [PWMessage isPushwooshMessage:notification.request.content.userInfo];
+    NSString *currentHash = content.userInfo[@"p"];
+    BOOL isNeedToImplementInPlugin = [[PushwooshPlugin getPluginImplementationInfoPlistKey] boolValue];
+
+    if (isPushwooshMessage && isNeedToImplementInPlugin && ![lastPushwooshHash isEqualToString:currentHash]) {
+        lastPushwooshHash = currentHash;
+
+        if ([PushNotificationManager pushManager].showPushnotificationAlert) {
+            completionHandler(UNNotificationPresentationOptionSound | UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionAlert);
+        } else {
+            [[PushNotificationManager pushManager] handlePushReceived:content.userInfo];
+        }
+        
+        [self sendJSEvent:kPushReceivedJSEvent withArgs:content.userInfo];
+    }
+        
+    if (_originalNotificationCenterDelegate != nil &&
+        _originalNotificationCenterDelegateResponds.willPresentNotification) {
+        
+        dispatch_block_t presentationBlock = ^{
+            [self->_originalNotificationCenterDelegate userNotificationCenter:center
+                                                willPresentNotification:notification
+                                                  withCompletionHandler:completionHandler];
+        };
+        
+        if (isPushwooshMessage) {
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.59 * NSEC_PER_SEC)), dispatch_get_main_queue(), presentationBlock);
+        } else {
+            presentationBlock();
+        }
     }
     
     if (_originalNotificationCenterDelegate != nil &&
@@ -493,6 +530,8 @@ API_AVAILABLE(ios(10.0)) {
 didReceiveNotificationResponse:(UNNotificationResponse *)response
          withCompletionHandler:(void (^)(void))completionHandler
 API_AVAILABLE(ios(10.0)) {
+    BOOL isNeedToImplementInPlugin = [[PushwooshPlugin getPluginImplementationInfoPlistKey] boolValue];
+
     dispatch_block_t handlePushAcceptanceBlock = ^{
         if (![response.actionIdentifier isEqualToString:UNNotificationDismissActionIdentifier]) {
             if (![response.actionIdentifier isEqualToString:UNNotificationDefaultActionIdentifier] && [[PushNotificationManager pushManager].delegate respondsToSelector:@selector(onActionIdentifierReceived:withNotification:)]) {
@@ -501,7 +540,13 @@ API_AVAILABLE(ios(10.0)) {
         }
     };
     
-    if ([self isRemoteNotification:response.notification]  && [PWMessage isPushwooshMessage:response.notification.request.content.userInfo]) {
+    if ([self isRemoteNotification:response.notification] && [PWMessage isPushwooshMessage:response.notification.request.content.userInfo]) {
+        NSDictionary *userInfo = response.notification.request.content.userInfo;
+
+        if (isNeedToImplementInPlugin) {
+            [[PushNotificationManager pushManager] handlePushAccepted:userInfo onStart:[self isOnStart:userInfo]];
+        }
+
         handlePushAcceptanceBlock();
     } else if ([response.notification.request.content.userInfo objectForKey:@"pw_push"]) {
         handlePushAcceptanceBlock();
@@ -517,6 +562,29 @@ API_AVAILABLE(ios(10.0)) {
     }
 }
 
+- (BOOL)isOnStart:(NSDictionary *)userInfo {
+    NSDictionary *pushStartDictionary = [self startPushInfoFromInfoDictionary:userInfo];
+    return pushStartDictionary != nil;
+}
+
+- (NSDictionary *)startPushInfoFromInfoDictionary:(NSDictionary *)userInfo {
+    //try as launchOptions dictionary
+    NSDictionary *pushDict = userInfo[UIApplicationLaunchOptionsRemoteNotificationKey];
+    if (pushDict == nil) {
+        id notification = userInfo[UIApplicationLaunchOptionsLocalNotificationKey];
+        
+        if (notification && [notification isKindOfClass:[UILocalNotification class]]) {
+            pushDict = [notification userInfo];
+            
+            if (pushDict[@"pw_push"] == nil) {
+                pushDict = nil;
+            }
+        }
+    }
+
+    return pushDict;
+}
+
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center
    openSettingsForNotification:(nullable UNNotification *)notification
 API_AVAILABLE(ios(10.0)) {

package/src/ios/PWAppDelegate.h

@@ -1,20 +0,0 @@
-//
-//  PWAppDelegate.h
-//  Pushwoosh SDK
-//  (c) Pushwoosh 2018
-//
-
-#if TARGET_OS_IPHONE
-
-#import <UIKit/UIKit.h>
-
-/*
- Base AppDelegate class for easier integration.
- */
-@interface PWAppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (nonatomic, strong) UIWindow *window;
-
-@end
-
-#endif

package/src/ios/PWGDPRManager.h

@@ -1,46 +0,0 @@
-//
-//  PWGDPRManager.h
-//  Pushwoosh SDK
-//  (c) Pushwoosh 2018
-//
-
-#import <Foundation/Foundation.h>
-
-/*
- `PWGDPRManager` class offers access to the singleton-instance of the manager responsible for channels management required by GDPR.
- */
-
-FOUNDATION_EXPORT NSString * const PWGDPRStatusDidChangeNotification;
-
-@interface PWGDPRManager : NSObject
-
-/**
-Indicates availability of the GDPR compliance solution.
-*/
-@property (nonatomic, readonly, getter=isAvailable) BOOL available;
-
-@property (nonatomic, readonly, getter=isCommunicationEnabled) BOOL communicationEnabled;
-
-@property (nonatomic, readonly, getter=isDeviceDataRemoved) BOOL deviceDataRemoved;
-
-+ (instancetype)sharedManager;
-
-/**
- Enable/disable all communication with Pushwoosh. Enabled by default.
- */
-- (void)setCommunicationEnabled:(BOOL)enabled completion:(void (^)(NSError *error))completion;
-
-/**
- Removes all device data from Pushwoosh and stops all interactions and communication permanently.
- */
-- (void)removeAllDeviceDataWithCompletion:(void (^)(NSError *error))completion;
-
-#if TARGET_OS_IOS || TARGET_OS_OSX
-
-- (void)showGDPRConsentUI;
-
-- (void)showGDPRDeletionUI;
-
-#endif
-
-@end

package/src/ios/PWIInboxStyle.h

@@ -1,122 +0,0 @@
-//
-//  PWIInboxStyle.h
-//  PushwooshInboxUI
-//
-//  Created by Pushwoosh on 01/11/2017.
-//  Copyright © 2017 Pushwoosh. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-typedef NSString * (^PWIDateFormatterBlock)(NSDate *date, NSObject *owner);
-
-//! This class is designed to customize the Inbox appearance
-@interface PWIInboxStyle : NSObject
-
-//! This block customizes the date formatting
-@property (nonatomic, readwrite) PWIDateFormatterBlock dateFormatterBlock;
-
-//! The default icon in the cell next to the message; if not specified, the app icon is used
-@property (nonatomic, readwrite) UIImage *defaultImageIcon;
-
-//! The default font
-@property (nonatomic, readwrite) UIFont *defaultFont;
-
-//! The default text color
-@property (nonatomic, readwrite) UIColor *defaultTextColor;
-
-//! The text color of a read notification
-@property (nonatomic, readwrite) UIColor *readTextColor;
-
-//! The default background color
-@property (nonatomic, readwrite) UIColor *backgroundColor;
-
-//! The default selection color
-@property (nonatomic, readwrite) UIColor *selectionColor;
-
-//! The appearance of the unread messages mark
-@property (nonatomic, readwrite) UIImage *unreadImage;
-
-//! The image which is displayed if an error occurs and the list of inbox messages is empty
-@property (nonatomic, readwrite) UIImage *listErrorImage;
-
-//! The error text which is displayed when an error occurs; cannot be localized
-@property (nonatomic, readwrite) NSString *listErrorMessage;
-
-//! The image which is displayed if the list of inbox messages is empty
-@property (nonatomic, readwrite) UIImage *listEmptyImage;
-
-//! The text which is displayed if the list of inbox messages is empty; cannot be localized
-@property (nonatomic, readwrite) NSString *listEmptyMessage;
-
-//! The accent color
-@property (nonatomic, readwrite) UIColor *accentColor;
-
-//! The color of message titles
-@property (nonatomic, readwrite) UIColor *titleColor;
-
-//! The title color for read notifications
-@property (nonatomic, readwrite) UIColor *readTitleColor;
-
-//! The color of messages descriptions
-@property (nonatomic, readwrite) UIColor *descriptionColor;
-
-//! The color of message dates
-@property (nonatomic, readwrite) UIColor *dateColor;
-
-//! The color of the separator
-@property (nonatomic, readwrite) UIColor *separatorColor;
-
-//! The font of message titles
-@property (nonatomic, readwrite) UIFont *titleFont;
-
-//! The font of message descriptions
-@property (nonatomic, readwrite) UIFont *descriptionFont;
-
-//! The font of message dates
-@property (nonatomic, readwrite) UIFont *dateFont;
-
-//! The default bar color
-@property (nonatomic, readwrite) UIColor *barBackgroundColor;
-
-//! The default back button color
-@property(nonatomic, readwrite) UIColor *barAccentColor;
-
-//! The default bar accent color
-@property (nonatomic, readwrite) UIColor *barTextColor;
-
-//! The default bar title text
-@property (nonatomic, readwrite) NSString *barTitle;
-
-/**
- The method returning the default style; all parameters might be changed
- 
- @retutn instance of default style
- */
-+ (instancetype)defaultStyle;
-
-/**
- This method updates the default style for PWInboxViewController
- 
- @param style the new default style for PWInboxViewController
- */
-+ (void)setupDefaultStyle:(PWIInboxStyle *)style;
-
-/**
- The method filling style's fields based on following parameters: icon, textColor, accentColor, date; all parameters might be changed
- */
-+ (instancetype)customStyleWithDefaultImageIcon:(UIImage *)icon
-                                      textColor:(UIColor *)textColor
-                                    accentColor:(UIColor *)accentColor
-                                           font:(UIFont *)font;
-/**
- The method filling style's fields based on following parameters: icon, textColor, accentColor, font, dateFormatterBlock; all parameters might be changed
- */
-+ (instancetype)customStyleWithDefaultImageIcon:(UIImage *)icon
-                                      textColor:(UIColor *)textColor
-                                    accentColor:(UIColor *)accentColor
-                                           font:(UIFont *)font
-                             dateFromatterBlock:(PWIDateFormatterBlock)dateFormatterBlock;
-                             
-@end

package/src/ios/PWIInboxUI.h

@@ -1,39 +0,0 @@
-//
-//  PWIInboxUI.h
-//  PushwooshInboxUI
-//
-//  Created by Pushwoosh on 01/11/2017.
-//  Copyright © 2017 Pushwoosh. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-@protocol PWInboxMessageProtocol;
-
-@interface PWIInboxViewController : UIViewController
-
-@property (nonatomic) void (^onMessageClickBlock)(id<PWInboxMessageProtocol> message);
-
-/**
- Reloads everything from scratch.
- */
-- (void)reloadData;
-- (instancetype)init NS_UNAVAILABLE;
-
-@end
-
-@class PWIInboxStyle;
-@interface PWIInboxUI : NSObject
-
-/**
- @return PWIInboxViewController with a specified style
- */
-+ (PWIInboxViewController *)createInboxControllerWithStyle:(PWIInboxStyle *)style;
-
-/**
- @return PWIInboxViewController with a specified style and height of table view
- */
-+ (PWIInboxViewController *)createInboxControllerWithStyle:(PWIInboxStyle *)style andContentHeight:(CGFloat)contentHeight;
-
-@end