react-native-notify-kit 10.1.0 → 10.2.1

package/ios/NotifeeCore/NotifeeCore+UNUserNotificationCenter.m

@@ -17,9 +17,14 @@
 
 #import "NotifeeCore+UNUserNotificationCenter.h"
 
+#import "NotifeeCore.h"
 #import "NotifeeCoreDelegateHolder.h"
 #import "NotifeeCoreUtil.h"
 
+@interface NotifeeCore (RollingTimestampTopUp)
++ (void)topUpRollingTimestampTriggersWithCompletion:(void (^)(NSError *error))completion;
+@end
+
 @implementation NotifeeCoreUNUserNotificationCenter
 
 struct {
@@ -63,12 +68,7 @@ struct {
   });
 }
 
-- (void)onDidFinishLaunchingNotification:(nonnull NSDictionary *)notifUserInfo {
-  if (notifUserInfo != nil) {
-    NSDictionary *notifeeNotification = notifUserInfo[kNotifeeUserInfoNotification];
-    _initialNoticationID = notifeeNotification[@"id"];
-  }
-
+- (void)markInitialNotificationGathered {
   _initialNotificationGathered = YES;
 }
 
@@ -89,6 +89,24 @@ struct {
   return nil;
 }
 
+- (BOOL)isRollingTimestampNotificationRequest:(UNNotificationRequest *)request {
+  if ([NotifeeCoreUtil isRollingInternalNotificationId:request.identifier]) {
+    return YES;
+  }
+
+  NSDictionary *trigger = request.content.userInfo[kNotifeeUserInfoTrigger];
+  return [NotifeeCoreUtil isRollingTimestampTrigger:trigger];
+}
+
+- (void)topUpRollingTimestampTriggersForLifecycleEvent:(NSString *)eventName {
+  [NotifeeCore topUpRollingTimestampTriggersWithCompletion:^(NSError *error) {
+    if (error != nil) {
+      NSLog(@"NotifeeCore: Failed to top up rolling timestamp triggers after %@: %@", eventName,
+            error);
+    }
+  }];
+}
+
 #pragma mark - UNUserNotificationCenter Delegate Methods
 
 // The method will be called on the delegate only if the application is in the
@@ -103,6 +121,8 @@ struct {
              (void (^)(UNNotificationPresentationOptions options))completionHandler {
   NSDictionary *notifeeNotification =
       notification.request.content.userInfo[kNotifeeUserInfoNotification];
+  BOOL isRollingTimestampNotification =
+      [self isRollingTimestampNotificationRequest:notification.request];
 
   // we only care about notifications created through notifee
   if (notifeeNotification != nil) {
@@ -127,25 +147,16 @@ struct {
     // if list or banner is true, ignore alert property
     if (banner || list) {
       if (banner) {
-        if (@available(iOS 14, *)) {
-          presentationOptions |= UNNotificationPresentationOptionBanner;
-        } else {
-          // for iOS 13 we need to set alert
-          presentationOptions |= UNNotificationPresentationOptionAlert;
-        }
+        presentationOptions |= UNNotificationPresentationOptionBanner;
       }
 
       if (list) {
-        if (@available(iOS 14, *)) {
-          presentationOptions |= UNNotificationPresentationOptionList;
-        } else {
-          // for iOS 13 we need to set alert
-          presentationOptions |= UNNotificationPresentationOptionAlert;
-        }
+        presentationOptions |= UNNotificationPresentationOptionList;
       }
     } else if (alert) {
       // TODO: remove alert once it has been fully removed from the notifee API
-      presentationOptions |= UNNotificationPresentationOptionAlert;
+      presentationOptions |=
+          UNNotificationPresentationOptionBanner | UNNotificationPresentationOptionList;
     }
 
     // Emit DELIVERED for every Notifee-owned notification presented in foreground.
@@ -160,6 +171,9 @@ struct {
     }];
 
     completionHandler(presentationOptions);
+    if (isRollingTimestampNotification) {
+      [self topUpRollingTimestampTriggersForLifecycleEvent:@"foreground delivery"];
+    }
 
   } else if (_originalDelegate != nil && originalUNCDelegateRespondsTo.willPresentNotification) {
     [_originalDelegate userNotificationCenter:center
@@ -174,15 +188,9 @@ struct {
     // @react-native-firebase/messaging). Fall back to the platform default
     // presentation options instead so the system shows the notification as it
     // would if Notifee had not installed a delegate at all.
-    if (@available(iOS 14.0, *)) {
-      completionHandler(
-          UNNotificationPresentationOptionBanner | UNNotificationPresentationOptionSound |
-          UNNotificationPresentationOptionList | UNNotificationPresentationOptionBadge);
-    } else {
-      completionHandler(UNNotificationPresentationOptionAlert |
-                        UNNotificationPresentationOptionSound |
-                        UNNotificationPresentationOptionBadge);
-    }
+    completionHandler(UNNotificationPresentationOptionBanner |
+                      UNNotificationPresentationOptionSound | UNNotificationPresentationOptionList |
+                      UNNotificationPresentationOptionBadge);
   }
 }
 
@@ -195,6 +203,8 @@ struct {
              withCompletionHandler:(void (^)(void))completionHandler {
   NSDictionary *notifeeNotification =
       response.notification.request.content.userInfo[kNotifeeUserInfoNotification];
+  BOOL isRollingTimestampNotification =
+      [self isRollingTimestampNotificationRequest:response.notification.request];
 
   _notificationOpenedAppID = notifeeNotification[@"id"];
 
@@ -234,6 +244,9 @@ struct {
         }
       }];
       completionHandler();
+      if (isRollingTimestampNotification) {
+        [self topUpRollingTimestampTriggersForLifecycleEvent:@"notification response"];
+      }
       return;
     }
 
@@ -272,16 +285,12 @@ struct {
     // store notification for getInitialNotification
     _initialNotification = [eventDetail copy];
 
-    // post PRESS/ACTION_PRESS event
-    // Set is initial notification to true
-    if (_notificationOpenedAppID != nil && _initialNoticationID != nil &&
-        [_initialNoticationID isEqualToString:_notificationOpenedAppID]) {
-      eventDetail[@"initialNotification"] = @1;
-    }
-
     [[NotifeeCoreDelegateHolder instance] didReceiveNotifeeCoreEvent:event];
 
     completionHandler();
+    if (isRollingTimestampNotification) {
+      [self topUpRollingTimestampTriggersForLifecycleEvent:@"notification response"];
+    }
   } else {
     // Defensive: parseUNNotificationRequest: currently never returns nil,
     // but if it did, the completionHandler contract must still be honored.