Skip to content

Commit 846a41f

Browse files
authored
[Messaging] Prep FIRMessagingExtensionHelper usage for refactored 1P target (#13691)
1 parent 59c5703 commit 846a41f

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

FirebaseMessaging/Sources/FIRMessaging.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
#import "FirebaseMessaging/Sources/FIRMessagingUtilities.h"
4141
#import "FirebaseMessaging/Sources/FIRMessaging_Private.h"
4242
#import "FirebaseMessaging/Sources/NSError+FIRMessaging.h"
43+
#if __has_include( \
44+
"FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
4345
#import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h"
46+
#endif // __has_include("FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
4447
#import "FirebaseMessaging/Sources/Token/FIRMessagingAuthService.h"
4548
#import "FirebaseMessaging/Sources/Token/FIRMessagingTokenInfo.h"
4649
#import "FirebaseMessaging/Sources/Token/FIRMessagingTokenManager.h"
@@ -131,6 +134,8 @@ + (FIRMessaging *)messaging {
131134
return (FIRMessaging *)instance;
132135
}
133136

137+
#if __has_include( \
138+
"FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
134139
+ (FIRMessagingExtensionHelper *)extensionHelper {
135140
static dispatch_once_t once;
136141
static FIRMessagingExtensionHelper *extensionHelper;
@@ -139,6 +144,8 @@ + (FIRMessagingExtensionHelper *)extensionHelper {
139144
});
140145
return extensionHelper;
141146
}
147+
#endif // __has_include("FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
148+
142149
- (instancetype)initWithAnalytics:(nullable id<FIRAnalyticsInterop>)analytics
143150
userDefaults:(GULUserDefaults *)defaults
144151
heartbeatLogger:(FIRHeartbeatLogger *)heartbeatLogger {

FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ NS_SWIFT_NAME(MessagingMessageInfo)
136136
@end
137137

138138
@class FIRMessaging;
139+
#if __has_include("FIRMessagingExtensionHelper.h")
139140
@class FIRMessagingExtensionHelper;
141+
#endif // __has_include("FIRMessagingExtensionHelper.h")
140142

141143
/**
142144
* A protocol to handle token update or data message delivery from FCM.
@@ -184,6 +186,7 @@ NS_SWIFT_NAME(Messaging)
184186
*/
185187
+ (instancetype)messaging NS_SWIFT_NAME(messaging());
186188

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

198202
/**
199203
* Unavailable. Use +messaging instead.

FirebaseMessaging/Sources/Public/FirebaseMessaging/FirebaseMessaging.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
1515
*/
1616

1717
#import "FIRMessaging.h"
18+
#if __has_include("FIRMessagingExtensionHelper.h")
1819
#import "FIRMessagingExtensionHelper.h"
20+
#endif // __has_include("FIRMessagingExtensionHelper.h")

0 commit comments

Comments
 (0)