react-native-notify-kit 10.3.0 → 10.3.2

package/android/src/main/java/app/notifee/core/model/NotificationAndroidModel.java

@@ -471,9 +471,7 @@ public class NotificationAndroidModel {
 
     int importance =
         BundleValueReader.getIntPreserving(
-            mNotificationAndroidBundle,
-            "importance",
-            NotificationManagerCompat.IMPORTANCE_DEFAULT);
+            mNotificationAndroidBundle, "importance", NotificationManagerCompat.IMPORTANCE_DEFAULT);
     switch (importance) {
       case NotificationManagerCompat.IMPORTANCE_HIGH:
         return NotificationCompat.PRIORITY_HIGH;

package/android/src/main/kotlin/io/invertase/notifee/NotifeeApiModule.kt

@@ -9,6 +9,7 @@ import android.os.Build
 import android.os.Bundle
 import app.notifee.core.Logger
 import app.notifee.core.Notifee
+import app.notifee.core.WarmupHelper
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -331,7 +332,7 @@ class NotifeeApiModule(reactContext: ReactApplicationContext) :
         executor.submit {
             android.os.Trace.beginSection("notifee:prewarm")
             try {
-                app.notifee.core.WarmupHelper.runWarmup(context)
+                WarmupHelper.runWarmup(context)
                 promise.resolve(null)
             } catch (t: Throwable) {
                 // Best-effort semantics: warmup failures don't reject the promise.

package/android/src/test/java/app/notifee/core/NotifeeAlarmManagerCurrentBehaviorTest.java

@@ -199,7 +199,8 @@ public class NotifeeAlarmManagerCurrentBehaviorTest {
 
   @Test
   public void rescheduleNotification_otherInteger_completesWithoutRoomUpdate() throws Exception {
-    runRescheduleNotificationExpectingNoUpdate(rescheduleTriggerWithType(Integer.valueOf(99), true));
+    runRescheduleNotificationExpectingNoUpdate(
+        rescheduleTriggerWithType(Integer.valueOf(99), true));
   }
 
   @Test
@@ -256,8 +257,7 @@ public class NotifeeAlarmManagerCurrentBehaviorTest {
     String id = "am-type-reboot-" + suffix;
     Bundle triggerBundle = rescheduleTriggerWithType(typeValue, true);
     seedDisplayRow(id, triggerBundle);
-    long originalTimestamp =
-        triggerTimestamp(repo.getWorkDataById(id).get(5, TimeUnit.SECONDS));
+    long originalTimestamp = triggerTimestamp(repo.getWorkDataById(id).get(5, TimeUnit.SECONDS));
 
     runRescheduleNotificationsFromRoom();
 

package/android/src/test/java/app/notifee/core/NotificationManagerCreateTriggerNotificationCurrentBehaviorTest.java

@@ -63,7 +63,8 @@ public class NotificationManagerCreateTriggerNotificationCurrentBehaviorTest {
   public void createTriggerNotification_missingType_dispatchesTimestampBranch() throws Exception {
     Bundle triggerBundle = new Bundle();
 
-    assertCompletes(NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
+    assertCompletes(
+        NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
 
     verifyTimestampBranch(triggerBundle);
     verifyIntervalBranchNeverCalled();
@@ -75,7 +76,8 @@ public class NotificationManagerCreateTriggerNotificationCurrentBehaviorTest {
     Bundle triggerBundle = new Bundle();
     triggerBundle.putString("type", null);
 
-    assertCompletes(NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
+    assertCompletes(
+        NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
 
     verifyTimestampBranch(triggerBundle);
     verifyIntervalBranchNeverCalled();
@@ -85,7 +87,8 @@ public class NotificationManagerCreateTriggerNotificationCurrentBehaviorTest {
   public void createTriggerNotification_integerZero_dispatchesTimestampBranch() throws Exception {
     Bundle triggerBundle = triggerBundleWithType(Integer.valueOf(0));
 
-    assertCompletes(NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
+    assertCompletes(
+        NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
 
     verifyTimestampBranch(triggerBundle);
     verifyIntervalBranchNeverCalled();
@@ -95,7 +98,8 @@ public class NotificationManagerCreateTriggerNotificationCurrentBehaviorTest {
   public void createTriggerNotification_integerOne_dispatchesIntervalBranch() throws Exception {
     Bundle triggerBundle = triggerBundleWithType(Integer.valueOf(1));
 
-    assertCompletes(NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
+    assertCompletes(
+        NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
 
     verifyIntervalBranch(triggerBundle);
     verifyTimestampBranchNeverCalled();
@@ -105,7 +109,8 @@ public class NotificationManagerCreateTriggerNotificationCurrentBehaviorTest {
   public void createTriggerNotification_otherInteger_completesWithoutScheduling() throws Exception {
     Bundle triggerBundle = triggerBundleWithType(Integer.valueOf(99));
 
-    assertCompletes(NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
+    assertCompletes(
+        NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
 
     verifyTimestampBranchNeverCalled();
     verifyIntervalBranchNeverCalled();
@@ -115,7 +120,8 @@ public class NotificationManagerCreateTriggerNotificationCurrentBehaviorTest {
   public void createTriggerNotification_doubleType_truncatesBeforeDispatch() throws Exception {
     Bundle triggerBundle = triggerBundleWithType(Double.valueOf(1.9d));
 
-    assertCompletes(NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
+    assertCompletes(
+        NotificationManager.createTriggerNotification(notificationModel, triggerBundle));
 
     verifyIntervalBranch(triggerBundle);
     verifyTimestampBranchNeverCalled();

package/android/src/test/java/app/notifee/core/NotificationManagerPressActionOptOutTest.java

@@ -106,7 +106,8 @@ public class NotificationManagerPressActionOptOutTest {
 
   private static Notification displayNotification(NotificationModel notificationModel)
       throws Exception {
-    ListenableFuture<Void> future = NotificationManager.displayNotification(notificationModel, null);
+    ListenableFuture<Void> future =
+        NotificationManager.displayNotification(notificationModel, null);
     future.get(5, TimeUnit.SECONDS);
 
     Context context = RuntimeEnvironment.getApplication();

package/android/src/test/java/app/notifee/core/NotificationReceiverHandlerInitialNotificationTest.java

@@ -92,7 +92,8 @@ public class NotificationReceiverHandlerInitialNotificationTest {
     assertNotNull(
         "Android 12+ handler currently posts InitialNotificationEvent for no-launch ACTION_PRESS",
         initialNotificationEvent);
-    assertEquals("handler-action-no-launch", initialNotificationEvent.getNotificationModel().getId());
+    assertEquals(
+        "handler-action-no-launch", initialNotificationEvent.getNotificationModel().getId());
     assertPressAction(initialNotificationEvent.getExtras(), "reply", null, null);
   }
 

package/android/src/test/java/app/notifee/core/model/ChannelModelTest.java

@@ -33,7 +33,8 @@ public class ChannelModelTest {
     integerBundle.putInt("visibility", NotificationCompat.VISIBILITY_SECRET);
     ChannelModel integerModel = ChannelModel.fromBundle(integerBundle);
 
-    assertEquals(NotificationManagerCompat.IMPORTANCE_HIGH, integerModel.getImportance().intValue());
+    assertEquals(
+        NotificationManagerCompat.IMPORTANCE_HIGH, integerModel.getImportance().intValue());
     assertEquals(NotificationCompat.VISIBILITY_SECRET, integerModel.getVisibility());
 
     Bundle doubleBundle = new Bundle();
@@ -83,7 +84,8 @@ public class ChannelModelTest {
     Bundle validBundle = new Bundle();
     putRawParcelableArrayList(validBundle, "vibrationPattern", vibrationPattern);
 
-    assertArrayEquals(new long[] {100L, 200L}, ChannelModel.fromBundle(validBundle).getVibrationPattern());
+    assertArrayEquals(
+        new long[] {100L, 200L}, ChannelModel.fromBundle(validBundle).getVibrationPattern());
 
     ArrayList<Object> invalidPattern = new ArrayList<>();
     invalidPattern.add(100L);
@@ -109,8 +111,7 @@ public class ChannelModelTest {
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  private static void putRawParcelableArrayList(
-      Bundle bundle, String key, ArrayList<?> arrayList) {
+  private static void putRawParcelableArrayList(Bundle bundle, String key, ArrayList<?> arrayList) {
     bundle.putParcelableArrayList(key, (ArrayList) arrayList);
   }
 }

package/android/src/test/java/app/notifee/core/model/IntervalTriggerModelTest.java

@@ -66,6 +66,7 @@ public class IntervalTriggerModelTest {
     Bundle bundle = new Bundle();
     bundle.putString("interval", "15");
 
-    assertThrows(ClassCastException.class, () -> IntervalTriggerModel.fromBundle(bundle).getInterval());
+    assertThrows(
+        ClassCastException.class, () -> IntervalTriggerModel.fromBundle(bundle).getInterval());
   }
 }

package/android/src/test/java/app/notifee/core/model/NotificationAndroidModelTest.java

@@ -260,7 +260,8 @@ public class NotificationAndroidModelTest {
     Bundle validBundle = new Bundle();
     putRawParcelableArrayList(validBundle, "flags", flags);
 
-    assertArrayEquals(new int[] {1, 2}, NotificationAndroidModel.fromBundle(validBundle).getFlags());
+    assertArrayEquals(
+        new int[] {1, 2}, NotificationAndroidModel.fromBundle(validBundle).getFlags());
 
     ArrayList<Object> invalidFlags = new ArrayList<>();
     invalidFlags.add(1L);
@@ -274,7 +275,8 @@ public class NotificationAndroidModelTest {
 
   @Test
   public void vibrationPattern_missingEmptyIntegerAndUnsupportedValues_preserveCurrentBehavior() {
-    assertArrayEquals(new long[0], NotificationAndroidModel.fromBundle(new Bundle()).getVibrationPattern());
+    assertArrayEquals(
+        new long[0], NotificationAndroidModel.fromBundle(new Bundle()).getVibrationPattern());
 
     Bundle emptyBundle = new Bundle();
     putRawParcelableArrayList(emptyBundle, "vibrationPattern", new ArrayList<Integer>());
@@ -302,8 +304,7 @@ public class NotificationAndroidModelTest {
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  private static void putRawParcelableArrayList(
-      Bundle bundle, String key, ArrayList<?> arrayList) {
+  private static void putRawParcelableArrayList(Bundle bundle, String key, ArrayList<?> arrayList) {
     bundle.putParcelableArrayList(key, (ArrayList) arrayList);
   }
 }

package/android/src/test/java/app/notifee/core/model/NotificationAndroidStyleModelTest.java

@@ -52,7 +52,9 @@ public class NotificationAndroidStyleModelTest {
     Bundle truncatedDoubleBundle = new Bundle();
     truncatedDoubleBundle.putDouble("type", 1.9d);
     NotificationCompat.Style truncatedStyle =
-        NotificationAndroidStyleModel.fromBundle(truncatedDoubleBundle).getStyleTask(executor).get();
+        NotificationAndroidStyleModel.fromBundle(truncatedDoubleBundle)
+            .getStyleTask(executor)
+            .get();
     assertTrue(truncatedStyle instanceof NotificationCompat.BigTextStyle);
   }
 
@@ -147,8 +149,7 @@ public class NotificationAndroidStyleModelTest {
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  private static void putRawParcelableArrayList(
-      Bundle bundle, String key, ArrayList<?> arrayList) {
+  private static void putRawParcelableArrayList(Bundle bundle, String key, ArrayList<?> arrayList) {
     bundle.putParcelableArrayList(key, (ArrayList) arrayList);
   }
 }

package/android/src/test/java/app/notifee/core/utility/BundleValueReaderTest.java

@@ -102,7 +102,8 @@ public class BundleValueReaderTest {
         NullPointerException.class,
         () -> BundleValueReader.getLongPreserving(bundle, "explicitNull", 42L));
     assertThrows(
-        ClassCastException.class, () -> BundleValueReader.getLongPreserving(bundle, "integer", 42L));
+        ClassCastException.class,
+        () -> BundleValueReader.getLongPreserving(bundle, "integer", 42L));
   }
 
   @Test

package/android/src/test/java/app/notifee/core/utility/ObjectUtilsTest.java

@@ -135,8 +135,7 @@ public class ObjectUtilsTest {
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  private static void putRawParcelableArrayList(
-      Bundle bundle, String key, ArrayList<?> arrayList) {
+  private static void putRawParcelableArrayList(Bundle bundle, String key, ArrayList<?> arrayList) {
     bundle.putParcelableArrayList(key, (ArrayList) arrayList);
   }
 }

package/android/src/test/java/io/invertase/notifee/HeadlessTaskReactHostTest.java

@@ -25,9 +25,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
 
@@ -80,15 +80,16 @@ public class HeadlessTaskReactHostTest {
         "ReactContext listener should be removed after initialization",
         0,
         application.reactHost.listeners.size());
-    Shadows.shadowOf(Looper.getMainLooper()).idleFor(499, java.util.concurrent.TimeUnit.MILLISECONDS);
-    verify(appRegistry, never()).startHeadlessTask(anyInt(), any(String.class), any(WritableMap.class));
+    Shadows.shadowOf(Looper.getMainLooper())
+        .idleFor(499, java.util.concurrent.TimeUnit.MILLISECONDS);
+    verify(appRegistry, never())
+        .startHeadlessTask(anyInt(), any(String.class), any(WritableMap.class));
 
     Shadows.shadowOf(Looper.getMainLooper()).idleFor(1, java.util.concurrent.TimeUnit.MILLISECONDS);
 
     ArgumentCaptor<Integer> taskIdCaptor = ArgumentCaptor.forClass(Integer.class);
     verify(appRegistry)
-        .startHeadlessTask(
-            taskIdCaptor.capture(), eq("test-headless-task"), same(copiedParams));
+        .startHeadlessTask(taskIdCaptor.capture(), eq("test-headless-task"), same(copiedParams));
     assertEquals(taskIdCaptor.getValue().intValue(), taskConfig.getReactTaskId());
     assertEquals(
         "source payload should be copied into the queued task",

package/android/src/test/java/io/invertase/notifee/NotifeeEventSubscriberRoutingTest.java

@@ -30,9 +30,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockedStatic;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -76,8 +76,8 @@ public class NotifeeEventSubscriberRoutingTest {
     WritableMap notificationMap = mock(WritableMap.class);
     WritableMap pressActionMap = mock(WritableMap.class);
 
-    try (MockedStatic<Arguments> arguments = mockArguments(
-        eventMap, detailMap, notificationMap, pressActionMap)) {
+    try (MockedStatic<Arguments> arguments =
+        mockArguments(eventMap, detailMap, notificationMap, pressActionMap)) {
       new NotifeeEventSubscriber().onNotificationEvent(buildPressEvent("routing-foreground"));
     }
 
@@ -90,7 +90,8 @@ public class NotifeeEventSubscriberRoutingTest {
     verify(emitter).emit(NotifeeEventSubscriber.NOTIFICATION_EVENT_KEY, eventMap);
     verify(eventMap, never()).copy();
     assertEquals("foreground routing must not queue a headless task", 0, taskQueueSize());
-    assertEquals("foreground routing must not start ReactHost", 0, application.reactHost.startCalls);
+    assertEquals(
+        "foreground routing must not start ReactHost", 0, application.reactHost.startCalls);
   }
 
   @Test
@@ -111,8 +112,8 @@ public class NotifeeEventSubscriberRoutingTest {
     WritableMap pressActionMap = mock(WritableMap.class);
     when(eventMap.copy()).thenReturn(queuedEventMap);
 
-    try (MockedStatic<Arguments> arguments = mockArguments(
-        eventMap, detailMap, notificationMap, pressActionMap)) {
+    try (MockedStatic<Arguments> arguments =
+        mockArguments(eventMap, detailMap, notificationMap, pressActionMap)) {
       new NotifeeEventSubscriber().onNotificationEvent(buildPressEvent("routing-background"));
     }
 
@@ -128,11 +129,18 @@ public class NotifeeEventSubscriberRoutingTest {
 
     assertEquals("background routing should queue exactly one headless task", 1, taskQueueSize());
     HeadlessTask.TaskConfig queuedTask = headlessTaskQueue().get(0);
-    assertEquals(NotifeeEventSubscriber.NOTIFICATION_EVENT_KEY, queuedTask.getTaskConfig().getTaskKey());
+    assertEquals(
+        NotifeeEventSubscriber.NOTIFICATION_EVENT_KEY, queuedTask.getTaskConfig().getTaskKey());
     assertEquals(60000L, queuedTask.getTaskConfig().getTimeout());
     assertSame(queuedEventMap, queuedTask.getTaskConfig().getData());
-    assertEquals("background routing should initialize ReactHost via reflection", 1, application.reactHost.startCalls);
-    assertEquals("background routing should register one ReactContext listener", 1, application.reactHost.listeners.size());
+    assertEquals(
+        "background routing should initialize ReactHost via reflection",
+        1,
+        application.reactHost.startCalls);
+    assertEquals(
+        "background routing should register one ReactContext listener",
+        1,
+        application.reactHost.listeners.size());
   }
 
   private static MockedStatic<Arguments> mockArguments(
@@ -142,7 +150,8 @@ public class NotifeeEventSubscriberRoutingTest {
       WritableMap pressActionMap) {
     MockedStatic<Arguments> arguments = mockStatic(Arguments.class);
     arguments.when(Arguments::createMap).thenReturn(eventMap, detailMap);
-    arguments.when(() -> Arguments.fromBundle(any(Bundle.class)))
+    arguments
+        .when(() -> Arguments.fromBundle(any(Bundle.class)))
         .thenReturn(notificationMap, pressActionMap);
     return arguments;
   }

package/android/src/test/java/io/invertase/notifee/NotifeeReactUtilsDrawerTest.java

@@ -4,8 +4,8 @@ import app.notifee.core.ContextHolder;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)

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.0";
+export declare const version = "10.3.2";

package/dist/version.js

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

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.m

@@ -1191,7 +1191,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;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notify-kit",
-  "version": "10.3.0",
+  "version": "10.3.2",
   "author": "Marco Crupi",
   "description": "Maintained Notifee-compatible fork for React Native — advanced local notifications for Android & iOS.",
   "main": "dist/index.js",

package/src/version.ts

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