Skip to content

fix(messaging, ios): register app delegate with google utilities for swizzling #13525

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
russellwheatley merged 4 commits into from
Oct 23, 2024
Merged

fix(messaging, ios): register app delegate with google utilities for swizzling #13525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b95c791
chore: hide .build from SPM
russellwheatley Oct 15, 2024
f5dd5a3
fix(messaging, ios): register app delegate with google utilities for …
russellwheatley Oct 21, 2024
c9b4794
Merge branch 'main' into messaging-13476
russellwheatley Oct 21, 2024
27e0476
format
russellwheatley Oct 21, 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
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,4 @@ firebase-debug.log
firestore-debug.log
database-debug.log
ui-debug.log

**/.build/**/*
**/.build/**/*
1 change: 1 addition & 0 deletions packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ API_AVAILABLE(ios(10.0))
@interface FLTFirebaseMessagingPlugin : FLTFirebasePlugin <FlutterPlugin,
FLTFirebasePlugin,
FIRMessagingDelegate,
UIApplicationDelegate,
UNUserNotificationCenterDelegate>
#else
@interface FLTFirebaseMessagingPlugin
Expand Down
9 changes: 5 additions & 4 deletions packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,6 @@ - (void)application_onDidFinishLaunchingNotification:(nonnull NSNotification *)n
_initialNotificationGathered = YES;
[self initialNotificationCallback];

#if TARGET_OS_OSX
// For macOS we use swizzling to intercept as addApplicationDelegate does not exist on the macOS
// registrar Flutter implementation.
[GULAppDelegateSwizzler registerAppDelegateInterceptor:self];
[GULAppDelegateSwizzler proxyOriginalDelegateIncludingAPNSMethods];

Expand All @@ -246,7 +243,11 @@ - (void)application_onDidFinishLaunchingNotification:(nonnull NSNotification *)n
didReceiveRemoteNotificationWithCompletionSEL,
method_getImplementation(donorMethod), method_getTypeEncoding(donorMethod));
}
#else
#if !TARGET_OS_OSX
// `[_registrar addApplicationDelegate:self];` alone doesn't work for notifications to be received
// without the above swizzling This commit:
// https://github.com/google/GoogleUtilities/pull/162/files#diff-6bb6d1c46632fc66405a524071cc4baca5fc6a1a6c0eefef81d8c3e2c89cbc13L520-L533
// broke notifications which was released with firebase-ios-sdk v11.0.0
[_registrar addApplicationDelegate:self];
#endif

Expand Down
Loading