react-native-notify-kit 10.3.1 → 10.3.3

package/cli/dist/templates/templates/NotificationService.swift.tmpl

@@ -23,13 +23,21 @@ private func requestedAttachmentURLs(from userInfo: [AnyHashable: Any]) -> [Stri
 class NotificationService: UNNotificationServiceExtension {
   var contentHandler: ((UNNotificationContent) -> Void)?
   var bestAttemptContent: UNMutableNotificationContent?
+  private let deliveryLock = NSLock()
+  private var didDeliver = false
 
   override func didReceive(
     _ request: UNNotificationRequest,
     withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void
   ) {
+    let mutableContent = request.content.mutableCopy() as? UNMutableNotificationContent
+
+    deliveryLock.lock()
+    didDeliver = false
     self.contentHandler = contentHandler
-    self.bestAttemptContent = request.content.mutableCopy() as? UNMutableNotificationContent
+    self.bestAttemptContent = mutableContent
+    deliveryLock.unlock()
+
     let requestedAttachmentUrls = requestedAttachmentURLs(from: request.content.userInfo)
 
     nseLog(
@@ -39,9 +47,9 @@ class NotificationService: UNNotificationServiceExtension {
         "urls=\(requestedAttachmentUrls.joined(separator: ","))"
     )
 
-    guard let bestAttemptContent = bestAttemptContent else {
+    guard let bestAttemptContent = mutableContent else {
       nseLog("mutableCopy failed for id=\(request.identifier); delivering original content")
-      contentHandler(request.content)
+      deliverOnce(request.content)
       return
     }
 
@@ -55,19 +63,38 @@ class NotificationService: UNNotificationServiceExtension {
             "deliveredAttachments=\(content.attachments.count) " +
             "identifiers=\(deliveredAttachmentIds)"
         )
-        self?.contentHandler?(content)
+        self?.deliverOnce(content)
       }
     )
   }
 
+  private func deliverOnce(_ content: UNNotificationContent) {
+    var handler: ((UNNotificationContent) -> Void)?
+
+    deliveryLock.lock()
+    if !didDeliver {
+      didDeliver = true
+      handler = contentHandler
+      contentHandler = nil
+      bestAttemptContent = nil
+    }
+    deliveryLock.unlock()
+
+    handler?(content)
+  }
+
   override func serviceExtensionTimeWillExpire() {
-    if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent {
+    deliveryLock.lock()
+    let content = bestAttemptContent
+    deliveryLock.unlock()
+
+    if let bestAttemptContent = content {
       nseLog(
         "serviceExtensionTimeWillExpire id=\(bestAttemptContent.userInfo["gcm.message_id"] ?? "n/a") " +
           "title=\(bestAttemptContent.title) " +
           "deliveredAttachments=\(bestAttemptContent.attachments.count)"
       )
-      contentHandler(bestAttemptContent)
+      deliverOnce(bestAttemptContent)
     }
   }
 }

package/dist/version.d.ts

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

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '10.3.1';
+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+NSURLSession.m

@@ -18,18 +18,35 @@
 #import "NotifeeCore+NSURLSession.h"
 #import "NotifeeCoreDownloadDelegate.h"
 
+static NSTimeInterval const kNotifeeAttachmentDownloadTimeoutInterval = 25.0;
+
 @implementation NotifeeCoreNSURLSession
 
++ (NSURLSessionConfiguration *)attachmentDownloadSessionConfiguration {
+  NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
+  config.timeoutIntervalForRequest = kNotifeeAttachmentDownloadTimeoutInterval;
+  config.timeoutIntervalForResource = kNotifeeAttachmentDownloadTimeoutInterval;
+  return config;
+}
+
++ (nullable NSString *)fileExtensionFromSuggestedFilename:(nullable NSString *)suggestedFilename {
+  NSString *suggestedPathExtension = [suggestedFilename pathExtension];
+  if (suggestedPathExtension.length == 0) {
+    return nil;
+  }
+
+  return [NSString stringWithFormat:@".%@", suggestedPathExtension];
+}
+
 + (NSString *)downloadItemAtURL:(NSURL *)url toFile:(NSString *)localPath error:(NSError **)error {
   NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url];
+  request.timeoutInterval = kNotifeeAttachmentDownloadTimeoutInterval;
 
   NotifeeCoreDownloadDelegate *delegate =
       [[NotifeeCoreDownloadDelegate alloc] initWithFilePath:localPath];
 
-  // The session is created with the defaultSessionConfiguration
-  // default timeoutIntervalForRequest is 60 seconds.
   NSURLSession *session =
-      [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]
+      [NSURLSession sessionWithConfiguration:[self attachmentDownloadSessionConfiguration]
                                     delegate:delegate
                                delegateQueue:nil];
 

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];
@@ -1191,7 +1197,8 @@ typedef NS_ENUM(NSInteger, NotifeeCoreRollingErrorCode) {
                    dispatch_async(dispatch_get_main_queue(), ^{
                      BOOL isApplicationActive = NO;
                      if (![NotifeeCoreUtil isAppExtension]) {
-                       UIApplication *application = [NotifeeCoreUtil notifeeUIApplication];
+                       UIApplication *application =
+                           (UIApplication *)[NotifeeCoreUtil notifeeUIApplication];
                        if (application != nil) {
                          isApplicationActive =
                              application.applicationState == UIApplicationStateActive;
@@ -1222,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];
@@ -1542,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;
@@ -1677,6 +1688,8 @@ typedef NS_ENUM(NSInteger, NotifeeCoreRollingErrorCode) {
 }
 
 + (void)getInitialNotification:(notifeeMethodNSDictionaryBlock)block {
+  [[NotifeeCoreUNUserNotificationCenter instance] rechainUserNotificationCenterDelegate];
+
   [NotifeeCoreUNUserNotificationCenter instance].initialNotificationBlock = block;
   [[NotifeeCoreUNUserNotificationCenter instance] getInitialNotification];
 }
@@ -1783,6 +1796,7 @@ typedef NS_ENUM(NSInteger, NotifeeCoreRollingErrorCode) {
     [NotifeeCoreUNUserNotificationCenter instance].shouldHandleRemoteNotifications =
         [config[@"ios"][@"handleRemoteNotifications"] boolValue];
   }
+  [[NotifeeCoreUNUserNotificationCenter instance] rechainUserNotificationCenterDelegate];
   block(nil);
 }
 

package/ios/NotifeeCore/NotifeeCoreExtensionHelper.h

@@ -24,8 +24,8 @@ static NSString *const kPayloadOptionsName = @"notifee_options";
 static NSString *const kPayloadOptionsImageURLName = @"image";
 
 @interface NotifeeCoreExtensionHelper : NSObject
-@property(nonatomic, strong) void (^contentHandler)(UNNotificationContent *c);
-@property(nonatomic, strong) UNMutableNotificationContent *modifiedContent;
+@property(nonatomic, copy, nullable) void (^contentHandler)(UNNotificationContent *c);
+@property(nonatomic, strong, nullable) UNMutableNotificationContent *modifiedContent;
 
 + (NotifeeCoreExtensionHelper *)instance NS_SWIFT_NAME(serviceExtension());
 

package/ios/NotifeeCore/NotifeeCoreExtensionHelper.m

@@ -23,30 +23,56 @@
 static NSString *const kNoExtension = @"";
 static NSString *const kImagePathPrefix = @"image/";
 
-@implementation NotifeeCoreExtensionHelper
-+ (NotifeeCoreExtensionHelper *)instance {
-  static dispatch_once_t once;
-  static NotifeeCoreExtensionHelper *instance;
-  dispatch_once(&once, ^{
-    instance = [[self alloc] init];
-  });
+@interface NotifeeCoreExtensionHelper ()
+- (NSMutableDictionary *)parseNotifeeOptions:(id)payload;
+- (void)loadAttachment:(NSDictionary *)attachmentDict
+     completionHandler:(void (^)(UNNotificationAttachment *))completionHandler;
+@end
 
-  return instance;
-}
+@interface NotifeeCoreExtensionRequestContext : NSObject
+@property(nonatomic, strong) NotifeeCoreExtensionHelper *helper;
+@property(nonatomic, copy) void (^contentHandler)(UNNotificationContent *content);
+@property(nonatomic, strong) UNMutableNotificationContent *modifiedContent;
+@property(nonatomic, assign) BOOL notificationDelivered;
 
-- (void)populateNotificationContent:(UNNotificationRequest *_Nullable)request
-                        withContent:(UNMutableNotificationContent *)content
-                 withContentHandler:(void (^)(UNNotificationContent *_Nonnull))contentHandler {
-  self.contentHandler = [contentHandler copy];
-  self.modifiedContent = content;
+- (instancetype)initWithHelper:(NotifeeCoreExtensionHelper *)helper
+                       content:(UNMutableNotificationContent *)content
+                contentHandler:(void (^)(UNNotificationContent *content))contentHandler;
+- (void)populateNotificationContentWithRequest:(UNNotificationRequest *_Nullable)request;
+- (void)processCommunicationData:(NSMutableDictionary *)options;
+- (void)handleAttachmentsAndDeliverNotificaiton:(NSMutableDictionary *)options;
+- (void)deliverNotification;
+@end
+
+@implementation NotifeeCoreExtensionRequestContext
+
+- (instancetype)initWithHelper:(NotifeeCoreExtensionHelper *)helper
+                       content:(UNMutableNotificationContent *)content
+                contentHandler:(void (^)(UNNotificationContent *content))contentHandler {
+  self = [super init];
+  if (self != nil) {
+    self.helper = helper;
+    self.contentHandler = [contentHandler copy];
+    self.modifiedContent = content;
+    self.notificationDelivered = NO;
+  }
 
-  if (!content.userInfo[@"notifee_options"]) {
+  return self;
+}
+
+- (void)populateNotificationContentWithRequest:(UNNotificationRequest *_Nullable)request {
+  id notifeeOptionsPayload = self.modifiedContent.userInfo[kPayloadOptionsName];
+  if (!notifeeOptionsPayload) {
     [self deliverNotification];
     return;
   }
 
-  // fcm: apns: { payload: {notifee_options: {} } }
-  NSMutableDictionary *options = [self.modifiedContent.userInfo[@"notifee_options"] mutableCopy];
+  // fcm: apns: { payload: {notifee_options: "{}" } }
+  NSMutableDictionary *options = [self.helper parseNotifeeOptions:notifeeOptionsPayload];
+  if (options == nil) {
+    [self deliverNotification];
+    return;
+  }
 
   options[@"remote"] = @YES;
 
@@ -60,7 +86,7 @@ static NSString *const kImagePathPrefix = @"image/";
     options[@"id"] = request.identifier;
   }
 
-  if (options[@"title"] == nil && content.title != nil) {
+  if (options[@"title"] == nil && self.modifiedContent.title != nil) {
     options[@"title"] = self.modifiedContent.title;
   }
 
@@ -135,14 +161,100 @@ static NSString *const kImagePathPrefix = @"image/";
   }
 
   // Attempt to download attachment
-  [self loadAttachment:attachmentDict
-      completionHandler:^(UNNotificationAttachment *attachment) {
-        if (attachment != nil) {
-          self.modifiedContent.attachments = @[ attachment ];
-        }
-
-        [self deliverNotification];
-      }];
+  [self.helper loadAttachment:attachmentDict
+            completionHandler:^(UNNotificationAttachment *attachment) {
+              if (attachment != nil) {
+                @synchronized(self) {
+                  if (!self.notificationDelivered && self.modifiedContent != nil) {
+                    self.modifiedContent.attachments = @[ attachment ];
+                  }
+                }
+              }
+
+              [self deliverNotification];
+            }];
+}
+
+- (void)deliverNotification {
+  void (^contentHandler)(UNNotificationContent *) = nil;
+  UNNotificationContent *modifiedContent = nil;
+
+  @synchronized(self) {
+    if (self.notificationDelivered || self.contentHandler == nil) {
+      return;
+    }
+
+    contentHandler = [self.contentHandler copy];
+    modifiedContent = self.modifiedContent;
+    self.notificationDelivered = YES;
+    self.contentHandler = nil;
+    self.modifiedContent = nil;
+  }
+
+  if (contentHandler != nil && modifiedContent != nil) {
+    contentHandler(modifiedContent);
+  }
+}
+
+@end
+
+@implementation NotifeeCoreExtensionHelper
++ (NotifeeCoreExtensionHelper *)instance {
+  static dispatch_once_t once;
+  static NotifeeCoreExtensionHelper *instance;
+  dispatch_once(&once, ^{
+    instance = [[self alloc] init];
+  });
+
+  return instance;
+}
+
+- (NSMutableDictionary *)parseNotifeeOptions:(id)payload {
+  if ([payload isKindOfClass:[NSDictionary class]]) {
+    return [payload mutableCopy];
+  }
+
+  if ([payload isKindOfClass:[NSString class]]) {
+    NSData *optionsData = [payload dataUsingEncoding:NSUTF8StringEncoding];
+    if (optionsData == nil) {
+      NSLog(@"NotifeeCoreExtensionHelper: Could not decode notifee_options string as UTF-8");
+      return nil;
+    }
+
+    NSError *error = nil;
+    id jsonObject = [NSJSONSerialization JSONObjectWithData:optionsData
+                                                    options:NSJSONReadingFragmentsAllowed
+                                                      error:&error];
+
+    if (error != nil) {
+      NSLog(@"NotifeeCoreExtensionHelper: Could not parse notifee_options JSON: %@", error);
+      return nil;
+    }
+
+    if (![jsonObject isKindOfClass:[NSDictionary class]]) {
+      NSLog(@"NotifeeCoreExtensionHelper: Ignoring notifee_options JSON because it is not a "
+            @"dictionary: %@",
+            NSStringFromClass([jsonObject class]));
+      return nil;
+    }
+
+    return [jsonObject mutableCopy];
+  }
+
+  NSLog(@"NotifeeCoreExtensionHelper: Ignoring notifee_options because it is not a dictionary "
+        @"or JSON string: %@",
+        NSStringFromClass([payload class]));
+  return nil;
+}
+
+- (void)populateNotificationContent:(UNNotificationRequest *_Nullable)request
+                        withContent:(UNMutableNotificationContent *)content
+                 withContentHandler:(void (^)(UNNotificationContent *_Nonnull))contentHandler {
+  NotifeeCoreExtensionRequestContext *context =
+      [[NotifeeCoreExtensionRequestContext alloc] initWithHelper:self
+                                                         content:content
+                                                  contentHandler:contentHandler];
+  [context populateNotificationContentWithRequest:request];
 }
 
 - (NSString *)fileExtensionForResponse:(NSURLResponse *)response {
@@ -220,10 +332,4 @@ static NSString *const kImagePathPrefix = @"image/";
   }
 }
 
-- (void)deliverNotification {
-  if (self.contentHandler) {
-    self.contentHandler(self.modifiedContent);
-  }
-}
-
 @end

package/ios/NotifeeCore/NotifeeCoreUtil.m

@@ -23,6 +23,12 @@
 #include <math.h>
 #import "NotifeeCore+NSURLSession.h"
 
+@interface NotifeeCoreNSURLSession (NotifeeCoreUtil)
+
++ (nullable NSString *)fileExtensionFromSuggestedFilename:(nullable NSString *)suggestedFilename;
+
+@end
+
 static NSString *const kNotifeeRollingTimestampTriggersStorageKey =
     @"app.notifee.core.rollingTimestampTriggers.v1";
 static NSString *const kNotifeeRollingInternalIdPrefix = @"__notifee_rolling__";
@@ -83,7 +89,7 @@ static NSInteger const kNotifeeRollingTargetPerTrigger = 32;
     notificationActionDict[@"authenticationRequired"] =
         @(((notificationAction.options & UNNotificationActionOptionAuthenticationRequired) != 0));
 
-    if ([[notificationAction class] isKindOfClass:[UNTextInputNotificationAction class]]) {
+    if ([notificationAction isKindOfClass:[UNTextInputNotificationAction class]]) {
       UNTextInputNotificationAction *notificationInputAction =
           (UNTextInputNotificationAction *)notificationAction;
       if ([notificationInputAction textInputButtonTitle] == nil &&
@@ -266,12 +272,14 @@ static NSInteger const kNotifeeRollingTargetPerTrigger = 32;
     // Rename the recently downloaded file to include its file extension
     NSFileManager *fileManager = [NSFileManager defaultManager];
 
-    NSString *fileExtension = [NSString stringWithFormat:@".%@", [suggestedFilename pathExtension]];
+    NSString *fileExtension =
+        [NotifeeCoreNSURLSession fileExtensionFromSuggestedFilename:suggestedFilename];
 
-    if (!fileExtension || [fileExtension isEqualToString:@""]) {
+    if (fileExtension.length == 0) {
       NSLog(@"NotifeeCore: Failed to determine file extension for attachment "
-            @"with URL %@: %@",
-            urlString, error);
+            @"with URL %@ and suggested filename %@",
+            urlString, suggestedFilename);
+      [fileManager removeItemAtPath:tempDestination error:nil];
       return 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.1",
+  "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.1';
+export const version = '10.3.3';