diff --git a/ios/NotifeeCore.xcframework/Info.plist b/ios/NotifeeCore.xcframework/Info.plist index 10c62f9..a054f96 100644 --- a/ios/NotifeeCore.xcframework/Info.plist +++ b/ios/NotifeeCore.xcframework/Info.plist @@ -6,47 +6,47 @@ LibraryIdentifier - ios-arm64_i386_x86_64-simulator + ios-arm64_x86_64-maccatalyst LibraryPath NotifeeCore.framework SupportedArchitectures arm64 - i386 x86_64 SupportedPlatform ios SupportedPlatformVariant - simulator + maccatalyst LibraryIdentifier - ios-arm64_armv7 + ios-arm64_i386_x86_64-simulator LibraryPath NotifeeCore.framework SupportedArchitectures arm64 - armv7 + i386 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator LibraryIdentifier - ios-arm64_x86_64-maccatalyst + ios-arm64_armv7 LibraryPath NotifeeCore.framework SupportedArchitectures arm64 - x86_64 + armv7 SupportedPlatform ios - SupportedPlatformVariant - maccatalyst CFBundlePackageType diff --git a/ios/NotifeeCore.xcframework/ios-arm64_armv7/NotifeeCore.framework/Headers/NotifeeCore.h b/ios/NotifeeCore.xcframework/ios-arm64_armv7/NotifeeCore.framework/Headers/NotifeeCore.h index 837debe..2aac2ce 100644 --- a/ios/NotifeeCore.xcframework/ios-arm64_armv7/NotifeeCore.framework/Headers/NotifeeCore.h +++ b/ios/NotifeeCore.xcframework/ios-arm64_armv7/NotifeeCore.framework/Headers/NotifeeCore.h @@ -45,7 +45,7 @@ typedef NS_ENUM(NSInteger, NotifeeCoreEventType) { @protocol NotifeeCoreDelegate @optional -- (void)didReceiveNotifeeCoreEvent:(NSDictionary *_Nonnull)event; +- (void)didReceiveNotifeeCoreEvent:(NSDictionary *_Nonnull)event foreground:(BOOL)foreground; @end @interface NotifeeCore : NSObject diff --git a/ios/NotifeeCore.xcframework/ios-arm64_armv7/NotifeeCore.framework/NotifeeCore b/ios/NotifeeCore.xcframework/ios-arm64_armv7/NotifeeCore.framework/NotifeeCore index bd00559..07ca539 100644 Binary files a/ios/NotifeeCore.xcframework/ios-arm64_armv7/NotifeeCore.framework/NotifeeCore and b/ios/NotifeeCore.xcframework/ios-arm64_armv7/NotifeeCore.framework/NotifeeCore differ diff --git a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/Headers/NotifeeCore.h b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/Headers/NotifeeCore.h index 837debe..2aac2ce 100644 --- a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/Headers/NotifeeCore.h +++ b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/Headers/NotifeeCore.h @@ -45,7 +45,7 @@ typedef NS_ENUM(NSInteger, NotifeeCoreEventType) { @protocol NotifeeCoreDelegate @optional -- (void)didReceiveNotifeeCoreEvent:(NSDictionary *_Nonnull)event; +- (void)didReceiveNotifeeCoreEvent:(NSDictionary *_Nonnull)event foreground:(BOOL)foreground; @end @interface NotifeeCore : NSObject diff --git a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/NotifeeCore b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/NotifeeCore index 5f49ffb..1cb00fe 100644 Binary files a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/NotifeeCore and b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/NotifeeCore differ diff --git a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeDirectory b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeDirectory index 01fd082..0acfdbc 100644 Binary files a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeDirectory and b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeDirectory differ diff --git a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeRequirements-1 b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeRequirements-1 index 66fda20..040ae0d 100644 Binary files a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeRequirements-1 and b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeRequirements-1 differ diff --git a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeResources b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeResources index a860d0e..a740b92 100644 --- a/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeResources +++ b/ios/NotifeeCore.xcframework/ios-arm64_i386_x86_64-simulator/NotifeeCore.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/NotifeeCore.h - Bw5ygMCtWPTJENK7K+7ufpFC+O4= + 8mYCTy9qRvV7N2iLL6tOOaAZUYU= Info.plist @@ -23,11 +23,11 @@ hash - Bw5ygMCtWPTJENK7K+7ufpFC+O4= + 8mYCTy9qRvV7N2iLL6tOOaAZUYU= hash2 - FGqqE208vli0ZHW09ph44+F6GkRNCDkTZRFrQSkfHvU= + onLq0FNJNbhWALkP7G8BqLjNhUGddQXK/XqTYAZFwvo= Modules/module.modulemap diff --git a/ios/NotifeeCore.xcframework/ios-arm64_x86_64-maccatalyst/NotifeeCore.framework/Headers/NotifeeCore.h b/ios/NotifeeCore.xcframework/ios-arm64_x86_64-maccatalyst/NotifeeCore.framework/Headers/NotifeeCore.h index 837debe..2aac2ce 100644 --- a/ios/NotifeeCore.xcframework/ios-arm64_x86_64-maccatalyst/NotifeeCore.framework/Headers/NotifeeCore.h +++ b/ios/NotifeeCore.xcframework/ios-arm64_x86_64-maccatalyst/NotifeeCore.framework/Headers/NotifeeCore.h @@ -45,7 +45,7 @@ typedef NS_ENUM(NSInteger, NotifeeCoreEventType) { @protocol NotifeeCoreDelegate @optional -- (void)didReceiveNotifeeCoreEvent:(NSDictionary *_Nonnull)event; +- (void)didReceiveNotifeeCoreEvent:(NSDictionary *_Nonnull)event foreground:(BOOL)foreground; @end @interface NotifeeCore : NSObject diff --git a/ios/NotifeeCore.xcframework/ios-arm64_x86_64-maccatalyst/NotifeeCore.framework/NotifeeCore b/ios/NotifeeCore.xcframework/ios-arm64_x86_64-maccatalyst/NotifeeCore.framework/NotifeeCore index b3e9c66..c716a75 100644 Binary files a/ios/NotifeeCore.xcframework/ios-arm64_x86_64-maccatalyst/NotifeeCore.framework/NotifeeCore and b/ios/NotifeeCore.xcframework/ios-arm64_x86_64-maccatalyst/NotifeeCore.framework/NotifeeCore differ diff --git a/ios/RNNotifee/NotifeeApiModule.m b/ios/RNNotifee/NotifeeApiModule.m index a322d93..c5508eb 100644 --- a/ios/RNNotifee/NotifeeApiModule.m +++ b/ios/RNNotifee/NotifeeApiModule.m @@ -55,7 +55,8 @@ - (id)init { - (void)startObserving { hasListeners = YES; for (NSDictionary *eventBody in pendingCoreEvents) { - [self sendNotifeeCoreEvent:eventBody]; + BOOL *foreground = [UIApplication sharedApplication].applicationState == UIApplicationStateActive; + [self sendNotifeeCoreEvent:eventBody foreground: foreground]; } [pendingCoreEvents removeAllObjects]; } @@ -70,26 +71,21 @@ + (BOOL)requiresMainQueueSetup { #pragma mark - Events -- (void)didReceiveNotifeeCoreEvent:(NSDictionary *_Nonnull)event { +- (void)didReceiveNotifeeCoreEvent:(NSDictionary *_Nonnull)event foreground: (BOOL)foreground; { if (hasListeners) { - [self sendNotifeeCoreEvent:event]; + [self sendNotifeeCoreEvent:event foreground:foreground]; } else { [pendingCoreEvents addObject:event]; } } -- (void)sendNotifeeCoreEvent:(NSDictionary *_Nonnull)eventBody { - dispatch_after( - dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - if (RCTRunningInAppExtension() || - [UIApplication sharedApplication].applicationState == UIApplicationStateBackground) { +- (void)sendNotifeeCoreEvent:(NSDictionary *_Nonnull)eventBody foreground: (BOOL)foreground; { + if (RCTRunningInAppExtension() || !foreground ) { [self sendEventWithName:kReactNativeNotifeeNotificationBackgroundEvent body:eventBody]; } else { [self sendEventWithName:kReactNativeNotifeeNotificationEvent body:eventBody]; } - }); } - // TODO(helenaford): look into a custom format style for React Native Method signatures // clang-format off diff --git a/package.json b/package.json index 6fa5104..d4279dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@notifee/react-native", - "version": "1.9.1", + "version": "1.11.0-alpha.0", "author": "Invertase (http://invertase.io)", "description": "Notifee - a feature rich notifications library for React Native.", "main": "dist/index.js",