Skip to content

[Messaging] Prep FIRMessagingExtensionHelper usage for refactored 1P target #13691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2024
Merged

[Messaging] Prep FIRMessagingExtensionHelper usage for refactored 1P target #13691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5619cc4
[Messaging] Prep `FIRMessagingExtensionHelper` usage for refactored 1…
ncooke3 Sep 21, 2024
b6630fe
Style
ncooke3 Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions FirebaseMessaging/Sources/FIRMessaging.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@
#import "FirebaseMessaging/Sources/FIRMessagingUtilities.h"
#import "FirebaseMessaging/Sources/FIRMessaging_Private.h"
#import "FirebaseMessaging/Sources/NSError+FIRMessaging.h"
#if __has_include( \
"FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
#import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h"
#endif // __has_include("FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
#import "FirebaseMessaging/Sources/Token/FIRMessagingAuthService.h"
#import "FirebaseMessaging/Sources/Token/FIRMessagingTokenInfo.h"
#import "FirebaseMessaging/Sources/Token/FIRMessagingTokenManager.h"
Expand Down Expand Up @@ -131,6 +134,8 @@ + (FIRMessaging *)messaging {
return (FIRMessaging *)instance;
}

#if __has_include( \
"FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
+ (FIRMessagingExtensionHelper *)extensionHelper {
static dispatch_once_t once;
static FIRMessagingExtensionHelper *extensionHelper;
Expand All @@ -139,6 +144,8 @@ + (FIRMessagingExtensionHelper *)extensionHelper {
});
return extensionHelper;
}
#endif // __has_include("FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")

- (instancetype)initWithAnalytics:(nullable id<FIRAnalyticsInterop>)analytics
userDefaults:(GULUserDefaults *)defaults
heartbeatLogger:(FIRHeartbeatLogger *)heartbeatLogger {
Expand Down
4 changes: 4 additions & 0 deletions FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ NS_SWIFT_NAME(MessagingMessageInfo)
@end

@class FIRMessaging;
#if __has_include("FIRMessagingExtensionHelper.h")
@class FIRMessagingExtensionHelper;
#endif // __has_include("FIRMessagingExtensionHelper.h")

/**
* A protocol to handle token update or data message delivery from FCM.
Expand Down Expand Up @@ -184,6 +186,7 @@ NS_SWIFT_NAME(Messaging)
*/
+ (instancetype)messaging NS_SWIFT_NAME(messaging());

#if __has_include("FIRMessagingExtensionHelper.h")
/**
* Use the MessagingExtensionHelper to populate rich UI content for your notifications.
* For example, if an image URL is set in your notification payload or on the console,
Expand All @@ -194,6 +197,7 @@ NS_SWIFT_NAME(Messaging)
*/
+ (FIRMessagingExtensionHelper *)extensionHelper NS_SWIFT_NAME(serviceExtension())
NS_AVAILABLE(10.14, 10.0);
#endif // __has_include("FIRMessagingExtensionHelper.h")

/**
* Unavailable. Use +messaging instead.
Expand Down
2 changes: 2 additions & 0 deletions FirebaseMessaging/Sources/Public/FirebaseMessaging/FirebaseMessaging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@
*/

#import "FIRMessaging.h"
#if __has_include("FIRMessagingExtensionHelper.h")
#import "FIRMessagingExtensionHelper.h"
#endif // __has_include("FIRMessagingExtensionHelper.h")
Loading