Release 2.3.6

Author: pushwoosh

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -58,6 +58,7 @@ body:
       label: Your Pushwoosh Flutter plugin version
       description: Your version of the Flutter plugin integrated into the application. You may find it on the [releases page](https://github.com/Pushwoosh/pushwoosh-flutter/releases)
       options:
+        - 2.3.6
         - 2.3.5
         - 2.3.4
         - 2.3.3

README.md

@@ -15,7 +15,7 @@ Pushwoosh Flutter Plugin
 
 ```yaml
 dependencies:
-  pushwoosh_flutter: '^2.3.5'
+  pushwoosh_flutter: '^2.3.6'
 ```
 
 2\. Configure Firebase Android project in [Firebase console](https://console.firebase.google.com).

Source/pushwoosh/CHANGELOG.md

@@ -394,3 +394,8 @@
 ## 2.3.5
 ### Added
 * ```setEmail```, ```setEmails```, ```setUserEmails``` methods added
+
+## 2.3.6
+### Fixed
+* Correctly implemented swizzling for ```application:didReceiveRemoteNotification:fetchCompletionHandler:``` method.
+

Source/pushwoosh/README.md

@@ -4,7 +4,7 @@
 
 ```yaml
 dependencies:
-  pushwoosh_flutter: '^2.3.5'
+  pushwoosh_flutter: '^2.3.6'
 ```
 
 2) Configure Firebase Android project in [Firebase console](https://console.firebase.google.com).

Source/pushwoosh/ios/Classes/PushwooshPlugin.m

@@ -10,6 +10,8 @@
 
 #define kPushwooshPluginImplementationInfoPlistKey @"Pushwoosh_PLUGIN_NOTIFICATION_HANDLER"
 
+static IMP pw_original_didReceiveRemoteNotification_Imp;
+
 @interface NSError (FlutterError)
 
 @property(readonly, nonatomic) FlutterError *flutterError;
@@ -36,24 +38,8 @@ @interface PushwooshPlugin () <PushNotificationDelegate>
 @property (nonatomic) NSString *cachedDeepLink;
 @property (nonatomic) NSString *lastPushwooshHash;
 
-- (void) application:(UIApplication *)application pwplugin_didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler;
-
 @end
 
-void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, const char * signature) {
-    Method method = nil;
-    method = class_getInstanceMethod(class, fromChange);
-    
-    if (method) {
-        //method exists add a new method and swap with original
-        class_addMethod(class, toChange, impl, signature);
-        method_exchangeImplementations(class_getInstanceMethod(class, fromChange), class_getInstanceMethod(class, toChange));
-    } else {
-        //just add as orignal method
-        class_addMethod(class, fromChange, impl, signature);
-    }
-}
-
 @implementation PushwooshPlugin {
     API_AVAILABLE(ios(10))
     __weak id<UNUserNotificationCenterDelegate> _originalNotificationCenterDelegate;
@@ -121,7 +107,15 @@ + (void) swizzleNotificationSettingsHandler {
         return;
     }
 
-    pushwoosh_swizzle([self class], @selector(application:didReceiveRemoteNotification:fetchCompletionHandler:), @selector(application:pwplugin_didReceiveRemoteNotification:fetchCompletionHandler:), (IMP)pwplugin_didReceiveRemoteNotification, "v@::::");
+    Class delegateClass = [delegate class];
+    Method originalMethod = class_getInstanceMethod(delegateClass, @selector(application:didReceiveRemoteNotification:fetchCompletionHandler:));
+    pw_original_didReceiveRemoteNotification_Imp = method_setImplementation(originalMethod, (IMP)_replacement_didReceiveRemoteNotification);
+}
+
+void _replacement_didReceiveRemoteNotification(id self, SEL _cmd, UIApplication * application, NSDictionary * userInfo, void (^completionHandler)(UIBackgroundFetchResult)) {
+    ((void(*)(id, SEL, UIApplication *, NSDictionary *, void(^)(UIBackgroundFetchResult)))pw_original_didReceiveRemoteNotification_Imp)(self, _cmd, application, userInfo, completionHandler);
+
+    [[PushNotificationManager pushManager] handlePushReceived:userInfo];
 }
 
 #pragma mark - FlutterPlugin
@@ -285,14 +279,6 @@ + (BOOL)isSystemVersionGreaterOrEqualTo:(NSString *)systemVersion {
     return ([[[UIDevice currentDevice] systemVersion] compare:systemVersion options:NSNumericSearch] != NSOrderedAscending);
 }
 
-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];
-}
-
 #pragma mark - UNUserNotificationCenter Delegate Methods
 #pragma mark -
 

Source/pushwoosh/ios/pushwoosh_flutter.podspec

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'pushwoosh_flutter'
-  s.version          = '2.3.5'
+  s.version          = '2.3.6'
   s.summary          = 'Pushwoosh Flutter plugin'
   s.homepage         = 'https://pushwoosh.com'
   s.license          = { :file => '../LICENSE' }

Source/pushwoosh/pubspec.yaml

@@ -1,6 +1,6 @@
 name: pushwoosh_flutter
 description: This plugin allows you to receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).
-version: 2.3.5
+version: 2.3.6
 homepage: https://www.pushwoosh.com/
 
 dependencies:

Source/pushwoosh_geozones/README.md

@@ -4,7 +4,7 @@ Install the library from pub:
 
 ```yaml
 dependencies:
-pushwoosh_geozones: '^2.3.5'
+pushwoosh_geozones: '^2.3.6'
 ```
 
 ## Usage

Source/pushwoosh_geozones/ios/pushwoosh_geozones.podspec

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'pushwoosh_geozones'
-  s.version          = '2.3.5'
+  s.version          = '2.3.6'
   s.summary          = 'Pushwoosh Geozones Flutter plugin'
   s.homepage         = 'http://pushwoosh.com'
   s.license          = { :file => '../LICENSE' }

Source/pushwoosh_geozones/pubspec.yaml

@@ -1,12 +1,12 @@
 name: pushwoosh_geozones
 description: This plugin enables Pushwoosh Geozones feature.
-version: 2.3.5
+version: 2.3.6
 homepage: https://www.pushwoosh.com/v1.0/docs/geozones
 
 dependencies:
   flutter:
     sdk: flutter
-  pushwoosh_flutter: ^2.3.5
+  pushwoosh_flutter: ^2.3.6
 
 environment:
   sdk: '>=2.12.0 <4.0.0'

Source/pushwoosh_inbox/README.md

@@ -4,7 +4,7 @@ Install the library from pub:
 
 ```yaml
 dependencies:
-pushwoosh_inbox: '^2.3.5'
+pushwoosh_inbox: '^2.3.6'
 ```
 
 ## Usage

Source/pushwoosh_inbox/ios/pushwoosh_inbox.podspec

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'pushwoosh_inbox'
-  s.version          = '2.3.5'
+  s.version          = '2.3.6'
   s.summary          = 'Pushwoosh Inbox Flutter plugin'
   s.homepage         = 'http://pushwoosh.com'
   s.license          = { :file => '../LICENSE' }

Source/pushwoosh_inbox/pubspec.yaml

@@ -1,12 +1,12 @@
 name: pushwoosh_inbox
 description: This plugin enables Pushwoosh Inbox feature.
-version: 2.3.5
+version: 2.3.6
 homepage: https://www.pushwoosh.com/v1.0/docs/message-inbox
 
 dependencies:
   flutter:
     sdk: flutter
-  pushwoosh_flutter: ^2.3.5
+  pushwoosh_flutter: ^2.3.6
 
 environment:
   sdk: '>=2.12.0 <4.0.0'