react-native-notify-kit 10.5.0 → 10.6.0

package/ios/NotifeeCore/NotifeeCoreUtil.m

@@ -19,6 +19,7 @@
 #include <CoreGraphics/CGGeometry.h>
 #import <Intents/INIntentIdentifiers.h>
 #import <UIKit/UIKit.h>
+#import <dispatch/dispatch.h>
 #include <limits.h>
 #include <math.h>
 #import "NotifeeCore+NSURLSession.h"
@@ -55,9 +56,30 @@ static NSInteger const kNotifeeRollingTargetPerTrigger = 32;
                                          defaultMissingCreatedAt:(BOOL)defaultMissingCreatedAt;
 + (nullable id)rollingJSONObjectFromObject:(nullable id)object;
 + (NSNumber *)rollingCurrentTimestampMs;
++ (INSendMessageIntent *)generateSenderIntentForCommunicationNotification:
+                             (NSDictionary *)communicationInfo
+                                                                 deadline:(dispatch_time_t)deadline;
++ (dispatch_time_t)communicationAvatarCurrentTime;
+
+@end
+
+@interface NotifeeCoreCommunicationAvatarDownloadResult : NSObject
+
+@property(nonatomic, strong, nullable) NSURL *URL;
+@property(nonatomic, assign) dispatch_time_t completionTime;
+@property(nonatomic, assign, getter=isCompleted) BOOL completed;
+@property(nonatomic, assign, getter=isUsable) BOOL usable;
 
 @end
 
+@implementation NotifeeCoreCommunicationAvatarDownloadResult
+@end
+
+static BOOL NotifeeCoreIsRemoteURLString(id value) {
+  return [value isKindOfClass:NSString.class] &&
+         ([value hasPrefix:@"http://"] || [value hasPrefix:@"https://"]);
+}
+
 @implementation NotifeeCoreUtil
 
 + (NSNumber *)numberForUNNotificationSetting:(UNNotificationSetting)setting {
@@ -223,20 +245,26 @@ static NSInteger const kNotifeeRollingTargetPerTrigger = 32;
  * @return NSURL
  */
 + (NSURL *)getURLFromString:(NSString *)urlString {
-  NSURL *url;
+  if (![urlString isKindOfClass:NSString.class] || [urlString length] == 0) {
+    return nil;
+  }
+
+  NSURL *parsedURL = [NSURL URLWithString:urlString];
+
+  if ([parsedURL isFileURL]) {
+    return parsedURL;
+  }
 
-  if ([urlString hasPrefix:@"http://"] || [urlString hasPrefix:@"https://"]) {
+  if (NotifeeCoreIsRemoteURLString(urlString)) {
     // handle remote url by attempting to download attachement synchronously
-    url = [self downloadMediaSynchronously:urlString];
+    return [self downloadMediaSynchronously:urlString];
   } else if ([urlString hasPrefix:@"/"]) {
     // handle absolute file path
-    url = [NSURL fileURLWithPath:urlString];
-  } else {
-    // try to resolve local resource
-    url = [[NSBundle mainBundle] URLForResource:urlString withExtension:nil];
+    return [NSURL fileURLWithPath:urlString];
   }
 
-  return url;
+  // try to resolve local resource
+  return [[NSBundle mainBundle] URLForResource:urlString withExtension:nil];
 }
 
 /*
@@ -1251,16 +1279,135 @@ static NSInteger const kNotifeeRollingTargetPerTrigger = 32;
 
 + (INSendMessageIntent *)generateSenderIntentForCommunicationNotification:
     (NSDictionary *)communicationInfo {
+  return [self generateSenderIntentForCommunicationNotification:communicationInfo
+                                                       deadline:DISPATCH_TIME_FOREVER];
+}
+
++ (dispatch_time_t)communicationAvatarCurrentTime {
+  return dispatch_time(DISPATCH_TIME_NOW, 0);
+}
+
++ (INSendMessageIntent *)
+    generateSenderIntentForCommunicationNotification:(NSDictionary *)communicationInfo
+                                            deadline:(dispatch_time_t)deadline {
   if (@available(iOS 15.0, *)) {
     NSDictionary *sender = communicationInfo[@"sender"];
     INPersonHandle *senderPersonHandle =
         [[INPersonHandle alloc] initWithValue:sender[@"id"] type:INPersonHandleTypeUnknown];
 
+    id senderAvatarValue = sender[@"avatar"];
+    id groupAvatarValue = communicationInfo[@"groupAvatar"];
+    BOOL sharesAvatar = [senderAvatarValue isKindOfClass:NSString.class] &&
+                        [groupAvatarValue isKindOfClass:NSString.class] &&
+                        [senderAvatarValue isEqualToString:groupAvatarValue];
+
+    NSURL *senderAvatarURL = nil;
+    NSURL *groupAvatarURL = nil;
+
+    if (deadline == DISPATCH_TIME_FOREVER) {
+      __block NSURL *downloadedGroupAvatarURL = nil;
+      dispatch_group_t groupAvatarDownload = nil;
+
+      if (!sharesAvatar && NotifeeCoreIsRemoteURLString(groupAvatarValue)) {
+        groupAvatarDownload = dispatch_group_create();
+        dispatch_group_async(groupAvatarDownload, dispatch_get_global_queue(QOS_CLASS_UTILITY, 0),
+                             ^{
+                               downloadedGroupAvatarURL = [self getURLFromString:groupAvatarValue];
+                             });
+      }
+
+      if (senderAvatarValue != nil) {
+        senderAvatarURL = [self getURLFromString:senderAvatarValue];
+      }
+
+      if (sharesAvatar) {
+        groupAvatarURL = senderAvatarURL;
+      } else if (groupAvatarDownload != nil) {
+        if (dispatch_group_wait(groupAvatarDownload, deadline) == 0) {
+          groupAvatarURL = downloadedGroupAvatarURL;
+        }
+      } else if (groupAvatarValue != nil) {
+        groupAvatarURL = [self getURLFromString:groupAvatarValue];
+      }
+    } else {
+      BOOL senderAvatarIsRemote = NotifeeCoreIsRemoteURLString(senderAvatarValue);
+      BOOL groupAvatarIsRemote = NotifeeCoreIsRemoteURLString(groupAvatarValue);
+      BOOL remoteDownloadsMayStart = [self communicationAvatarCurrentTime] < deadline;
+      NotifeeCoreCommunicationAvatarDownloadResult *senderAvatarResult = nil;
+      NotifeeCoreCommunicationAvatarDownloadResult *groupAvatarResult = nil;
+      dispatch_group_t senderAvatarDownload = nil;
+      dispatch_group_t groupAvatarDownload = nil;
+
+      dispatch_group_t (^startRemoteDownload)(NSString *,
+                                              NotifeeCoreCommunicationAvatarDownloadResult *) =
+          ^dispatch_group_t(NSString *avatarValue,
+                            NotifeeCoreCommunicationAvatarDownloadResult *result) {
+            dispatch_group_t download = dispatch_group_create();
+            dispatch_group_async(download, dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
+              dispatch_time_t downloadStartTime = [self communicationAvatarCurrentTime];
+              if (downloadStartTime >= deadline) {
+                @synchronized(result) {
+                  result.completionTime = downloadStartTime;
+                  result.completed = YES;
+                  result.usable = NO;
+                }
+                return;
+              }
+
+              NSURL *downloadedURL = [self getURLFromString:avatarValue];
+              dispatch_time_t completionTime = [self communicationAvatarCurrentTime];
+              @synchronized(result) {
+                result.URL = downloadedURL;
+                result.completionTime = completionTime;
+                result.completed = YES;
+                result.usable = completionTime < deadline;
+              }
+            });
+            return download;
+          };
+
+      NSURL * (^waitForRemoteDownload)(dispatch_group_t,
+                                       NotifeeCoreCommunicationAvatarDownloadResult *) =
+          ^NSURL *(dispatch_group_t download,
+                   NotifeeCoreCommunicationAvatarDownloadResult *result) {
+        dispatch_group_wait(download, deadline);
+        @synchronized(result) {
+          if (result.isCompleted && result.isUsable) {
+            return result.URL;
+          }
+          return nil;
+        }
+      };
+
+      if (remoteDownloadsMayStart && senderAvatarIsRemote) {
+        senderAvatarResult = [NotifeeCoreCommunicationAvatarDownloadResult new];
+        senderAvatarDownload = startRemoteDownload(senderAvatarValue, senderAvatarResult);
+      }
+
+      if (remoteDownloadsMayStart && !sharesAvatar && groupAvatarIsRemote) {
+        groupAvatarResult = [NotifeeCoreCommunicationAvatarDownloadResult new];
+        groupAvatarDownload = startRemoteDownload(groupAvatarValue, groupAvatarResult);
+      }
+
+      if (senderAvatarDownload != nil) {
+        senderAvatarURL = waitForRemoteDownload(senderAvatarDownload, senderAvatarResult);
+      } else if (!senderAvatarIsRemote && senderAvatarValue != nil) {
+        senderAvatarURL = [self getURLFromString:senderAvatarValue];
+      }
+
+      if (sharesAvatar) {
+        groupAvatarURL = senderAvatarURL;
+      } else if (groupAvatarDownload != nil) {
+        groupAvatarURL = waitForRemoteDownload(groupAvatarDownload, groupAvatarResult);
+      } else if (!groupAvatarIsRemote && groupAvatarValue != nil) {
+        groupAvatarURL = [self getURLFromString:groupAvatarValue];
+      }
+    }
+
     // Parse sender's avatar
     INImage *avatar = nil;
-    if (sender[@"avatar"] != nil) {
-      NSURL *url = [self getURLFromString:sender[@"avatar"]];
-      avatar = [INImage imageWithURL:url];
+    if (senderAvatarURL != nil) {
+      avatar = [INImage imageWithURL:senderAvatarURL];
     }
 
     INPerson *senderPerson = [[INPerson alloc] initWithPersonHandle:senderPersonHandle
@@ -1305,8 +1452,7 @@ static NSInteger const kNotifeeRollingTargetPerTrigger = 32;
                                                  sender:senderPerson
                                             attachments:nil];
 
-    if (communicationInfo[@"groupAvatar"] != nil) {
-      NSURL *groupAvatarURL = [[NSURL alloc] initWithString:communicationInfo[@"groupAvatar"]];
+    if (groupAvatarURL != nil) {
       INImage *groupAvatarImage = [INImage imageWithURL:groupAvatarURL];
 
       [intent setImage:groupAvatarImage forParameterNamed:@"speakableGroupName"];

package/jest-mock.js

@@ -83,6 +83,7 @@ export const testNotificationSettings = {
   authorizationStatus: Notification.AuthorizationStatus.AUTHORIZED,
   android: {
     alarm: NotificationAndroid.AndroidNotificationSetting.ENABLED,
+    fullScreenIntent: NotificationAndroid.AndroidNotificationSetting.ENABLED,
   },
   ios: {
     alert: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notify-kit",
-  "version": "10.5.0",
+  "version": "10.6.0",
   "author": "Marco Crupi",
   "description": "Maintained Notifee-compatible React Native notifications library for Android, iOS, FCM Mode, rich notifications, foreground services, and Expo CNG development builds.",
   "main": "dist/index.js",

package/server/dist/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAarD,wBAAgB,aAAa,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,CAwHhE"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAarD,wBAAgB,aAAa,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,CA4IhE"}

package/server/dist/validation.js

@@ -97,5 +97,19 @@ function validateInput(input) {
             throw err('Validation', "'options.collapseKey' must be a non-empty string");
         }
     }
+    const actions = notification.android?.actions;
+    if (Array.isArray(actions)) {
+        const pressActionIds = new Set();
+        for (const action of actions) {
+            const pressActionId = action?.pressAction?.id;
+            if (typeof pressActionId !== 'string') {
+                continue;
+            }
+            if (pressActionIds.has(pressActionId)) {
+                throw err('Android', "'notification.android.actions' pressAction IDs must be unique within the notification");
+            }
+            pressActionIds.add(pressActionId);
+        }
+    }
 }
 //# sourceMappingURL=validation.js.map

package/server/dist/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"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"}

package/server/src/validation.ts

@@ -131,4 +131,24 @@ export function validateInput(input: NotifyKitPayloadInput): void {
       throw err('Validation', "'options.collapseKey' must be a non-empty string");
     }
   }
+
+  const actions = notification.android?.actions;
+  if (Array.isArray(actions)) {
+    const pressActionIds = new Set<string>();
+
+    for (const action of actions) {
+      const pressActionId = action?.pressAction?.id;
+      if (typeof pressActionId !== 'string') {
+        continue;
+      }
+
+      if (pressActionIds.has(pressActionId)) {
+        throw err(
+          'Android',
+          "'notification.android.actions' pressAction IDs must be unique within the notification",
+        );
+      }
+      pressActionIds.add(pressActionId);
+    }
+  }
 }

package/src/NotifeeApiModule.ts

@@ -602,6 +602,7 @@ export default class NotifeeApiModule extends NotifeeNativeModule implements Mod
             ios,
             android: {
               alarm: AndroidNotificationSetting.ENABLED,
+              fullScreenIntent: AndroidNotificationSetting.ENABLED,
             },
             web: {},
           };
@@ -614,6 +615,7 @@ export default class NotifeeApiModule extends NotifeeNativeModule implements Mod
       authorizationStatus: AuthorizationStatus.NOT_DETERMINED,
       android: {
         alarm: AndroidNotificationSetting.ENABLED,
+        fullScreenIntent: AndroidNotificationSetting.ENABLED,
       },
       ios: {
         alert: 1,
@@ -725,6 +727,7 @@ export default class NotifeeApiModule extends NotifeeNativeModule implements Mod
             ios,
             android: {
               alarm: AndroidNotificationSetting.ENABLED,
+              fullScreenIntent: AndroidNotificationSetting.ENABLED,
             },
             web: {},
           };
@@ -737,6 +740,7 @@ export default class NotifeeApiModule extends NotifeeNativeModule implements Mod
       authorizationStatus: AuthorizationStatus.NOT_DETERMINED,
       android: {
         alarm: AndroidNotificationSetting.ENABLED,
+        fullScreenIntent: AndroidNotificationSetting.ENABLED,
       },
       ios: {
         alert: 1,

package/src/types/Notification.ts

@@ -277,7 +277,8 @@ export interface NotificationPressAction {
 /**
  * The interface used to describe a full-screen action for a notification.
  *
- * By setting a `fullScreenAction`, when the notification is displayed, it will launch a full-screen intent.
+ * Setting a `fullScreenAction` configures the notification to request Full-Screen Intent presentation from Android.
+ * Actual full-screen presentation depends on the app's Full-Screen Intent access and Android platform conditions.
  *
  * On Android; when provided to a notification action, the action will only open you application if
  * a `launchActivity` and/or a `mainComponent` is provided.

package/src/types/NotificationAndroid.ts

@@ -62,9 +62,9 @@ export interface NotificationAndroid {
   autoCancel?: boolean;
 
   /**
-   * Overrides the current number of active notifications shown on the device.
-   *
-   * If no number is provided, the system displays the current number of active notifications.
+   * Sets the number associated with this notification. Compatible Android launchers may use it for
+   * the app icon badge, but numeric display is launcher-dependent and it is not equivalent to the
+   * global iOS `notifee.setBadgeCount()` API.
    */
   badgeCount?: number;
 
@@ -276,8 +276,10 @@ export interface NotificationAndroid {
   pressAction?: NotificationPressAction | null;
 
   /**
-   * The `fullScreenAction` property allows you to show a custom UI
-   * in full screen when the notification is displayed.
+   * The `fullScreenAction` property requests Full-Screen Intent presentation from Android
+   * when the notification is displayed.
+   *
+   * Actual full-screen presentation depends on the app's Full-Screen Intent access and Android platform conditions.
    *
    * View the [FullScreenAction](/react-native/android/behaviour#full-screen) documentation to learn
    * more.
@@ -501,6 +503,17 @@ export interface AndroidNotificationSettings {
    * View the [Trigger](/react-native/android/triggers#android-12-limitations) documentation for more information.
    */
   alarm: AndroidNotificationSetting;
+
+  /**
+   * Enum describing whether the app currently has the Android access required to use full-screen intents.
+   *
+   * API < 29 reports `ENABLED` because the later permission model does not apply. API 29–33 reflects
+   * `USE_FULL_SCREEN_INTENT`. API 34+ reflects Android's full-screen intent special app access,
+   * which may be restricted or revoked by the system, installer, or user.
+   *
+   * `ENABLED` does not guarantee that a particular notification will be presented full-screen.
+   */
+  fullScreenIntent?: AndroidNotificationSetting;
 }
 
 /**

package/src/validators/validateAndroidNotification.ts

@@ -103,6 +103,13 @@ export default function validateAndroidNotification(
       throw new Error(`'notification.android.actions' invalid AndroidAction. ${e.message}.`);
     }
 
+    const pressActionIds = new Set<string>(actions.map(action => action.pressAction.id));
+    if (pressActionIds.size !== actions.length) {
+      throw new Error(
+        "'notification.android.actions' pressAction IDs must be unique within the notification.",
+      );
+    }
+
     if (actions.length) {
       out.actions = actions;
     }

package/src/version.ts

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