From 4e0583664b2f988a7697e3ee29359efb29f630e5 Mon Sep 17 00:00:00 2001 From: steffenhaak Date: Mon, 24 Mar 2025 15:59:28 +0100 Subject: [PATCH 1/2] fix: incorrect parsing of notification response in application_onDidFinishLaunchingNotification --- .../Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m index 74bbcb5142e0..bcb43b3b724f 100644 --- a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m +++ b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m @@ -214,7 +214,8 @@ - (void)messaging:(nonnull FIRMessaging *)messaging - (void)application_onDidFinishLaunchingNotification:(nonnull NSNotification *)notification { // Setup UIApplicationDelegate. #if TARGET_OS_OSX - NSDictionary *remoteNotification = notification.userInfo[NSApplicationLaunchUserNotificationKey]; + UNNotificationResponse *notificationResponse = notification.userInfo[NSApplicationLaunchUserNotificationKey]; + NSDictionary *remoteNotification = notificationResponse.notification.request.content.userInfo; #else NSDictionary *remoteNotification = notification.userInfo[UIApplicationLaunchOptionsRemoteNotificationKey]; From c64982a12ef95c752e13bacc6f8b4da6ddb7a3bb Mon Sep 17 00:00:00 2001 From: Steffen Haak Date: Thu, 26 Jun 2025 13:36:58 +0200 Subject: [PATCH 2/2] fix: clang-format for code style --- .../Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m index bcb43b3b724f..67f26a63878c 100644 --- a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m +++ b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m @@ -214,7 +214,8 @@ - (void)messaging:(nonnull FIRMessaging *)messaging - (void)application_onDidFinishLaunchingNotification:(nonnull NSNotification *)notification { // Setup UIApplicationDelegate. #if TARGET_OS_OSX - UNNotificationResponse *notificationResponse = notification.userInfo[NSApplicationLaunchUserNotificationKey]; + UNNotificationResponse *notificationResponse = + notification.userInfo[NSApplicationLaunchUserNotificationKey]; NSDictionary *remoteNotification = notificationResponse.notification.request.content.userInfo; #else NSDictionary *remoteNotification =