react-native-notify-kit 10.3.2 → 10.3.3

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "10.3.2";
+export declare const version = "10.3.3";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '10.3.2';
+export const version = '10.3.3';
 //# sourceMappingURL=version.js.map

package/ios/NotifeeCore/NotifeeCore+NSNotificationCenter.m

@@ -24,6 +24,10 @@
 + (void)topUpRollingTimestampTriggersWithCompletion:(void (^)(NSError *error))completion;
 @end
 
+@interface NotifeeCoreUNUserNotificationCenter (Rechain)
+- (void)rechainUserNotificationCenterDelegate;
+@end
+
 @implementation NotifeeCoreNSNotificationCenter
 
 + (instancetype)instance {
@@ -75,6 +79,8 @@
 }
 
 - (void)application_didBecomeActiveNotification:(nonnull NSNotification *)notification {
+  [[NotifeeCoreUNUserNotificationCenter instance] rechainUserNotificationCenterDelegate];
+
   [NotifeeCore topUpRollingTimestampTriggersWithCompletion:^(NSError *error) {
     if (error != nil) {
       NSLog(@"NotifeeCore: Failed to top up rolling timestamp triggers after app became active: %@",

package/ios/NotifeeCore/NotifeeCore+UNUserNotificationCenter.m

@@ -21,10 +21,63 @@
 #import "NotifeeCoreDelegateHolder.h"
 #import "NotifeeCoreUtil.h"
 
+typedef void (^NotifeeCorePresentationCompletionHandler)(UNNotificationPresentationOptions options);
+typedef void (^NotifeeCoreVoidCompletionHandler)(void);
+
 @interface NotifeeCore (RollingTimestampTopUp)
 + (void)topUpRollingTimestampTriggersWithCompletion:(void (^)(NSError *error))completion;
 @end
 
+@interface NotifeeCoreUNUserNotificationCenter ()
+- (void)refreshOriginalDelegateSelectorFlags;
+- (void)rechainUserNotificationCenterDelegate;
+@end
+
+static NotifeeCorePresentationCompletionHandler NotifeeCoreOneShotPresentationCompletionHandler(
+    NotifeeCorePresentationCompletionHandler completionHandler) {
+  NSObject *completionLock = [NSObject new];
+  __block BOOL completionCalled = NO;
+
+  NotifeeCorePresentationCompletionHandler oneShotCompletionHandler =
+      ^(UNNotificationPresentationOptions options) {
+        BOOL shouldCallCompletion = NO;
+        @synchronized(completionLock) {
+          if (!completionCalled) {
+            completionCalled = YES;
+            shouldCallCompletion = YES;
+          }
+        }
+
+        if (shouldCallCompletion && completionHandler != nil) {
+          completionHandler(options);
+        }
+      };
+
+  return [oneShotCompletionHandler copy];
+}
+
+static NotifeeCoreVoidCompletionHandler NotifeeCoreOneShotVoidCompletionHandler(
+    NotifeeCoreVoidCompletionHandler completionHandler) {
+  NSObject *completionLock = [NSObject new];
+  __block BOOL completionCalled = NO;
+
+  NotifeeCoreVoidCompletionHandler oneShotCompletionHandler = ^{
+    BOOL shouldCallCompletion = NO;
+    @synchronized(completionLock) {
+      if (!completionCalled) {
+        completionCalled = YES;
+        shouldCallCompletion = YES;
+      }
+    }
+
+    if (shouldCallCompletion && completionHandler != nil) {
+      completionHandler();
+    }
+  };
+
+  return [oneShotCompletionHandler copy];
+}
+
 @implementation NotifeeCoreUNUserNotificationCenter
 
 struct {
@@ -47,25 +100,41 @@ struct {
 }
 
 - (void)observe {
-  static dispatch_once_t once;
-  __weak NotifeeCoreUNUserNotificationCenter *weakSelf = self;
-  dispatch_once(&once, ^{
-    NotifeeCoreUNUserNotificationCenter *strongSelf = weakSelf;
-    UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-    if (center.delegate != nil) {
-      _originalDelegate = center.delegate;
-      originalUNCDelegateRespondsTo.openSettingsForNotification = (unsigned int)[_originalDelegate
-          respondsToSelector:@selector(userNotificationCenter:openSettingsForNotification:)];
-      originalUNCDelegateRespondsTo.willPresentNotification = (unsigned int)[_originalDelegate
+  [self rechainUserNotificationCenterDelegate];
+}
+
+- (void)refreshOriginalDelegateSelectorFlags {
+  id<UNUserNotificationCenterDelegate> originalDelegate = self.originalDelegate;
+
+  originalUNCDelegateRespondsTo.openSettingsForNotification =
+      originalDelegate != nil &&
+      [originalDelegate respondsToSelector:@selector(userNotificationCenter:
+                                                openSettingsForNotification:)];
+  originalUNCDelegateRespondsTo.willPresentNotification =
+      originalDelegate != nil &&
+      [originalDelegate respondsToSelector:@selector
+                        (userNotificationCenter:willPresentNotification:withCompletionHandler:)];
+  originalUNCDelegateRespondsTo.didReceiveNotificationResponse =
+      originalDelegate != nil &&
+      [originalDelegate
           respondsToSelector:@selector(userNotificationCenter:
-                                      willPresentNotification:withCompletionHandler:)];
-      originalUNCDelegateRespondsTo.didReceiveNotificationResponse =
-          (unsigned int)[_originalDelegate
-              respondsToSelector:@selector(userNotificationCenter:
-                                     didReceiveNotificationResponse:withCompletionHandler:)];
+                                 didReceiveNotificationResponse:withCompletionHandler:)];
+}
+
+- (void)rechainUserNotificationCenterDelegate {
+  @synchronized(self) {
+    UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+    id<UNUserNotificationCenterDelegate> currentDelegate = center.delegate;
+
+    if (currentDelegate == self) {
+      [self refreshOriginalDelegateSelectorFlags];
+      return;
     }
-    center.delegate = strongSelf;
-  });
+
+    self.originalDelegate = currentDelegate;
+    [self refreshOriginalDelegateSelectorFlags];
+    center.delegate = self;
+  }
 }
 
 - (void)markInitialNotificationGathered {
@@ -176,9 +245,11 @@ struct {
     }
 
   } else if (_originalDelegate != nil && originalUNCDelegateRespondsTo.willPresentNotification) {
+    NotifeeCorePresentationCompletionHandler oneShotCompletionHandler =
+        NotifeeCoreOneShotPresentationCompletionHandler(completionHandler);
     [_originalDelegate userNotificationCenter:center
                       willPresentNotification:notification
-                        withCompletionHandler:completionHandler];
+                        withCompletionHandler:oneShotCompletionHandler];
   } else {
     // No original delegate captured and the notification is not Notifee-owned.
     // Returning UNNotificationPresentationOptionNone would silently drop the
@@ -214,9 +285,11 @@ struct {
       // Flag OFF: always forward to original delegate, never parse as Notifee
       if (_originalDelegate != nil &&
           originalUNCDelegateRespondsTo.didReceiveNotificationResponse) {
+        NotifeeCoreVoidCompletionHandler oneShotCompletionHandler =
+            NotifeeCoreOneShotVoidCompletionHandler(completionHandler);
         [_originalDelegate userNotificationCenter:center
                    didReceiveNotificationResponse:response
-                            withCompletionHandler:completionHandler];
+                            withCompletionHandler:oneShotCompletionHandler];
       } else {
         completionHandler();
       }
@@ -224,9 +297,11 @@ struct {
     }
     // Flag ON (default): existing behavior
     if (_originalDelegate != nil && originalUNCDelegateRespondsTo.didReceiveNotificationResponse) {
+      NotifeeCoreVoidCompletionHandler oneShotCompletionHandler =
+          NotifeeCoreOneShotVoidCompletionHandler(completionHandler);
       [_originalDelegate userNotificationCenter:center
                  didReceiveNotificationResponse:response
-                          withCompletionHandler:completionHandler];
+                          withCompletionHandler:oneShotCompletionHandler];
       return;
     } else {
       notifeeNotification =

package/ios/NotifeeCore/NotifeeCore.m

@@ -26,6 +26,10 @@
 #import "NotifeeCoreExtensionHelper.h"
 #import "NotifeeCoreUtil.h"
 
+@interface NotifeeCoreUNUserNotificationCenter (Rechain)
+- (void)rechainUserNotificationCenterDelegate;
+@end
+
 static NSString *const kNotifeeRollingPublicId = @"notifee_rolling_public_id";
 static NSString *const kNotifeeRollingOccurrenceMs = @"notifee_rolling_occurrence_ms";
 static NSString *const kNotifeeRollingInternalId = @"notifee_rolling_internal_id";
@@ -1140,6 +1144,8 @@ typedef NS_ENUM(NSInteger, NotifeeCoreRollingErrorCode) {
  * @param block notifeeMethodVoidBlock
  */
 + (void)displayNotification:(NSDictionary *)notification withBlock:(notifeeMethodVoidBlock)block {
+  [[NotifeeCoreUNUserNotificationCenter instance] rechainUserNotificationCenterDelegate];
+
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     UNMutableNotificationContent *content = [self buildNotificationContent:notification
                                                                withTrigger:nil];
@@ -1223,6 +1229,8 @@ typedef NS_ENUM(NSInteger, NotifeeCoreRollingErrorCode) {
 + (void)createTriggerNotification:(NSDictionary *)notification
                       withTrigger:(NSDictionary *)trigger
                         withBlock:(notifeeMethodVoidBlock)block {
+  [[NotifeeCoreUNUserNotificationCenter instance] rechainUserNotificationCenterDelegate];
+
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     UNMutableNotificationContent *content =
         [self triggerNotificationContentForNotification:notification trigger:trigger];
@@ -1543,6 +1551,8 @@ typedef NS_ENUM(NSInteger, NotifeeCoreRollingErrorCode) {
  */
 + (void)requestPermission:(NSDictionary *)permissions
                 withBlock:(notifeeMethodNSDictionaryBlock)block {
+  [[NotifeeCoreUNUserNotificationCenter instance] rechainUserNotificationCenterDelegate];
+
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
 
   UNAuthorizationOptions options = UNAuthorizationOptionNone;
@@ -1678,6 +1688,8 @@ typedef NS_ENUM(NSInteger, NotifeeCoreRollingErrorCode) {
 }
 
 + (void)getInitialNotification:(notifeeMethodNSDictionaryBlock)block {
+  [[NotifeeCoreUNUserNotificationCenter instance] rechainUserNotificationCenterDelegate];
+
   [NotifeeCoreUNUserNotificationCenter instance].initialNotificationBlock = block;
   [[NotifeeCoreUNUserNotificationCenter instance] getInitialNotification];
 }
@@ -1784,6 +1796,7 @@ typedef NS_ENUM(NSInteger, NotifeeCoreRollingErrorCode) {
     [NotifeeCoreUNUserNotificationCenter instance].shouldHandleRemoteNotifications =
         [config[@"ios"][@"handleRemoteNotifications"] boolValue];
   }
+  [[NotifeeCoreUNUserNotificationCenter instance] rechainUserNotificationCenterDelegate];
   block(nil);
 }
 

package/ios/RNNotifee/NotifeeApiModule.mm

@@ -18,6 +18,11 @@
 #import "NotifeeApiModule.h"
 #import <React/RCTUtils.h>
 #import <UIKit/UIKit.h>
+#import "NotifeeCore+UNUserNotificationCenter.h"
+
+@interface NotifeeCoreUNUserNotificationCenter (Rechain)
+- (void)rechainUserNotificationCenterDelegate;
+@end
 
 static NSString *kReactNativeNotifeeNotificationEvent = @"app.notifee.notification-event";
 static NSString *kReactNativeNotifeeNotificationBackgroundEvent =
@@ -56,6 +61,8 @@ RCT_EXPORT_MODULE();
 }
 
 - (void)startObserving {
+  [[NotifeeCoreUNUserNotificationCenter instance] rechainUserNotificationCenterDelegate];
+
   NSArray *eventsToFlush;
   @synchronized(self) {
     hasListeners = YES;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notify-kit",
-  "version": "10.3.2",
+  "version": "10.3.3",
   "author": "Marco Crupi",
   "description": "Maintained Notifee-compatible fork for React Native — advanced local notifications for Android & iOS.",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
     "build:watch": "tsc --watch",
     "test:server": "jest --config jest.config.server.js",
     "prepare": "yarn run build",
-    "prepack": "bash ../../scripts/prepack-cli.sh",
+    "prepack": "cd ../.. && bash build_ios_core.sh && bash scripts/verify-ios-core-generation.sh && bash scripts/prepack-cli.sh",
     "postpack": "rm -rf cli",
     "prepublishOnly": "cd ../.. && yarn run build:core",
     "format:android": "google-java-format --replace -i $(find . -type f -name \"*.java\" ! -path \"*/node_modules/*\" ! -path \"*/generated/*\")",

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '10.3.2';
+export const version = '10.3.3';