From bd1f0a455cb5a26279ded1dd9ca8a0351f3aa36e Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 08:24:29 +0200
Subject: [PATCH 01/54] Bump version to 3.3

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bf58d10..e1cb8f8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -26,7 +26,7 @@ variables:
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
   majorVersion: 3
-  minorVersion: 2
+  minorVersion: 3
   patchVersion: $[counter(format('{0}.{1}', variables.majorVersion, variables.minorVersion), 0)]
   ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
     # Versioning: 1.0.0

From 7b0c8fbf0af1698c59d6b6c48079429cf71545af Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 08:24:38 +0200
Subject: [PATCH 02/54] Update release notes

---
 .../Plugin.FirebasePushNotifications.csproj           | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index 7a5359c..6d5e501 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -37,7 +37,14 @@
 		<RepositoryUrl>https://github.com/thomasgalliker/Plugin.FirebasePushNotifications</RepositoryUrl>
 		<Company>superdev GmbH</Company>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-		<PackageReleaseNotes>3.1
+		<PackageReleaseNotes>3.3
+- Bug fixes and refactorings.
+
+3.2
+- Improved default notification channel handling.
+- Bug fixes and refactorings.
+
+3.1
 - Extend INotificationChannels to manage notification channel groups.
 - Internal refactoring of INotificationChannels implementation.
 - Removed properties IsActive and IsDefault from NotificationChannelRequest. Set the default notification channel via UseFirebasePushNotifications(o => o.Android.DefaultNotificationChannelId = ...).
@@ -104,6 +111,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
-    <PackageReference Include="AdamE.Firebase.iOS.CloudMessaging" Version="11.6.0" />
+    <PackageReference Include="AdamE.Firebase.iOS.CloudMessaging" Version="11.10.0" />
   </ItemGroup>
 </Project>

From 3789176b5fe0fc8f68572db1d0528ff9b19f73ac Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 08:24:48 +0200
Subject: [PATCH 03/54] Extend log message

---
 .../Platforms/Android/NotificationBuilder.cs                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
index 88b0941..d45ad68 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
@@ -192,7 +192,8 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
             {
                 this.logger.LogError(
                     $"NotificationCompat.Builder requires a notification channel to work properly. " +
-                    $"Use {nameof(INotificationChannels)}.{nameof(INotificationChannels.CreateNotificationChannels)} " +
+                    $"Use {nameof(INotificationChannels)}.{nameof(INotificationChannels.CreateNotificationChannels)} or " +
+                    $"{nameof(INotificationChannels)}.{nameof(INotificationChannels.SetNotificationChannels)} " +
                     $"to create at least one notification channel.");
                 return;
             }

From e92ab6b8d90a882c0ba6ee30ded324ee477f561a Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 08:33:41 +0200
Subject: [PATCH 04/54] Reformat log message + log missing default notification
 channel as warning

---
 .../Android/Channels/NotificationChannels.cs         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
index f54d360..c0653df 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
@@ -194,6 +194,8 @@ public void SetNotificationChannels([NotNull] NotificationChannelRequest[] notif
                 return;
             }
 
+            // If no default notification channel is requested,
+            // we create a default notification channel with some predefined properties.
             if (!notificationChannelRequests.Any(c => c.IsDefault))
             {
                 var metadata = MetadataHelper.GetMetadata();
@@ -205,18 +207,20 @@ public void SetNotificationChannels([NotNull] NotificationChannelRequest[] notif
                 {
                     ChannelId = channelId,
                     ChannelName = Constants.DefaultNotificationChannelName,
+                    IsDefault = true,
                     LockscreenVisibility = NotificationVisibility.Public,
-                    Importance = this.options.Android.DefaultNotificationImportance,
-                    IsDefault = true
+                    Importance = this.options.Android.DefaultNotificationImportance
                 };
 
                 const string optionsPath = $"options.{nameof(FirebasePushNotificationOptions.Android)}." +
                                            $"{nameof(FirebasePushNotificationAndroidOptions.NotificationChannels)}";
 
-                this.logger.LogDebug(
-                    $"No default notification channel specified in {optionsPath}. Creating default notification channel with {Environment.NewLine}" +
+                this.logger.LogWarning(
+                    $"Missing default notification channel (IsDefault=true) in {optionsPath}. " +
+                    $"A default notification channel will be created with the following properties: {Environment.NewLine}" +
                     $"> ChannelId={defaultNotificationChannelRequest.ChannelId}, {Environment.NewLine}" +
                     $"> ChannelName={defaultNotificationChannelRequest.ChannelName}, {Environment.NewLine}" +
+                    $"> IsDefault={defaultNotificationChannelRequest.IsDefault}, {Environment.NewLine}" +
                     $"> LockscreenVisibility={defaultNotificationChannelRequest.LockscreenVisibility}, {Environment.NewLine}" +
                     $"> Importance={defaultNotificationChannelRequest.Importance}");
 

From b635ccb5cb89a70a403649f78d2ae82596d7dfd3 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 12:22:09 +0200
Subject: [PATCH 05/54] Display "IsDefault" in sample app

---
 .../NotificationChannelViewModel.cs           |  7 +++--
 .../NotificationChannelItemTemplate.xaml      | 29 +++++++++++++------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Samples/MauiSampleApp/ViewModels/NotificationChannelViewModel.cs b/Samples/MauiSampleApp/ViewModels/NotificationChannelViewModel.cs
index 043fc02..58f0663 100644
--- a/Samples/MauiSampleApp/ViewModels/NotificationChannelViewModel.cs
+++ b/Samples/MauiSampleApp/ViewModels/NotificationChannelViewModel.cs
@@ -34,10 +34,11 @@ public NotificationChannelViewModel(
         {
             this.ChannelId = notificationChannel.Id;
             this.ChannelName = notificationChannel.Name;
+            this.IsDefault = notificationChannel.Id == NotificationChannels.Current.Channels.DefaultNotificationChannelId;
             this.Description = notificationChannel.Description;
-            this.LockscreenVisibility = Enum.GetName(notificationChannel.LockscreenVisibility) ?? $"{notificationChannel.LockscreenVisibility}";
+            this.LockscreenVisibility = Enum.GetName(typeof(NotificationVisibility), notificationChannel.LockscreenVisibility) ?? $"{notificationChannel.LockscreenVisibility}";
             this.Group = notificationChannel.Group ?? "null";
-            this.Importance = Enum.GetName(notificationChannel.Importance);
+            this.Importance = Enum.GetName(typeof(NotificationImportance), notificationChannel.Importance);
 
             this.logger = logger;
             this.dialogService = dialogService;
@@ -49,6 +50,8 @@ public NotificationChannelViewModel(
 
         public string ChannelName { get; }
 
+        public bool IsDefault { get; }
+
         public string Description { get; }
 
         public string LockscreenVisibility { get; }
diff --git a/Samples/MauiSampleApp/Views/ItemTemplates/NotificationChannelItemTemplate.xaml b/Samples/MauiSampleApp/Views/ItemTemplates/NotificationChannelItemTemplate.xaml
index 587e247..d0e92d1 100644
--- a/Samples/MauiSampleApp/Views/ItemTemplates/NotificationChannelItemTemplate.xaml
+++ b/Samples/MauiSampleApp/Views/ItemTemplates/NotificationChannelItemTemplate.xaml
@@ -9,7 +9,7 @@
     <Grid
         ColumnDefinitions="2*, 3*, Auto"
         ColumnSpacing="4"
-        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
+        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
 
         <Label
             Grid.Row="0"
@@ -38,50 +38,61 @@
             Grid.Row="2"
             Grid.Column="0"
             LineBreakMode="MiddleTruncation"
-            Text="Description:" />
+            Text="IsDefault:" />
         <Label
             Grid.Row="2"
             Grid.Column="1"
             FontFamily="{StaticResource FontFamily.Monospace.Regular}"
+            Text="{Binding IsDefault}" />
+
+        <Label
+            Grid.Row="3"
+            Grid.Column="0"
+            LineBreakMode="MiddleTruncation"
+            Text="Description:" />
+        <Label
+            Grid.Row="3"
+            Grid.Column="1"
+            FontFamily="{StaticResource FontFamily.Monospace.Regular}"
             LineBreakMode="TailTruncation"
             MaxLines="3"
             Text="{Binding Description}" />
 
         <Label
-            Grid.Row="3"
+            Grid.Row="4"
             Grid.Column="0"
             LineBreakMode="MiddleTruncation"
             Text="LockscreenVisibility:" />
         <Label
-            Grid.Row="3"
+            Grid.Row="4"
             Grid.Column="1"
             FontFamily="{StaticResource FontFamily.Monospace.Regular}"
             Text="{Binding LockscreenVisibility}" />
 
         <Label
-            Grid.Row="4"
+            Grid.Row="5"
             Grid.Column="0"
             LineBreakMode="MiddleTruncation"
             Text="Group:" />
         <Label
-            Grid.Row="4"
+            Grid.Row="5"
             Grid.Column="1"
             FontFamily="{StaticResource FontFamily.Monospace.Regular}"
             Text="{Binding Group}" />
 
         <Label
-            Grid.Row="5"
+            Grid.Row="6"
             Grid.Column="0"
             LineBreakMode="MiddleTruncation"
             Text="Importance:" />
         <Label
-            Grid.Row="5"
+            Grid.Row="6"
             Grid.Column="1"
             FontFamily="{StaticResource FontFamily.Monospace.Regular}"
             Text="{Binding Importance}" />
 
         <Button
-            Grid.RowSpan="6"
+            Grid.RowSpan="7"
             Grid.Column="2"
             Command="{Binding DeleteNotificationChannelCommand}"
             Text="X"

From ae88772cd828339da6284287cd09d82c79df4f94 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 12:23:16 +0200
Subject: [PATCH 06/54] Comment-out unused code

---
 .../Platforms/Android/PNFirebaseMessagingService.cs            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/PNFirebaseMessagingService.cs b/Plugin.FirebasePushNotifications/Platforms/Android/PNFirebaseMessagingService.cs
index 3130a4b..71bd86d 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/PNFirebaseMessagingService.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/PNFirebaseMessagingService.cs
@@ -135,6 +135,7 @@ private void DispatchMessage(Intent intent)
         }
 
         // TODO: Check if this code is still needed or if it can be removed.
+        /*
         private void OnMessageReceived(RemoteMessage remoteMessage)
         {
             this.logger.LogDebug("OnMessageReceived");
@@ -237,7 +238,7 @@ private void OnMessageReceived(RemoteMessage remoteMessage)
             }
 
             this.firebasePushNotification.HandleNotificationReceived(data);
-        }
+        }*/
 
         private void HandleTokenIntent(Intent intent)
         {

From 687e08be69f11fd15dc3492069725feb52a8f9d3 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 12:24:18 +0200
Subject: [PATCH 07/54] Reformat log message

---
 .../Platforms/Android/Channels/NotificationChannels.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
index c0653df..5a26d94 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
@@ -216,13 +216,13 @@ public void SetNotificationChannels([NotNull] NotificationChannelRequest[] notif
                                            $"{nameof(FirebasePushNotificationAndroidOptions.NotificationChannels)}";
 
                 this.logger.LogWarning(
-                    $"Missing default notification channel (IsDefault=true) in {optionsPath}. " +
-                    $"A default notification channel will be created with the following properties: {Environment.NewLine}" +
+                    $"Missing default notification channel (IsDefault=true) in {optionsPath}.{Environment.NewLine}" +
+                    $"A default notification channel with the following properties will be created: {Environment.NewLine}" +
                     $"> ChannelId={defaultNotificationChannelRequest.ChannelId}, {Environment.NewLine}" +
                     $"> ChannelName={defaultNotificationChannelRequest.ChannelName}, {Environment.NewLine}" +
-                    $"> IsDefault={defaultNotificationChannelRequest.IsDefault}, {Environment.NewLine}" +
-                    $"> LockscreenVisibility={defaultNotificationChannelRequest.LockscreenVisibility}, {Environment.NewLine}" +
-                    $"> Importance={defaultNotificationChannelRequest.Importance}");
+                    $"> IsDefault=true, {Environment.NewLine}" +
+                    $"> LockscreenVisibility=NotificationVisibility.Public, {Environment.NewLine}" +
+                    $"> Importance=NotificationImportance.Default");
 
                 notificationChannelRequests = notificationChannelRequests
                     .Prepend(defaultNotificationChannelRequest)

From 2380a3999d4eaeae4e704415d046c09d6d6bf0cd Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 12:24:57 +0200
Subject: [PATCH 08/54] Use NotificationImportance.Default for default
 notification channel

---
 .../Platforms/Android/Channels/NotificationChannels.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
index 5a26d94..9acd2cf 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
@@ -209,7 +209,7 @@ public void SetNotificationChannels([NotNull] NotificationChannelRequest[] notif
                     ChannelName = Constants.DefaultNotificationChannelName,
                     IsDefault = true,
                     LockscreenVisibility = NotificationVisibility.Public,
-                    Importance = this.options.Android.DefaultNotificationImportance
+                    Importance = NotificationImportance.Default
                 };
 
                 const string optionsPath = $"options.{nameof(FirebasePushNotificationOptions.Android)}." +

From 25fecd418562a667a4c8a82fcdb2ec30b0e4ff92 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 12:25:48 +0200
Subject: [PATCH 09/54] Reformat log messages

---
 .../Platforms/Android/NotificationBuilder.cs          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
index d45ad68..428ae51 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
@@ -45,7 +45,7 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 // we don't display any local notification.
                 this.logger.LogDebug(
                     $"ShouldHandleNotificationReceived returns false " +
-                    $"(Reason: Key '{MessageNotificationKeys.NoUi}' is present)");
+                    $"(Reason: Data key '{MessageNotificationKeys.NoUi}' is present)");
                 return false;
             }
 
@@ -55,7 +55,7 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 // we don't display any local notification.
                 this.logger.LogDebug(
                     $"ShouldHandleNotificationReceived returns false " +
-                    $"(Reason: Key '{Constants.SilentKey}' is present)");
+                    $"(Reason: Data key '{Constants.SilentKey}' is present)");
                 return false;
             }
 
@@ -86,7 +86,8 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 // we show it in a local notification popup.
                 this.logger.LogDebug(
                     $"ShouldHandleNotificationReceived returns true " +
-                    $"(Reason: Default notification importance '{defaultNotificationImportance}' is greater or equal to 'high')");
+                    $"(Reason: Target notification channel with Id={notificationChannel.Id} " +
+                    $"has Importance={notificationChannel.Importance} greater than or equal to 'High')");
                 return true;
             }
 
@@ -202,8 +203,8 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
             if (notificationChannel.Importance < notificationImportance)
             {
                 this.logger.LogWarning(
-                    $"Notification channel '{notificationChannel.Id}' has importance '{notificationChannel.Importance}' " +
-                    $"which is lower than notification importance '{notificationImportance}'");
+                    $"Notification channel with Id={notificationChannel.Id} has Importance={notificationChannel.Importance} " +
+                    $"which is lower than '{notificationImportance}' (as specified in {notificationImportanceSource}).");
             }
 
             var smallIconResource = this.GetSmallIconResource(data, context);

From 832176ccdf8875bf913251dd1f976e2dbcc6b85c Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 12:42:26 +0200
Subject: [PATCH 10/54] Add important note to Importance property

---
 .../Android/Channels/NotificationChannelRequest.cs     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannelRequest.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannelRequest.cs
index aa8cb57..35fa4b0 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannelRequest.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannelRequest.cs
@@ -13,6 +13,14 @@ public class NotificationChannelRequest
         /// Sets or gets, the level of interruption of this notification channel.
         /// Default: <c>NotificationImportance.Default</c>
         /// </summary>
+        /// <remarks>
+        /// Important note:
+        /// The importance of a notification channel cannot be changed programmatically after it is first created.
+        /// Deleting and recreating a notification channel with the same ID does not change its importance.
+        /// Only the user can change the notification settings for an existing channel in system settings.
+        /// If you want to change the importance of a notification channel,
+        /// delete the existing channel and create a new one with a different ID.
+        /// </remarks>
         public NotificationImportance Importance { get; set; } = NotificationImportance.Default;
 
         /// <summary>
@@ -63,7 +71,7 @@ public class NotificationChannelRequest
         public long[] VibrationPattern { get; set; }
 
         /// <summary>
-        /// Sets or gets, whether or not notifications posted to this channel are shown on the lockscreen in full or redacted form.
+        /// Sets or gets, whether notifications posted to this channel are shown on the lockscreen in full or redacted form.
         /// Default: <c> NotificationVisibility.Public</c>.
         /// </summary>
         public NotificationVisibility LockscreenVisibility { get; set; } = NotificationVisibility.Public;

From 4da1ef88f4033a1aa16855260a50ea3e71310827 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 16:04:04 +0200
Subject: [PATCH 11/54] Cleanup

---
 .editorconfig                                   |  2 +-
 .../Android/Channels/INotificationChannels.cs   |  1 +
 .../Android/NotificationPermissions.cs          |  2 +-
 .../MauiSampleApp/ViewModels/MainViewModel.cs   | 17 +++++++++++++----
 .../ViewModels/NotificationChannelViewModel.cs  |  3 ++-
 .../NotificationChannelItemTemplate.xaml        |  1 +
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 3b8b35f..b2d7e6f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,7 +18,7 @@ tab_width = 4
 end_of_line = crlf
 trim_trailing_whitespace = true
 insert_final_newline = false
-max_line_length = 140
+max_line_length = 200
 
 csharp_indent_block_contents = true
 csharp_indent_braces = false
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs
index e6ee353..45d95f4 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs
@@ -103,6 +103,7 @@ public partial interface INotificationChannels
         /// Opens the notification channel settings for <paramref name="notificationChannelId"/>.
         /// </summary>
         /// <param name="notificationChannelId">The notification channel identifier.</param>
+        [SupportedOSPlatform("android26.0")]
         void OpenNotificationChannelSettings(string notificationChannelId);
     }
 }
\ No newline at end of file
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationPermissions.cs b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationPermissions.cs
index a7951af..6a316b5 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationPermissions.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationPermissions.cs
@@ -103,7 +103,7 @@ private bool IsAnyChannelBlocked(string[] channelIds)
                     foreach (var channelId in channelIds)
                     {
                         var channel = this.notificationManager.GetNotificationChannel(channelId);
-                        if (channel != null && channel.Importance == NotificationImportance.None)
+                        if (channel is { Importance: NotificationImportance.None })
                         {
                             return true;
                         }
diff --git a/Samples/MauiSampleApp/ViewModels/MainViewModel.cs b/Samples/MauiSampleApp/ViewModels/MainViewModel.cs
index 73a65e3..a58ce4b 100644
--- a/Samples/MauiSampleApp/ViewModels/MainViewModel.cs
+++ b/Samples/MauiSampleApp/ViewModels/MainViewModel.cs
@@ -546,7 +546,10 @@ private async Task OpenNotificationChannelSettingsAsync()
             {
 #if ANDROID
                 var defaultNotificationChannel = this.notificationChannels.Channels.GetDefault();
-                this.notificationChannels.OpenNotificationChannelSettings(defaultNotificationChannel.Id);
+                if (defaultNotificationChannel != null)
+                {
+                    this.notificationChannels.OpenNotificationChannelSettings(defaultNotificationChannel.Id);
+                }
 #endif
             }
             catch (Exception ex)
@@ -674,7 +677,12 @@ void DeleteNotificationChannel(string id)
                         this.UpdateNotificationChannels();
                     }
 
-                    return new NotificationChannelViewModel(notificationChannelViewModelLogger, this.dialogService, DeleteNotificationChannel, c);
+                    return new NotificationChannelViewModel(
+                        notificationChannelViewModelLogger,
+                        this.dialogService,
+                        this.notificationChannels,
+                        DeleteNotificationChannel,
+                        c);
                 })
                 .ToArray();
 
@@ -930,9 +938,10 @@ private async Task OpenUrlAsync(string url)
             }
         }
 
-        public void OnResume()
+        public async void OnResume()
         {
-            _ = this.UpdateAuthorizationStatusAsync();
+            await this.UpdateAuthorizationStatusAsync();
+            await this.GetNotificationChannelsAsync();
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/MauiSampleApp/ViewModels/NotificationChannelViewModel.cs b/Samples/MauiSampleApp/ViewModels/NotificationChannelViewModel.cs
index 58f0663..2f06ed1 100644
--- a/Samples/MauiSampleApp/ViewModels/NotificationChannelViewModel.cs
+++ b/Samples/MauiSampleApp/ViewModels/NotificationChannelViewModel.cs
@@ -29,12 +29,13 @@ public class NotificationChannelViewModel
         public NotificationChannelViewModel(
             ILogger<NotificationChannelViewModel> logger,
             IDialogService dialogService,
+            INotificationChannels notificationChannels,
             Action<string> deleteNotificationChannel,
             NotificationChannel notificationChannel)
         {
             this.ChannelId = notificationChannel.Id;
             this.ChannelName = notificationChannel.Name;
-            this.IsDefault = notificationChannel.Id == NotificationChannels.Current.Channels.DefaultNotificationChannelId;
+            this.IsDefault = notificationChannel.Id == notificationChannels.Channels.DefaultNotificationChannelId;
             this.Description = notificationChannel.Description;
             this.LockscreenVisibility = Enum.GetName(typeof(NotificationVisibility), notificationChannel.LockscreenVisibility) ?? $"{notificationChannel.LockscreenVisibility}";
             this.Group = notificationChannel.Group ?? "null";
diff --git a/Samples/MauiSampleApp/Views/ItemTemplates/NotificationChannelItemTemplate.xaml b/Samples/MauiSampleApp/Views/ItemTemplates/NotificationChannelItemTemplate.xaml
index d0e92d1..4f77a65 100644
--- a/Samples/MauiSampleApp/Views/ItemTemplates/NotificationChannelItemTemplate.xaml
+++ b/Samples/MauiSampleApp/Views/ItemTemplates/NotificationChannelItemTemplate.xaml
@@ -7,6 +7,7 @@
     x:DataType="vm:NotificationChannelViewModel">
 
     <Grid
+        Padding="0,0,0,10"
         ColumnDefinitions="2*, 3*, Auto"
         ColumnSpacing="4"
         RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">

From 8edbb0bbb17aaf1d77bf72387de3fc4cf53d5caa Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 6 Jun 2025 16:04:43 +0200
Subject: [PATCH 12/54] - Improved notification channel handling during app
 startup. - Data-only notifications are no longer displayed in the
 notification tray. - NotificationBuilder support for Android API 26 and below
 (where no notification channels are available). - OpenNotificationSettings
 now also works for Android API 26 and below.

---
 .../Android/Channels/INotificationChannels.cs |   6 +-
 .../Android/Channels/NotificationChannels.cs  | 222 +++++++++++++-----
 .../FirebasePushNotificationManager.cs        |  19 +-
 .../Platforms/Android/NotificationBuilder.cs  | 124 ++++++----
 .../Plugin.FirebasePushNotifications.csproj   |   4 +
 5 files changed, 269 insertions(+), 106 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs
index 45d95f4..4af3f7d 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs
@@ -1,4 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.Versioning;
 using Android.App;
 using Plugin.FirebasePushNotifications.Platforms.Channels;
 
@@ -68,6 +70,8 @@ public partial interface INotificationChannels
         /// <param name="notificationChannelRequests">The notification channel requests.</param>
         void SetNotificationChannels(NotificationChannelRequest[] notificationChannelRequests);
 
+        void EnsureDefaultNotificationChannel();
+
         /// <summary>
         /// Creates notification channels from given <paramref name="notificationChannelRequests"/>.
         /// </summary>
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
index 9acd2cf..92b9f98 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
@@ -60,6 +60,11 @@ public IEnumerable<NotificationChannelGroup> ChannelGroups
         /// <inheritdoc />
         public void SetNotificationChannelGroups([NotNull] NotificationChannelGroupRequest[] notificationChannelGroupRequests)
         {
+            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
+            {
+                return;
+            }
+
             ArgumentNullException.ThrowIfNull(notificationChannelGroupRequests);
 
             var groupIds = notificationChannelGroupRequests
@@ -68,11 +73,6 @@ public void SetNotificationChannelGroups([NotNull] NotificationChannelGroupReque
 
             this.logger.LogDebug($"SetNotificationChannelGroups: notificationChannelGroupRequests=[{string.Join(",", groupIds)}]");
 
-            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
-            {
-                return;
-            }
-
             var notificationChannelGroupIdsToDelete = this.ChannelGroups.Select(c => c.Id);
 
             if (groupIds.Any())
@@ -88,6 +88,11 @@ public void SetNotificationChannelGroups([NotNull] NotificationChannelGroupReque
         /// <inheritdoc />
         public void CreateNotificationChannelGroups([NotNull] NotificationChannelGroupRequest[] notificationChannelGroupRequests)
         {
+            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
+            {
+                return;
+            }
+
             ArgumentNullException.ThrowIfNull(notificationChannelGroupRequests);
 
             var groupIds = notificationChannelGroupRequests
@@ -96,11 +101,6 @@ public void CreateNotificationChannelGroups([NotNull] NotificationChannelGroupRe
 
             this.logger.LogDebug($"CreateNotificationChannelGroups: notificationChannelGroupRequests=[{string.Join(",", groupIds)}]");
 
-            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
-            {
-                return;
-            }
-
             this.CreateNotificationChannelGroupsInternal(notificationChannelGroupRequests);
         }
 
@@ -135,13 +135,13 @@ public void DeleteNotificationChannelGroup(string groupId)
         /// <inheritdoc />
         public void DeleteAllNotificationChannelGroups()
         {
-            this.logger.LogDebug("DeleteAllNotificationChannelGroups");
-
             if (Build.VERSION.SdkInt < BuildVersionCodes.O)
             {
                 return;
             }
 
+            this.logger.LogDebug("DeleteAllNotificationChannelGroups");
+
             var groupIds = this.ChannelGroups
                 .Select(g => g.Id)
                 .ToArray();
@@ -152,15 +152,15 @@ public void DeleteAllNotificationChannelGroups()
         /// <inheritdoc />
         public void DeleteNotificationChannelGroups([NotNull] string[] groupIds)
         {
-            ArgumentNullException.ThrowIfNull(groupIds);
-
-            this.logger.LogDebug($"DeleteNotificationChannelGroups: groupIds=[{string.Join(",", groupIds)}]");
-
             if (Build.VERSION.SdkInt < BuildVersionCodes.O)
             {
                 return;
             }
 
+            ArgumentNullException.ThrowIfNull(groupIds);
+
+            this.logger.LogDebug($"DeleteNotificationChannelGroups: groupIds=[{string.Join(",", groupIds)}]");
+
             this.DeleteNotificationChannelGroupsInternal(groupIds);
         }
 
@@ -180,6 +180,11 @@ private void DeleteNotificationChannelGroupsInternal(string[] groupIds)
         /// <inheritdoc />
         public void SetNotificationChannels([NotNull] NotificationChannelRequest[] notificationChannelRequests)
         {
+            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
+            {
+                return;
+            }
+
             ArgumentNullException.ThrowIfNull(notificationChannelRequests);
 
             var notificationChannelRequestIds = notificationChannelRequests
@@ -189,40 +194,11 @@ public void SetNotificationChannels([NotNull] NotificationChannelRequest[] notif
             this.logger.LogDebug(
                 $"SetNotificationChannels: notificationChannelRequests=[{string.Join(",", notificationChannelRequestIds)}]");
 
-            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
-            {
-                return;
-            }
-
-            // If no default notification channel is requested,
-            // we create a default notification channel with some predefined properties.
+            // If no default notification channel is requested, we create it with predefined properties.
             if (!notificationChannelRequests.Any(c => c.IsDefault))
             {
-                var metadata = MetadataHelper.GetMetadata();
-                var channelId = metadata.GetString(
-                    Constants.MetadataDefaultNotificationChannelId,
-                    Constants.DefaultNotificationChannelId);
-
-                var defaultNotificationChannelRequest = new NotificationChannelRequest
-                {
-                    ChannelId = channelId,
-                    ChannelName = Constants.DefaultNotificationChannelName,
-                    IsDefault = true,
-                    LockscreenVisibility = NotificationVisibility.Public,
-                    Importance = NotificationImportance.Default
-                };
-
-                const string optionsPath = $"options.{nameof(FirebasePushNotificationOptions.Android)}." +
-                                           $"{nameof(FirebasePushNotificationAndroidOptions.NotificationChannels)}";
-
-                this.logger.LogWarning(
-                    $"Missing default notification channel (IsDefault=true) in {optionsPath}.{Environment.NewLine}" +
-                    $"A default notification channel with the following properties will be created: {Environment.NewLine}" +
-                    $"> ChannelId={defaultNotificationChannelRequest.ChannelId}, {Environment.NewLine}" +
-                    $"> ChannelName={defaultNotificationChannelRequest.ChannelName}, {Environment.NewLine}" +
-                    $"> IsDefault=true, {Environment.NewLine}" +
-                    $"> LockscreenVisibility=NotificationVisibility.Public, {Environment.NewLine}" +
-                    $"> Importance=NotificationImportance.Default");
+                var defaultNotificationChannelId = GetDefaultNotificationChannelIds().First();
+                var defaultNotificationChannelRequest = this.CreateDefaultNotificationChannelRequest(defaultNotificationChannelId);
 
                 notificationChannelRequests = notificationChannelRequests
                     .Prepend(defaultNotificationChannelRequest)
@@ -246,9 +222,114 @@ public void SetNotificationChannels([NotNull] NotificationChannelRequest[] notif
             this.CreateNotificationChannelsInternal(notificationChannelRequests);
         }
 
+        public void EnsureDefaultNotificationChannel()
+        {
+            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
+            {
+                return;
+            }
+
+            var existingNotificationChannelIds = this.Channels
+                .Select(c => c.Id)
+                .ToArray();
+
+            // There is no concept of default notification channels in Android.
+            // Therefore, we need to find or create the default notification channel.
+            // 1. If there is no existing notification channel, we create a new one with default properties.
+            // 2. If we have exactly one notification channel, we treat it as the default notification channel.
+            // 3. If we have multiple notification channels,
+            //    3a. try to get the default notification channel from the list of existing notification channels, or
+            //    3b. we treat the first in the list as default notification channel.
+            var defaultNotificationChannelIds = GetDefaultNotificationChannelIds().ToArray();
+            var defaultNotificationChannelId = existingNotificationChannelIds.Length switch
+            {
+                0 => defaultNotificationChannelIds.First(),
+                1 => existingNotificationChannelIds[0],
+                _ => existingNotificationChannelIds.FirstOrDefault(c => defaultNotificationChannelIds.Contains(c, StringComparer.InvariantCultureIgnoreCase)) ?? existingNotificationChannelIds[0],
+            };
+
+            var defaultNotificationChannelExists = existingNotificationChannelIds
+                .Any(c => string.Equals(c, defaultNotificationChannelId, StringComparison.InvariantCultureIgnoreCase));
+
+            this.logger.LogDebug(
+                $"EnsureDefaultNotificationChannel: existingNotificationChannelIds=[{string.Join(",", existingNotificationChannelIds)}] " +
+                $"--> defaultNotificationChannelId={defaultNotificationChannelId} ({(defaultNotificationChannelExists ? "existing" : "new")})");
+
+            if (!defaultNotificationChannelExists)
+            {
+                // If no default notification channel exists, we create it with predefined properties.
+                var defaultNotificationChannelRequest = this.CreateDefaultNotificationChannelRequest(defaultNotificationChannelId);
+                this.CreateNotificationChannelsInternal(new[] { defaultNotificationChannelRequest });
+            }
+            else
+            {
+                this.Channels.SetDefaultNotificationChannelIdInternal(defaultNotificationChannelId);
+            }
+        }
+
+        private NotificationChannelRequest CreateDefaultNotificationChannelRequest(string defaultNotificationChannelId)
+        {
+            var defaultNotificationChannelRequest = new NotificationChannelRequest
+            {
+                ChannelId = defaultNotificationChannelId,
+                ChannelName = Constants.DefaultNotificationChannelName,
+                IsDefault = true,
+                LockscreenVisibility = NotificationVisibility.Public,
+                Importance = this.options.Android.DefaultNotificationImportance,
+            };
+
+            const string optionsPath = $"options.{nameof(FirebasePushNotificationOptions.Android)}." +
+                                       $"{nameof(FirebasePushNotificationAndroidOptions.NotificationChannels)}";
+
+            this.logger.LogWarning(
+                $"Missing default notification channel (IsDefault=true) in {optionsPath}.{Environment.NewLine}" +
+                $"A default notification channel with the following properties will be created: {Environment.NewLine}" +
+                $"> ChannelId={defaultNotificationChannelRequest.ChannelId}, {Environment.NewLine}" +
+                $"> ChannelName={defaultNotificationChannelRequest.ChannelName}, {Environment.NewLine}" +
+                $"> IsDefault=true, {Environment.NewLine}" +
+                $"> LockscreenVisibility=NotificationVisibility.Public, {Environment.NewLine}" +
+                $"> Importance=NotificationImportance.{defaultNotificationChannelRequest.Importance}");
+
+            return defaultNotificationChannelRequest;
+        }
+
+        private static IEnumerable<string> GetDefaultNotificationChannelIds()
+        {
+            // Try to get the default notification channel ID from AndroidManifest.xml
+            {
+                var metadata = MetadataHelper.GetMetadata();
+                var defaultNotificationChannelId = metadata.GetString(
+                    key: Constants.MetadataDefaultNotificationChannelId,
+                    defaultValue: null);
+
+                if (!string.IsNullOrEmpty(defaultNotificationChannelId))
+                {
+                    yield return defaultNotificationChannelId;
+                }
+            }
+
+            // Try to get the default notification channel ID from static string defined in this library
+            {
+                var defaultNotificationChannelId = Constants.DefaultNotificationChannelId;
+                if (!string.IsNullOrEmpty(defaultNotificationChannelId))
+                {
+                    yield return defaultNotificationChannelId;
+                }
+                else
+                {
+                    yield return "default_channel_id";
+                }
+            }
+        }
+
         /// <inheritdoc />
         public void CreateNotificationChannels([NotNull] NotificationChannelRequest[] notificationChannelRequests)
         {
+            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
+            {
+                return;
+            }
+
             ArgumentNullException.ThrowIfNull(notificationChannelRequests);
 
             var newChannelIds = notificationChannelRequests
@@ -257,11 +338,6 @@ public void CreateNotificationChannels([NotNull] NotificationChannelRequest[] no
 
             this.logger.LogDebug($"CreateNotificationChannels: notificationChannelRequests=[{string.Join(",", newChannelIds)}]");
 
-            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
-            {
-                return;
-            }
-
             if (newChannelIds.Length == 0)
             {
                 return;
@@ -327,6 +403,7 @@ private void CreateNotificationChannelsInternal([NotNull] NotificationChannelReq
                 }
                 else
                 {
+                    this.logger.LogDebug($"Creating notification channel '{notificationChannelRequest.ChannelId}'");
                     this.notificationManager.CreateNotificationChannel(notificationChannel);
                 }
             }
@@ -341,13 +418,13 @@ private void CreateNotificationChannelsInternal([NotNull] NotificationChannelReq
         /// <inheritdoc />
         public void DeleteAllNotificationChannels()
         {
-            this.logger.LogDebug("DeleteAllNotificationChannels");
-
             if (Build.VERSION.SdkInt < BuildVersionCodes.O)
             {
                 return;
             }
 
+            this.logger.LogDebug("DeleteAllNotificationChannels");
+
             var defaultNotificationChannelId = this.Channels.DefaultNotificationChannelId;
 
             var allNotificationChannelIds = this.Channels
@@ -369,15 +446,15 @@ public void DeleteNotificationChannel([NotNull] string notificationChannelId)
         /// <inheritdoc />
         public void DeleteNotificationChannels([NotNull] string[] notificationChannelIds)
         {
-            ArgumentNullException.ThrowIfNull(notificationChannelIds);
-
-            this.logger.LogDebug($"DeleteNotificationChannels: notificationChannelIds=[{string.Join(",", notificationChannelIds)}]");
-
             if (Build.VERSION.SdkInt < BuildVersionCodes.O)
             {
                 return;
             }
 
+            ArgumentNullException.ThrowIfNull(notificationChannelIds);
+
+            this.logger.LogDebug($"DeleteNotificationChannels: notificationChannelIds=[{string.Join(",", notificationChannelIds)}]");
+
             var channelIds = this.Channels
                 .Select(c => c.Id)
                 .ToArray();
@@ -425,6 +502,7 @@ private void CreateDefaultNotificationChannelInternal()
             // TODO
         }
 
+        /// <inheritdoc />
         public void OpenNotificationSettings()
         {
             this.logger.LogDebug("OpenNotificationSettings");
@@ -432,10 +510,27 @@ public void OpenNotificationSettings()
             try
             {
                 var context = Android.App.Application.Context;
-                var newIntent = new Intent(Settings.ActionAppNotificationSettings);
-                newIntent.SetFlags(ActivityFlags.NewTask);
-                newIntent.PutExtra(Settings.ExtraAppPackage, context.PackageName);
-                context.StartActivity(newIntent);
+
+                var intent = new Intent();
+                var sdkInt = (int)Build.VERSION.SdkInt;
+                if (sdkInt >= (int)BuildVersionCodes.O) // >= Android 8.0
+                {
+                    intent.SetAction(Settings.ActionAppNotificationSettings);
+                    intent.PutExtra(Settings.ExtraAppPackage, context.PackageName);
+                    intent.PutExtra(Settings.ExtraChannelId, context.ApplicationInfo!.Uid);
+                }
+                else if (sdkInt is >= (int)BuildVersionCodes.Lollipop and < (int)BuildVersionCodes.O) // >= Android 5.0 && < Android 8.0
+                {
+                    intent.SetAction(Settings.ActionAppNotificationSettings);
+                    intent.PutExtra("app_package", context.PackageName);
+                    intent.PutExtra("app_uid", context.ApplicationInfo!.Uid);
+                }
+                else
+                {
+                    return;
+                }
+
+                context.StartActivity(intent);
             }
             catch (Exception e)
             {
@@ -443,6 +538,7 @@ public void OpenNotificationSettings()
             }
         }
 
+        /// <inheritdoc />
         public void OpenNotificationChannelSettings([NotNull] string notificationChannelId)
         {
             this.logger.LogDebug($"OpenNotificationChannelSettings: notificationChannelId={notificationChannelId}");
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
index 65e657e..f68fe45 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
@@ -43,8 +43,23 @@ private void ConfigurePlatform()
         {
             this.logger.LogDebug("ConfigurePlatform");
 
-            this.notificationChannels.SetNotificationChannelGroups(this.options.Android.NotificationChannelGroups);
-            this.notificationChannels.SetNotificationChannels(this.options.Android.NotificationChannels);
+            var groups = this.options.Android.NotificationChannelGroups;
+            if (groups.Any())
+            {
+                this.notificationChannels.SetNotificationChannelGroups(groups);
+            }
+
+            var channels = this.options.Android.NotificationChannels;
+            if (channels.Any())
+            {
+                // If we have NotificationChannels set, use them to configure the absolute set of notification channels.
+                this.notificationChannels.SetNotificationChannels(channels);
+            }
+            else
+            {
+                // Otherwise, ensure we have at least the default notification channel.
+                this.notificationChannels.EnsureDefaultNotificationChannel();
+            }
 
             var context = Application.Context;
             var isFirebaseAppInitialized = FirebaseAppHelper.IsFirebaseAppInitialized(context);
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
index 428ae51..b35fda4 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
@@ -59,30 +59,69 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 return false;
             }
 
+            var isAppInForeground = AppHelper.IsAppForeground(Application.Context);
+            var isAppInBackground = !isAppInForeground;
+
             if (notificationParams.IsNotification)
             {
-                var isAppInBackground = !AppHelper.IsAppForeground(Application.Context);
                 if (isAppInBackground)
                 {
+                    // If the notification is a notification message (not data-only)
+                    // and the app runs in background mode,
+                    // we show it in a local notification popup.
+                    this.logger.LogDebug(
+                        $"ShouldHandleNotificationReceived returns true " +
+                        $"(Reason: Notification message present and app runs in background mode)");
                     return true;
                 }
             }
-
-            var notificationImportance = GetNotificationImportance(data);
-            if (notificationImportance >= NotificationImportance.High)
+            else
             {
-                // In case we receive a notification with priority >= high
-                // we show it in a local notification popup.
                 this.logger.LogDebug(
-                    $"ShouldHandleNotificationReceived returns true " +
-                    $"(Reason: Notification importance '{notificationImportance}' is greater or equal to 'high')");
-                return true;
+                    $"ShouldHandleNotificationReceived returns false " +
+                    $"(Reason: Data-only notification)");
+                return false;
+            }
+
+            var notificationChannel = this.GetNotificationChannelOrDefault(data);
+            var hasNotificationChannelWithHighImportance = notificationChannel is { Importance: >= NotificationImportance.High };
+
+            // We check notification importance ('priority' presence or DefaultNotificationImportance setting) only, if
+            // - the app runs in background mode OR
+            // - the app runs in foreground mode AND the target notification channel importance is >= high
+            // If we receive notification messages with priority=high while the app runs in foreground mode
+            // and the target notification channel has importance lower than high, we cannot display a local notification popup!
+            if (isAppInBackground || hasNotificationChannelWithHighImportance)
+            {
+                // If the target/default notification channel has importance >= High
+                // we check if the notification importance is also >= High
+                var notificationImportance = GetNotificationImportance(data);
+                if (notificationImportance >= NotificationImportance.High)
+                {
+                    // In case we receive a notification with priority >= high
+                    // we show it in a local notification popup.
+                    this.logger.LogDebug(
+                        $"ShouldHandleNotificationReceived returns true " +
+                        $"(Reason: Notification importance '{notificationImportance}' is greater than or equal to 'High')");
+                    return true;
+                }
+
+                var defaultNotificationImportance = this.options.Android.DefaultNotificationImportance;
+                if (defaultNotificationImportance >= NotificationImportance.High)
+                {
+                    // In case a default notification importance >= High is configured
+                    // we show it in a local notification popup.
+                    this.logger.LogDebug(
+                        $"ShouldHandleNotificationReceived returns true " +
+                        $"(Reason: DefaultNotificationImportance={defaultNotificationImportance} is greater than or equal to 'High')");
+                    return true;
+                }
             }
 
-            var defaultNotificationImportance = this.options.Android.DefaultNotificationImportance;
-            if (defaultNotificationImportance >= NotificationImportance.High)
+            if (hasNotificationChannelWithHighImportance)
             {
-                // In case a default notification importance >= high is configured
+                // In case we receive a notification which targets a specific notification channel
+                // and the notification channel's importance is >= high
                 // we show it in a local notification popup.
                 this.logger.LogDebug(
                     $"ShouldHandleNotificationReceived returns true " +
@@ -97,7 +136,6 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
 
             if (presentClickActionKeys.Length > 0)
             {
-                var isAppInBackground = !AppHelper.IsAppForeground(Application.Context);
                 if (isAppInBackground)
                 {
                     // If we received a "click_action" or "category"
@@ -112,19 +150,6 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 }
             }
 
-            var notificationChannel = this.GetNotificationChannel(data);
-            if (notificationChannel is { Importance: >= NotificationImportance.High })
-            {
-                // In case we receive a notification which targets a specific notification channel
-                // and the notification channel's importance is >= high
-                // we show it in a local notification popup.
-                this.logger.LogDebug(
-                    $"ShouldHandleNotificationReceived returns true " +
-                    $"(Reason: Target notification channel '{notificationChannel.Id}' " +
-                    $"has importance '{notificationChannel.Importance}' greater or equal to 'high')");
-                return true;
-            }
-
             if (data.ContainsKey(Constants.LargeIconKey))
             {
                 // If we received a "large_icon"
@@ -188,22 +213,34 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
                 launchIntent.SetFlags(activityFlags);
             }
 
-            var notificationChannel = this.GetNotificationChannelOrDefault(data);
-            if (notificationChannel == null)
+            NotificationChannel notificationChannel;
+            string notificationChannelId;
+            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
             {
-                this.logger.LogError(
-                    $"NotificationCompat.Builder requires a notification channel to work properly. " +
-                    $"Use {nameof(INotificationChannels)}.{nameof(INotificationChannels.CreateNotificationChannels)} or " +
-                    $"{nameof(INotificationChannels)}.{nameof(INotificationChannels.SetNotificationChannels)} " +
-                    $"to create at least one notification channel.");
-                return;
+                notificationChannel = null;
+                notificationChannelId = NotificationChannel.DefaultChannelId;
+            }
+            else
+            {
+                notificationChannel = this.GetNotificationChannelOrDefault(data);
+                if (notificationChannel == null)
+                {
+                    this.logger.LogError(
+                        $"NotificationCompat.Builder requires a notification channel to work properly. " +
+                        $"Use {nameof(INotificationChannels)}.{nameof(INotificationChannels.CreateNotificationChannels)} or " +
+                        $"{nameof(INotificationChannels)}.{nameof(INotificationChannels.SetNotificationChannels)} " +
+                        $"to create at least one notification channel.");
+                    return;
+                }
+
+                notificationChannelId = notificationChannel.Id;
             }
 
-            var notificationImportance = this.GetNotificationImportanceOrDefault(data);
-            if (notificationChannel.Importance < notificationImportance)
+            var (notificationImportance, notificationImportanceSource) = this.GetNotificationImportanceOrDefault(data);
+            if (notificationChannel is { Importance: var importance } && importance < notificationImportance)
             {
                 this.logger.LogWarning(
-                    $"Notification channel with Id={notificationChannel.Id} has Importance={notificationChannel.Importance} " +
+                    $"Notification channel with Id={notificationChannelId} has Importance={importance} " +
                     $"which is lower than '{notificationImportance}' (as specified in {notificationImportanceSource}).");
             }
 
@@ -215,7 +252,7 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
             var pendingIntent = PendingIntent.GetActivity(context, requestCode, launchIntent,
                 PendingIntentFlags.UpdateCurrent | PendingIntentFlags.Immutable);
 
-            var notificationBuilder = new NotificationCompat.Builder(context, notificationChannel.Id)
+            var notificationBuilder = new NotificationCompat.Builder(context, notificationChannelId)
                 .SetSmallIcon(smallIconResource)
                 .SetAutoCancel(true)
                 .SetWhen(Java.Lang.JavaSystem.CurrentTimeMillis())
@@ -795,14 +832,21 @@ private int GetNotificationId(IDictionary<string, object> data)
             return notificationImportance;
         }
 
-        private NotificationImportance GetNotificationImportanceOrDefault(IDictionary<string, object> data)
+        private (NotificationImportance, string) GetNotificationImportanceOrDefault(IDictionary<string, object> data)
         {
+            string notificationImportanceSource;
+
             if (GetNotificationImportance(data) is not NotificationImportance notificationImportance)
             {
                 notificationImportance = this.options.Android.DefaultNotificationImportance;
+                notificationImportanceSource = nameof(this.options.Android.DefaultNotificationImportance);
+            }
+            else
+            {
+                notificationImportanceSource = $"notification {Constants.PriorityKey}";
             }
 
-            return notificationImportance;
+            return (notificationImportance, notificationImportanceSource);
         }
 
         private static NotificationImportance GetNotificationImportance(string priorityValue)
diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index 6d5e501..cf05410 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -38,6 +38,10 @@
 		<Company>superdev GmbH</Company>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<PackageReleaseNotes>3.3
+- Improved notification channel handling during app startup.
+- Data-only notifications are no longer displayed in the notification tray.
+- NotificationBuilder support for Android API 26 and below (where no notification channels are available).
+- OpenNotificationSettings now also works for Android API 26 and below.
 - Bug fixes and refactorings.
 
 3.2

From 32ac0dabc477dd44183fdb6def57e5aefab023a8 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Tue, 10 Jun 2025 09:39:41 +0200
Subject: [PATCH 13/54] Adjust log message

---
 .../Platforms/Android/FirebasePushNotificationManager.cs      | 4 ++--
 .../Platforms/iOS/FirebasePushNotificationManager.cs          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
index f68fe45..4d1ac9b 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
@@ -315,7 +315,7 @@ public void SubscribeTopic(string topic)
             var subscribedTopics = new HashSet<string>(this.SubscribedTopics);
             if (!subscribedTopics.Contains(topic))
             {
-                this.logger.LogDebug($"Subscribe: topic=\"{topic}\"");
+                this.logger.LogDebug($"SubscribeTopic: topic=\"{topic}\"");
 
                 // TODO: Use AddOnCompleteListener(...)
                 FirebaseMessaging.Instance.SubscribeToTopic(topic);
@@ -327,7 +327,7 @@ public void SubscribeTopic(string topic)
             }
             else
             {
-                this.logger.LogInformation($"Subscribe: skipping topic \"{topic}\"; topic is already subscribed");
+                this.logger.LogInformation($"SubscribeTopic: skipping topic \"{topic}\"; topic is already subscribed");
             }
         }
 
diff --git a/Plugin.FirebasePushNotifications/Platforms/iOS/FirebasePushNotificationManager.cs b/Plugin.FirebasePushNotifications/Platforms/iOS/FirebasePushNotificationManager.cs
index 0602f5d..eab6320 100644
--- a/Plugin.FirebasePushNotifications/Platforms/iOS/FirebasePushNotificationManager.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/iOS/FirebasePushNotificationManager.cs
@@ -467,7 +467,7 @@ public void SubscribeTopic(string topic)
             var subscribedTopics = new HashSet<string>(this.SubscribedTopics);
             if (!subscribedTopics.Contains(topic))
             {
-                this.logger.LogDebug($"Subscribe: topic=\"{topic}\"");
+                this.logger.LogDebug($"SubscribeTopic: topic=\"{topic}\"");
 
                 Firebase.CloudMessaging.Messaging.SharedInstance.Subscribe(topic);
                 subscribedTopics.Add(topic);
@@ -476,7 +476,7 @@ public void SubscribeTopic(string topic)
             }
             else
             {
-                this.logger.LogInformation($"Subscribe: skipping topic \"{topic}\"; topic is already subscribed");
+                this.logger.LogInformation($"SubscribeTopic: skipping topic \"{topic}\"; topic is already subscribed");
             }
         }
 

From d6d89e0c09df7cc24e3eadfe61240b554d109122 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Tue, 10 Jun 2025 09:40:19 +0200
Subject: [PATCH 14/54] Remove internal method from interface

---
 .../Platforms/Android/Channels/INotificationChannels.cs         | 2 --
 .../Platforms/Android/FirebasePushNotificationManager.cs        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs
index 4af3f7d..5267f54 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/INotificationChannels.cs
@@ -70,8 +70,6 @@ public partial interface INotificationChannels
         /// <param name="notificationChannelRequests">The notification channel requests.</param>
         void SetNotificationChannels(NotificationChannelRequest[] notificationChannelRequests);
 
-        void EnsureDefaultNotificationChannel();
-
         /// <summary>
         /// Creates notification channels from given <paramref name="notificationChannelRequests"/>.
         /// </summary>
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
index 4d1ac9b..7e36938 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
@@ -58,7 +58,7 @@ private void ConfigurePlatform()
             else
             {
                 // Otherwise, ensure we have at least the default notification channel.
-                this.notificationChannels.EnsureDefaultNotificationChannel();
+                ((Channels.NotificationChannels)this.notificationChannels).EnsureDefaultNotificationChannel();
             }
 
             var context = Application.Context;

From e93e5cd3f84f411f1435084aba6410b1908c1c0a Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Wed, 11 Jun 2025 16:06:55 +0200
Subject: [PATCH 15/54] Update FAQ

---
 Docs/FAQ.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Docs/FAQ.md b/Docs/FAQ.md
index 53152c8..6f21603 100644
--- a/Docs/FAQ.md
+++ b/Docs/FAQ.md
@@ -29,10 +29,11 @@ If you receive an HTTP 429 you may need to back-off and send your messages later
 ### Why are my notifications not being delivered?
 Common reasons for notification delivery issues include:
 - Incorrect Firebase configuration: Wrong package name or bundle identifier. Wrong google-services.json or GoogleService-Info.plist file used.
-- The app being killed or not running in the background.
-- Notification permissions not configured in AndroidManifest and/or user not asked for giving consent.
-- Notification events not subscribed.
-- Network connectivity issues.
+- Notification permissions not configured in AndroidManifest.xml.
+- Notification permissions not requested from user.
+- Notification events such as NotificationReceived not subscribed.
+- Network connectivity issues on the receiving device. Particularly, if you use a simulator/emulator on a computer which is connected to slow/fragile network connectivity.
+- Wait some seconds. Delivery of push notifications is not always immediate.
 
 ### How can I debug notification issues?
 - Verify your Firebase configuration and ensure that the correct services files are being used.

From db7dafdd935b1e648e011025d20e6d96f7180159 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Wed, 11 Jun 2025 16:15:23 +0200
Subject: [PATCH 16/54] Update readme.md

---
 README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/README.md b/README.md
index 4581fa9..1df9024 100644
--- a/README.md
+++ b/README.md
@@ -229,6 +229,29 @@ If everything works fine, the mobile device with the given token displays the no
 
 ![Notification Category medication_intake](Docs/notificationcategory_takemedicine.png?raw=true)
 
+#### Notification Channels
+Notification channels are an Android feature introduced in Android 8.0 (API level 26) that let users manage notification settings for different categories of notifications within the app.
+Each notification channel represents a distinct type of notification (such as chat messages, medication intake, or promotions) and allows users to customize notification preferences per channel, rather than for the whole app.
+
+##### Default Notification Channel
+Your app must always have at least one notification channel. This library will use this channel for any notifications that are not targeting a specific channel. This ensures that push notifications are delivered even if a custom channel is not set up.
+
+It is highly recommended to create the default notification channel by yourself so that all properties are under your control.
+Use `INotificationChannels.Channels` methods to create notification channels manually at startup or specify them in the Android-specific options under `UseFirebasePushNotifications(o => o.Android.NotificationChannels = ...)`).
+To get an idea of how to use the `NotificationChannels` option, take a look at `MauiProgram.cs` in the sample app in this repository.
+
+##### Notification Channel Importance
+When your app (or this library) creates a notification channel, you must specify its importance (e.g., `Low`, `Default`, `High`). 
+Importance controls how notifications are presented (such as whether they make a sound or appear as a heads-up notification).
+
+> [!IMPORTANT]
+> The importance level can only be set once when the channel is created. It cannot be changed afterward. 
+> If you need to modify a channel’s importance, you must create a new channel with a different ID.
+
+##### Notification Channel Groups
+Multiple notification channels may be grouped together within a notification channel group.
+Use `INotificationChannels.ChannelGroups` methods to create/delete notification channel groups.
+
 #### More Push Notification Scenarios
 There are a lot of features in this library that can be controlled via specific data flags. The most common scenarios
 are end-to-end tested using postman calls. You can find an up-to-date postman collection in this repository:

From 9f109a16899ca788bde96322559d6a6b822b7524 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 06:56:59 +0200
Subject: [PATCH 17/54] Synchronize notification handling behavior between
 android and ios

---
 .../Platforms/Android/NotificationBuilder.cs  | 134 ++++++++----------
 .../FirebasePushNotificationAndroidOptions.cs |  10 +-
 .../Android/PNFirebaseMessagingService.cs     |  13 +-
 3 files changed, 74 insertions(+), 83 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
index b35fda4..5752f7f 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
@@ -62,20 +62,7 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
             var isAppInForeground = AppHelper.IsAppForeground(Application.Context);
             var isAppInBackground = !isAppInForeground;
 
-            if (notificationParams.IsNotification)
-            {
-                if (isAppInBackground)
-                {
-                    // If the notification is a notification message (not data-only)
-                    // and the app runs in background mode,
-                    // we show it in a local notification popup.
-                    this.logger.LogDebug(
-                        $"ShouldHandleNotificationReceived returns true " +
-                        $"(Reason: Notification message present and app runs in background mode)");
-                    return true;
-                }
-            }
-            else
+            if (!notificationParams.IsNotification)
             {
                 this.logger.LogDebug(
                     $"ShouldHandleNotificationReceived returns false " +
@@ -83,53 +70,60 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 return false;
             }
 
-            var notificationChannel = this.GetNotificationChannelOrDefault(data);
-            var hasNotificationChannelWithHighImportance = notificationChannel is { Importance: >= NotificationImportance.High };
-
-            // We check notification importance ('priority' presence or DefaultNotificationImportance setting) only, if
-            // - the app runs in background mode OR
-            // - the app runs in foreground mode AND the target notification channel importance is >= high
-            // If we receive notification messages with priority=high while the app runs in foreground mode
-            // and the target notification channel has importance lower than high, we cannot display a local notification popup!
-            if (isAppInBackground || hasNotificationChannelWithHighImportance)
-            {
-                // If the target/default notification channel has importance >= High
-                // we check if the notification importance is also >= High
-                var notificationImportance = GetNotificationImportance(data);
-                if (notificationImportance >= NotificationImportance.High)
-                {
-                    // In case we receive a notification with priority >= high
-                    // we show it in a local notification popup.
-                    this.logger.LogDebug(
-                        $"ShouldHandleNotificationReceived returns true " +
-                        $"(Reason: Notification importance '{notificationImportance}' is greater than or equal to 'High')");
-                    return true;
-                }
-
-                var defaultNotificationImportance = this.options.Android.DefaultNotificationImportance;
-                if (defaultNotificationImportance >= NotificationImportance.High)
-                {
-                    // In case a default notification importance >= High is configured
-                    // we show it in a local notification popup.
-                    this.logger.LogDebug(
-                        $"ShouldHandleNotificationReceived returns true " +
-                        $"(Reason: DefaultNotificationImportance={defaultNotificationImportance} is greater than or equal to 'High')");
-                    return true;
-                }
+            if (isAppInBackground)
+            {
+                this.logger.LogDebug(
+                    $"ShouldHandleNotificationReceived returns true " +
+                    $"(Reason: App runs in background mode)");
+                return true;
             }
 
-            if (hasNotificationChannelWithHighImportance)
+            var notificationImportance = GetNotificationImportance(data);
+            if (notificationImportance >= NotificationImportance.High)
             {
-                // In case we receive a notification which targets a specific notification channel
-                // and the notification channel's importance is >= high
-                // we show it in a local notification popup.
                 this.logger.LogDebug(
                     $"ShouldHandleNotificationReceived returns true " +
-                    $"(Reason: Target notification channel with Id={notificationChannel.Id} " +
-                    $"has Importance={notificationChannel.Importance} greater than or equal to 'High')");
+                    $"(Reason: Notification importance '{notificationImportance}' is higher than or equal to 'High')");
                 return true;
             }
 
+            // var (notificationImportance, notificationImportanceSource) = this.GetNotificationImportanceOrDefault(data);
+
+            // bool checkForHighImportance;
+            //
+            // if (Build.VERSION.SdkInt < BuildVersionCodes.O)
+            // {
+            //     // Priority was deprecated in API level 26.
+            //     var notificationPriority = GetNotificationPriority(notificationImportance);
+            //     checkForHighImportance = true;
+            // }
+            // else
+            // {
+            //     var notificationChannel = this.GetNotificationChannelOrDefault(data);
+            //     this.CheckAndLogNotificationImportanceDivergence(notificationChannel, notificationImportance, notificationImportanceSource);
+            //     checkForHighImportance = notificationChannel is { Importance: >= NotificationImportance.High };
+            // }
+
+            // We check notification importance ('priority' key present or DefaultNotificationImportance setting) only, if
+            // - the app runs in background mode OR
+            // - the app runs in foreground mode AND the target notification channel importance is >= high
+            // If we receive a notification message with priority=high while the app runs in foreground mode
+            // AND the target notification channel has importance < high, we cannot display a local notification popup!
+            // if (isAppInBackground || checkForHighImportance)
+            // {
+            //     // If the target/default notification channel has importance >= High
+            //     // we check if the notification importance is also >= High
+            //     if (notificationImportance >= NotificationImportance.High)
+            //     {
+            //         // In case we receive a notification with importance >= high
+            //         // we show it in a local notification popup.
+            //         this.logger.LogDebug(
+            //             $"ShouldHandleNotificationReceived returns true " +
+            //             $"(Reason: Notification importance '{notificationImportance}' (source: {notificationImportanceSource}) higher than or equal to 'High')");
+            //         return true;
+            //     }
+            // }
+
             var presentClickActionKeys = Constants.ClickActionKeys
                 .Where(data.ContainsKey)
                 .ToArray();
@@ -164,16 +158,6 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
             return false;
         }
 
-        void INotificationBuilder.OnNotificationReceived(IDictionary<string, object> data)
-        {
-            if (!this.ShouldHandleNotificationReceived(data))
-            {
-                return;
-            }
-
-            this.OnNotificationReceived(data);
-        }
-
         /// <summary>
         /// This method is called if we have to build our own, custom notification using NotificationCompat.Builder.
         /// </summary>
@@ -236,12 +220,13 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
                 notificationChannelId = notificationChannel.Id;
             }
 
-            var (notificationImportance, notificationImportanceSource) = this.GetNotificationImportanceOrDefault(data);
-            if (notificationChannel is { Importance: var importance } && importance < notificationImportance)
+            var notificationImportance = GetNotificationImportance(data);
+            if (notificationChannel is { Importance: var notificationChannelImportance } &&
+                notificationChannelImportance < notificationImportance)
             {
                 this.logger.LogWarning(
-                    $"Notification channel with Id={notificationChannelId} has Importance={importance} " +
-                    $"which is lower than '{notificationImportance}' (as specified in {notificationImportanceSource}).");
+                    $"Notification channel with Id={notificationChannelId} has Importance={notificationChannelImportance} " +
+                    $"which is lower than '{notificationImportance}'.");
             }
 
             var smallIconResource = this.GetSmallIconResource(data, context);
@@ -294,10 +279,12 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
 
             if (Build.VERSION.SdkInt < BuildVersionCodes.O)
             {
-                var notificationPriority = GetNotificationPriority(notificationImportance);
+                // SetPriority was deprecated in API level 26.
+                var notificationImportanceOrDefault = notificationImportance ?? this.options.Android.DefaultNotificationImportance;
+                var notificationPriority = GetNotificationPriority(notificationImportanceOrDefault);
                 notificationBuilder.SetPriority(notificationPriority);
 
-                var notificationVibrationPattern = GetNotificationVibrationPattern(notificationImportance);
+                var notificationVibrationPattern = GetNotificationVibrationPattern(notificationImportanceOrDefault);
                 if (notificationVibrationPattern != null)
                 {
                     notificationBuilder.SetVibrate(notificationVibrationPattern);
@@ -305,6 +292,7 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
 
                 try
                 {
+                    // SetSound was deprecated in API level 26.
                     var soundUri = this.GetSoundUri(data, context);
                     notificationBuilder.SetSound(soundUri);
                 }
@@ -843,7 +831,7 @@ private int GetNotificationId(IDictionary<string, object> data)
             }
             else
             {
-                notificationImportanceSource = $"notification {Constants.PriorityKey}";
+                notificationImportanceSource = $"notification '{Constants.PriorityKey}' flag";
             }
 
             return (notificationImportance, notificationImportanceSource);
@@ -964,8 +952,7 @@ private static string GetCategoryValue(IDictionary<string, object> data)
         /// </summary>
         /// <param name="notificationBuilder">Notification builder.</param>
         /// <param name="data">Data payload.</param>
-        private void ResolveLocalizedParameters(NotificationCompat.Builder notificationBuilder,
-            IDictionary<string, object> data)
+        private void ResolveLocalizedParameters(NotificationCompat.Builder notificationBuilder, IDictionary<string, object> data)
         {
             // Resolve title localization
             if (data.TryGetString("title_loc_key", out var titleKey))
@@ -992,8 +979,7 @@ private void ResolveLocalizedParameters(NotificationCompat.Builder notificationB
             }
         }
 
-        private string GetLocalizedString(string name, string[] arguments,
-            NotificationCompat.Builder notificationBuilder)
+        private string GetLocalizedString(string name, string[] arguments, NotificationCompat.Builder notificationBuilder)
         {
             try
             {
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Options/FirebasePushNotificationAndroidOptions.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Options/FirebasePushNotificationAndroidOptions.cs
index bf0cfa4..39e7ce4 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Options/FirebasePushNotificationAndroidOptions.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Options/FirebasePushNotificationAndroidOptions.cs
@@ -79,12 +79,12 @@ public virtual NotificationChannelRequest[] NotificationChannels
         public string NotificationBodyKey { get; set; }
 
         /// <summary>
-        /// The notification importance used by default
-        /// - if the notification data does not contain any "priority" flags.
-        /// - as notification importance for the default notification channel (if not specified).
-        /// Default value: <c>NotificationImportance.Default</c>
+        /// The notification importance used in following cases:
+        /// - If the notification data does not contain any "priority" flags.
+        /// - As notification importance for the default notification channel.
+        /// Default value: <c>NotificationImportance.High</c>
         /// </summary>
-        public NotificationImportance DefaultNotificationImportance { get; set; } = NotificationImportance.Default;
+        public NotificationImportance DefaultNotificationImportance { get; set; } = NotificationImportance.High;
 
         public int? DefaultIconResource { get; set; }
 
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/PNFirebaseMessagingService.cs b/Plugin.FirebasePushNotifications/Platforms/Android/PNFirebaseMessagingService.cs
index 71bd86d..2e40ee0 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/PNFirebaseMessagingService.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/PNFirebaseMessagingService.cs
@@ -3,6 +3,7 @@
 using Android.OS;
 using Firebase.Messaging;
 using Microsoft.Extensions.Logging;
+using Plugin.FirebasePushNotifications.Utils;
 
 namespace Plugin.FirebasePushNotifications.Platforms
 {
@@ -124,13 +125,17 @@ private void DispatchMessage(Intent intent)
             var data = intent.GetExtrasDict();
             data.Remove("com.google.firebase.iid.WakeLockHolder.wakefulintent");
 
-            if (this.notificationBuilder.ShouldHandleNotificationReceived(data))
+            var handleNotification = this.notificationBuilder.ShouldHandleNotificationReceived(data);
+
+            var isAppInForeground = AppHelper.IsAppForeground();
+            if (isAppInForeground || handleNotification == false)
             {
-                this.notificationBuilder.OnNotificationReceived(data);
+                this.firebasePushNotification.HandleNotificationReceived(data);
             }
-            else
+
+            if (handleNotification)
             {
-                this.firebasePushNotification.HandleNotificationReceived(data);
+                this.notificationBuilder.OnNotificationReceived(data);
             }
         }
 

From f7435fdcdd69772d3c4f27eab5cf7ebdce5a2af4 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 13:53:07 +0200
Subject: [PATCH 18/54] Add key words to abbreviation list

---
 Plugin.FirebasePushNotifications.sln.DotSettings | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Plugin.FirebasePushNotifications.sln.DotSettings

diff --git a/Plugin.FirebasePushNotifications.sln.DotSettings b/Plugin.FirebasePushNotifications.sln.DotSettings
new file mode 100644
index 0000000..d4a07cd
--- /dev/null
+++ b/Plugin.FirebasePushNotifications.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resid/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file

From 9c9199c7f8499309bbfa6499ae73a7ea68e24557 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 13:53:34 +0200
Subject: [PATCH 19/54] Update comment

---
 .../Platforms/Android/Channels/NotificationChannels.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
index 92b9f98..4be326f 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/Channels/NotificationChannels.cs
@@ -257,7 +257,7 @@ public void EnsureDefaultNotificationChannel()
 
             if (!defaultNotificationChannelExists)
             {
-                // If no default notification channel exists, we create it with predefined properties.
+                // If no default notification channel exists, we create one with predefined properties.
                 var defaultNotificationChannelRequest = this.CreateDefaultNotificationChannelRequest(defaultNotificationChannelId);
                 this.CreateNotificationChannelsInternal(new[] { defaultNotificationChannelRequest });
             }

From 9723af8a0f8575d1854faadcfd9456bbc429a04c Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 13:53:58 +0200
Subject: [PATCH 20/54] Use TryGetInt method

---
 .../Platforms/Android/PushNotificationActionReceiver.cs  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/PushNotificationActionReceiver.cs b/Plugin.FirebasePushNotifications/Platforms/Android/PushNotificationActionReceiver.cs
index 91b88a1..ff8c104 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/PushNotificationActionReceiver.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/PushNotificationActionReceiver.cs
@@ -28,18 +28,17 @@ public override void OnReceive(Context context, Intent intent)
                 var firebasePushNotification = IFirebasePushNotification.Current;
                 firebasePushNotification.HandleNotificationAction(extras, notificationCategoryId, notificationActionId, NotificationCategoryType.Default);
 
-                var manager = context.GetSystemService(Context.NotificationService) as NotificationManager;
-                var notificationId = extras.GetValueOrDefault(Constants.ActionNotificationIdKey, -1);
-                if (notificationId != -1)
+                var notificationManager = context.GetSystemService(Context.NotificationService) as NotificationManager;
+                if (extras.TryGetInt(Constants.ActionNotificationIdKey, out var notificationId))
                 {
                     var notificationTag = extras.GetStringOrDefault(Constants.ActionNotificationTagKey, null);
                     if (notificationTag == null)
                     {
-                        manager.Cancel(notificationId);
+                        notificationManager.Cancel(notificationId);
                     }
                     else
                     {
-                        manager.Cancel(notificationTag, notificationId);
+                        notificationManager.Cancel(notificationTag, notificationId);
                     }
                 }
             }

From 77eb1cad3f24407f2e710490a0a4ff0255bd3504 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 13:54:09 +0200
Subject: [PATCH 21/54] Renames

---
 .../Extensions/DictionaryExtensions.cs                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Extensions/DictionaryExtensions.cs b/Plugin.FirebasePushNotifications/Extensions/DictionaryExtensions.cs
index 126afe6..02a9ada 100644
--- a/Plugin.FirebasePushNotifications/Extensions/DictionaryExtensions.cs
+++ b/Plugin.FirebasePushNotifications/Extensions/DictionaryExtensions.cs
@@ -17,11 +17,11 @@ public static T GetValueOrDefault<T>(this IDictionary<string, T> items, string k
             return defaultValue;
         }
 
-        public static Ty GetValueOrDefault<Tx, Ty>(this IDictionary<string, Tx> items, string key, Ty defaultValue = default)
+        public static TY GetValueOrDefault<TX, TY>(this IDictionary<string, TX> items, string key, TY defaultValue = default)
         {
             if (items.TryGetValue(key, out var value))
             {
-                return (Ty)Convert.ChangeType(value, typeof(Ty));
+                return (TY)Convert.ChangeType(value, typeof(TY));
             }
 
             return defaultValue;

From a6f1a114e78ef65a4c99b5ecf528ec6f9d38e3a6 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 14:01:58 +0200
Subject: [PATCH 22/54] - Renamed topic methods to follow the Async pattern:
 SubscribeToTopicAsync, UnsubscribeFromTopicAsync, etc. - Use
 AddOnCompleteListener for asynchronous tasks in Android.

---
 .../IFirebasePushNotification.cs              | 10 +--
 .../FirebasePushNotificationManager.cs        | 61 ++++++++------
 .../iOS/FirebasePushNotificationManager.cs    | 83 +++++++++----------
 .../Plugin.FirebasePushNotifications.csproj   |  2 +
 .../TestFirebasePushNotificationManager.cs    | 15 ++--
 5 files changed, 93 insertions(+), 78 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/IFirebasePushNotification.cs b/Plugin.FirebasePushNotifications/IFirebasePushNotification.cs
index ebdd406..fdb757f 100644
--- a/Plugin.FirebasePushNotifications/IFirebasePushNotification.cs
+++ b/Plugin.FirebasePushNotifications/IFirebasePushNotification.cs
@@ -97,27 +97,27 @@ public interface IFirebasePushNotification
         /// <summary>
         /// Subscribe to <paramref name="topic"/>.
         /// </summary>
-        void SubscribeTopic(string topic);
+        Task SubscribeTopicAsync(string topic);
 
         /// <summary>
         /// Subscribe to list of <paramref name="topics"/>.
         /// </summary>
-        void SubscribeTopics(string[] topics);
+        Task SubscribeTopicsAsync(string[] topics);
 
         /// <summary>
         /// Unsubscribe from <paramref name="topic"/>.
         /// </summary>
-        void UnsubscribeTopic(string topic);
+        Task UnsubscribeTopicAsync(string topic);
 
         /// <summary>
         /// Unsubscribe from list of <paramref name="topics"/>.
         /// </summary>
-        void UnsubscribeTopics(string[] topics);
+        Task UnsubscribeTopicsAsync(string[] topics);
 
         /// <summary>
         /// Unsubscribe all topics.
         /// </summary>
-        void UnsubscribeAllTopics();
+        Task UnsubscribeAllTopicsAsync();
 
         /// <summary>
         /// Register for push notifications.
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
index 7e36938..a809328 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
@@ -210,8 +210,7 @@ public void ProcessIntent(Activity activity, Intent intent)
                     else
                     {
                         var notificationActionId = extras.GetStringOrDefault(Constants.NotificationActionId);
-                        this.HandleNotificationAction(extras, notificationCategoryId, notificationActionId,
-                            NotificationCategoryType.Default);
+                        this.HandleNotificationAction(extras, notificationCategoryId, notificationActionId, NotificationCategoryType.Default);
                     }
                 }
                 else
@@ -291,16 +290,16 @@ public string Token
         public INotificationBuilder NotificationBuilder { get; set; }
 
         /// <inheritdoc />
-        public void SubscribeTopics(string[] topics)
+        public async Task SubscribeTopicsAsync(string[] topics)
         {
-            foreach (var t in topics)
+            foreach (var topic in topics)
             {
-                this.SubscribeTopic(t);
+                await this.SubscribeTopicAsync(topic);
             }
         }
 
         /// <inheritdoc />
-        public void SubscribeTopic(string topic)
+        public async Task SubscribeTopicAsync(string topic)
         {
             if (topic == null)
             {
@@ -315,10 +314,12 @@ public void SubscribeTopic(string topic)
             var subscribedTopics = new HashSet<string>(this.SubscribedTopics);
             if (!subscribedTopics.Contains(topic))
             {
-                this.logger.LogDebug($"SubscribeTopic: topic=\"{topic}\"");
+                this.logger.LogDebug($"SubscribeTopicAsync: topic=\"{topic}\"");
 
-                // TODO: Use AddOnCompleteListener(...)
-                FirebaseMessaging.Instance.SubscribeToTopic(topic);
+                var tcs = new TaskCompletionSource<Java.Lang.Object>();
+                var taskCompleteListener = new TaskCompleteListener(tcs);
+                FirebaseMessaging.Instance.SubscribeToTopic(topic).AddOnCompleteListener(taskCompleteListener);
+                await tcs.Task;
 
                 subscribedTopics.Add(topic);
 
@@ -327,12 +328,12 @@ public void SubscribeTopic(string topic)
             }
             else
             {
-                this.logger.LogInformation($"SubscribeTopic: skipping topic \"{topic}\"; topic is already subscribed");
+                this.logger.LogInformation($"SubscribeTopicAsync: skipping topic \"{topic}\"; topic is already subscribed");
             }
         }
 
         /// <inheritdoc />
-        public void UnsubscribeTopics(string[] topics)
+        public async Task UnsubscribeTopicsAsync(string[] topics)
         {
             if (topics == null)
             {
@@ -340,26 +341,31 @@ public void UnsubscribeTopics(string[] topics)
             }
 
             // TODO: Improve efficiency here (move to base class maybe)
-            foreach (var t in topics)
+            foreach (var topic in topics)
             {
-                this.UnsubscribeTopic(t);
+                await this.UnsubscribeTopicAsync(topic);
             }
         }
 
         /// <inheritdoc />
-        public void UnsubscribeAllTopics()
+        public async Task UnsubscribeAllTopicsAsync()
         {
+            var topics = this.SubscribedTopics.ToArray();
+            this.logger.LogDebug($"UnsubscribeAllTopicsAsync: topics=[{string.Join(',', topics)}]");
+
             foreach (var topic in this.SubscribedTopics)
             {
-                // TODO: Use AddOnCompleteListener(...)
-                FirebaseMessaging.Instance.UnsubscribeFromTopic(topic);
+                var tcs = new TaskCompletionSource<Java.Lang.Object>();
+                var taskCompleteListener = new TaskCompleteListener(tcs);
+                FirebaseMessaging.Instance.UnsubscribeFromTopic(topic).AddOnCompleteListener(taskCompleteListener);
+                await tcs.Task;
             }
 
             this.SubscribedTopics = null;
         }
 
         /// <inheritdoc />
-        public void UnsubscribeTopic(string topic)
+        public async Task UnsubscribeTopicAsync(string topic)
         {
             if (topic == null)
             {
@@ -374,10 +380,13 @@ public void UnsubscribeTopic(string topic)
             var subscribedTopics = new HashSet<string>(this.SubscribedTopics);
             if (subscribedTopics.Contains(topic))
             {
-                this.logger.LogDebug($"Unsubscribe: topic=\"{topic}\"");
+                this.logger.LogDebug($"UnsubscribeTopicAsync: topic=\"{topic}\"");
+
+                var tcs = new TaskCompletionSource<Java.Lang.Object>();
+                var taskCompleteListener = new TaskCompleteListener(tcs);
+                FirebaseMessaging.Instance.UnsubscribeFromTopic(topic).AddOnCompleteListener(taskCompleteListener);
+                await tcs.Task;
 
-                // TODO: Use AddOnCompleteListener(...)
-                FirebaseMessaging.Instance.UnsubscribeFromTopic(topic);
                 subscribedTopics.Remove(topic);
 
                 // TODO: Improve write performance here; don't loop all topics one by one
@@ -385,25 +394,27 @@ public void UnsubscribeTopic(string topic)
             }
             else
             {
-                this.logger.LogInformation($"Unsubscribe: skipping topic \"{topic}\"; topic is not subscribed");
+                this.logger.LogInformation($"UnsubscribeTopicAsync: skipping topic \"{topic}\"; topic is not subscribed");
             }
         }
 
         protected override void HandleTokenRefreshPlatform(string token)
         {
-            this.ResubscribeExistingTopics();
+            _ = this.ResubscribeExistingTopicsAsync();
         }
 
         /// <summary>
         /// Resubscribes all existing topics since the old instance id isn't valid anymore.
         /// This is obviously necessary but seems a very bad design decision...
         /// </summary>
-        private void ResubscribeExistingTopics()
+        private async Task ResubscribeExistingTopicsAsync()
         {
             foreach (var topic in this.SubscribedTopics)
             {
-                // TODO: Use AddOnCompleteListener(...)
-                FirebaseMessaging.Instance.SubscribeToTopic(topic);
+                var tcs = new TaskCompletionSource<Java.Lang.Object>();
+                var taskCompleteListener = new TaskCompleteListener(tcs);
+                FirebaseMessaging.Instance.SubscribeToTopic(topic).AddOnCompleteListener(taskCompleteListener);
+                await tcs.Task;
             }
         }
 
diff --git a/Plugin.FirebasePushNotifications/Platforms/iOS/FirebasePushNotificationManager.cs b/Plugin.FirebasePushNotifications/Platforms/iOS/FirebasePushNotificationManager.cs
index eab6320..10e52fb 100644
--- a/Plugin.FirebasePushNotifications/Platforms/iOS/FirebasePushNotificationManager.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/iOS/FirebasePushNotificationManager.cs
@@ -311,8 +311,7 @@ public void DidReceiveRemoteNotification(NSDictionary userInfo)
         }
 
         /// <inheritdoc />
-        public void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo,
-            Action<UIBackgroundFetchResult> completionHandler)
+        public void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo, Action<UIBackgroundFetchResult> completionHandler)
         {
             this.logger.LogDebug("DidReceiveRemoteNotification(UIApplication, NSDictionary, Action<UIBackgroundFetchResult>)");
 
@@ -334,8 +333,7 @@ private void DidReceiveRemoteNotificationInternal(NSDictionary userInfo)
             this.HandleNotificationReceived(data);
         }
 
-        private void WillPresentNotification(UNUserNotificationCenter center, UNNotification notification,
-            Action<UNNotificationPresentationOptions> completionHandler)
+        private void WillPresentNotification(UNUserNotificationCenter center, UNNotification notification, Action<UNNotificationPresentationOptions> completionHandler)
         {
             if (OperatingSystem.IsIOSVersionAtLeast(18))
             {
@@ -361,11 +359,9 @@ private void WillPresentNotification(UNUserNotificationCenter center, UNNotifica
             completionHandler(notificationPresentationOptions);
         }
 
-        private static UNNotificationPresentationOptions GetNotificationPresentationOptions(
-            IDictionary<string, object> data,
-            UNNotificationPresentationOptions defaultNotificationPresentationOptions)
+        private static UNNotificationPresentationOptions GetNotificationPresentationOptions(IDictionary<string, object> data, UNNotificationPresentationOptions notificationPresentationOptions)
         {
-            var notificationPresentationOptions = defaultNotificationPresentationOptions;
+            var options = notificationPresentationOptions;
 
             var priority = GetPriorityValue(data);
             if (!string.IsNullOrEmpty(priority))
@@ -374,21 +370,21 @@ private static UNNotificationPresentationOptions GetNotificationPresentationOpti
                 {
                     if (UIDevice.CurrentDevice.CheckSystemVersion(14, 0))
                     {
-                        if (!notificationPresentationOptions.HasFlag(UNNotificationPresentationOptions.List))
+                        if (!options.HasFlag(UNNotificationPresentationOptions.List))
                         {
-                            notificationPresentationOptions |= UNNotificationPresentationOptions.List;
+                            options |= UNNotificationPresentationOptions.List;
                         }
 
-                        if (!notificationPresentationOptions.HasFlag(UNNotificationPresentationOptions.Banner))
+                        if (!options.HasFlag(UNNotificationPresentationOptions.Banner))
                         {
-                            notificationPresentationOptions |= UNNotificationPresentationOptions.Banner;
+                            options |= UNNotificationPresentationOptions.Banner;
                         }
                     }
                     else
                     {
-                        if (!notificationPresentationOptions.HasFlag(UNNotificationPresentationOptions.Alert))
+                        if (!options.HasFlag(UNNotificationPresentationOptions.Alert))
                         {
-                            notificationPresentationOptions |= UNNotificationPresentationOptions.Alert;
+                            options |= UNNotificationPresentationOptions.Alert;
                         }
                     }
                 }
@@ -396,27 +392,27 @@ private static UNNotificationPresentationOptions GetNotificationPresentationOpti
                 {
                     if (UIDevice.CurrentDevice.CheckSystemVersion(14, 0))
                     {
-                        if (notificationPresentationOptions.HasFlag(UNNotificationPresentationOptions.List))
+                        if (options.HasFlag(UNNotificationPresentationOptions.List))
                         {
-                            notificationPresentationOptions &= ~UNNotificationPresentationOptions.List;
+                            options &= ~UNNotificationPresentationOptions.List;
                         }
 
-                        if (notificationPresentationOptions.HasFlag(UNNotificationPresentationOptions.Banner))
+                        if (options.HasFlag(UNNotificationPresentationOptions.Banner))
                         {
-                            notificationPresentationOptions &= ~UNNotificationPresentationOptions.Banner;
+                            options &= ~UNNotificationPresentationOptions.Banner;
                         }
                     }
                     else
                     {
-                        if (notificationPresentationOptions.HasFlag(UNNotificationPresentationOptions.Alert))
+                        if (options.HasFlag(UNNotificationPresentationOptions.Alert))
                         {
-                            notificationPresentationOptions &= ~UNNotificationPresentationOptions.Alert;
+                            options &= ~UNNotificationPresentationOptions.Alert;
                         }
                     }
                 }
             }
 
-            return notificationPresentationOptions;
+            return options;
         }
 
         private static string GetPriorityValue(IDictionary<string,object> data)
@@ -437,16 +433,16 @@ private static string GetPriorityValue(IDictionary<string,object> data)
         }
 
         /// <inheritdoc />
-        public void SubscribeTopics(string[] topics)
+        public async Task SubscribeTopicsAsync(string[] topics)
         {
-            foreach (var t in topics)
+            foreach (var topic in topics)
             {
-                this.SubscribeTopic(t);
+                await this.SubscribeTopicAsync(topic);
             }
         }
 
         /// <inheritdoc />
-        public void SubscribeTopic(string topic)
+        public async Task SubscribeTopicAsync(string topic)
         {
             if (topic == null)
             {
@@ -467,36 +463,36 @@ public void SubscribeTopic(string topic)
             var subscribedTopics = new HashSet<string>(this.SubscribedTopics);
             if (!subscribedTopics.Contains(topic))
             {
-                this.logger.LogDebug($"SubscribeTopic: topic=\"{topic}\"");
+                this.logger.LogDebug($"SubscribeTopicAsync: topic=\"{topic}\"");
 
-                Firebase.CloudMessaging.Messaging.SharedInstance.Subscribe(topic);
+                await Firebase.CloudMessaging.Messaging.SharedInstance.SubscribeAsync(topic);
                 subscribedTopics.Add(topic);
 
                 this.SubscribedTopics = subscribedTopics.ToArray();
             }
             else
             {
-                this.logger.LogInformation($"SubscribeTopic: skipping topic \"{topic}\"; topic is already subscribed");
+                this.logger.LogInformation($"SubscribeTopicAsync: skipping topic \"{topic}\"; topic is already subscribed");
             }
         }
 
         /// <inheritdoc />
-        public void UnsubscribeAllTopics()
+        public async Task UnsubscribeAllTopicsAsync()
         {
             var topics = this.SubscribedTopics.ToArray();
-            this.logger.LogDebug($"UnsubscribeAllTopics: topics=[{string.Join(',', topics)}]");
+            this.logger.LogDebug($"UnsubscribeAllTopicsAsync: topics=[{string.Join(',', topics)}]");
 
             foreach (var topic in topics)
             {
-                this.logger.LogDebug($"Unsubscribe: topic=\"{topic}\"");
-                Firebase.CloudMessaging.Messaging.SharedInstance.Unsubscribe(topic);
+                this.logger.LogDebug($"UnsubscribeAsync: topic=\"{topic}\"");
+                await Firebase.CloudMessaging.Messaging.SharedInstance.UnsubscribeAsync(topic);
             }
 
             this.SubscribedTopics = null;
         }
 
         /// <inheritdoc />
-        public void UnsubscribeTopics(string[] topics)
+        public async Task UnsubscribeTopicsAsync(string[] topics)
         {
             if (topics == null)
             {
@@ -504,14 +500,14 @@ public void UnsubscribeTopics(string[] topics)
             }
 
             // TODO: Improve efficiency here (move to base class maybe)
-            foreach (var t in topics)
+            foreach (var topic in topics)
             {
-                this.UnsubscribeTopic(t);
+                await this.UnsubscribeTopicAsync(topic);
             }
         }
 
         /// <inheritdoc />
-        public void UnsubscribeTopic(string topic)
+        public async Task UnsubscribeTopicAsync(string topic)
         {
             if (topic == null)
             {
@@ -532,16 +528,16 @@ public void UnsubscribeTopic(string topic)
             var subscribedTopics = new HashSet<string>(this.SubscribedTopics);
             if (subscribedTopics.Contains(topic))
             {
-                this.logger.LogDebug($"Unsubscribe: topic=\"{topic}\"");
+                this.logger.LogDebug($"UnsubscribeTopicAsync: topic=\"{topic}\"");
 
-                Firebase.CloudMessaging.Messaging.SharedInstance.Unsubscribe(topic);
+                await Firebase.CloudMessaging.Messaging.SharedInstance.UnsubscribeAsync(topic);
                 subscribedTopics.Remove(topic);
 
                 this.SubscribedTopics = subscribedTopics.ToArray();
             }
             else
             {
-                this.logger.LogInformation($"Unsubscribe: skipping topic \"{topic}\"; topic is not subscribed");
+                this.logger.LogInformation($"UnsubscribeTopicAsync: skipping topic \"{topic}\"; topic is not subscribed");
             }
         }
 
@@ -601,10 +597,10 @@ private void DidReceiveRegistrationToken(string fcmToken)
 
             this.HandleTokenRefresh(fcmToken);
 
-            this.TryDequeuePendingTopics();
+            _ = this.TryDequeuePendingTopicsAsync();
         }
 
-        private void TryDequeuePendingTopics()
+        private async Task TryDequeuePendingTopicsAsync()
         {
             if (!HasApnsToken)
             {
@@ -615,11 +611,11 @@ private void TryDequeuePendingTopics()
             {
                 if (pendingTopic.Subscribe)
                 {
-                    this.SubscribeTopic(pendingTopic.Topic);
+                    await this.SubscribeTopicAsync(pendingTopic.Topic);
                 }
                 else
                 {
-                    this.UnsubscribeTopic(pendingTopic.Topic);
+                    await this.UnsubscribeTopicAsync(pendingTopic.Topic);
                 }
             }
         }
@@ -646,6 +642,7 @@ public async void RemoveNotification(int id)
                 .Where(u => $"{u.Request.Content.UserInfo[notificationIdKey]}".Equals($"{id}"))
                 .Select(s => s.Request.Identifier)
                 .ToArray();
+
             if (deliveredNotificationsMatches.Length > 0)
             {
                 UNUserNotificationCenter.Current.RemoveDeliveredNotifications(deliveredNotificationsMatches);
diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index cf05410..36a53f2 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -42,6 +42,8 @@
 - Data-only notifications are no longer displayed in the notification tray.
 - NotificationBuilder support for Android API 26 and below (where no notification channels are available).
 - OpenNotificationSettings now also works for Android API 26 and below.
+- Renamed topic methods to follow the Async pattern: SubscribeToTopicAsync, UnsubscribeFromTopicAsync, etc.
+- Use AddOnCompleteListener for asynchronous tasks in Android.
 - Bug fixes and refactorings.
 
 3.2
diff --git a/Tests/Plugin.FirebasePushNotifications.Tests/TestFirebasePushNotificationManager.cs b/Tests/Plugin.FirebasePushNotifications.Tests/TestFirebasePushNotificationManager.cs
index 509c739..76b15fc 100644
--- a/Tests/Plugin.FirebasePushNotifications.Tests/TestFirebasePushNotificationManager.cs
+++ b/Tests/Plugin.FirebasePushNotifications.Tests/TestFirebasePushNotificationManager.cs
@@ -36,12 +36,14 @@ public void RemoveNotification(string tag, int id)
         {
         }
 
-        public void SubscribeTopic(string topic)
+        public Task SubscribeTopicAsync(string topic)
         {
+            return Task.CompletedTask;
         }
 
-        public void SubscribeTopics(string[] topics)
+        public Task SubscribeTopicsAsync(string[] topics)
         {
+            return Task.CompletedTask;
         }
 
         public Task UnregisterForPushNotificationsAsync()
@@ -49,16 +51,19 @@ public Task UnregisterForPushNotificationsAsync()
             return Task.CompletedTask;
         }
 
-        public void UnsubscribeAllTopics()
+        public Task UnsubscribeAllTopicsAsync()
         {
+            return Task.CompletedTask;
         }
 
-        public void UnsubscribeTopic(string topic)
+        public Task UnsubscribeTopicAsync(string topic)
         {
+            return Task.CompletedTask;
         }
 
-        public void UnsubscribeTopics(string[] topics)
+        public Task UnsubscribeTopicsAsync(string[] topics)
         {
+            return Task.CompletedTask;
         }
     }
 }

From b2873550d9af3eecacc3b33060034916f8f346db Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 14:06:57 +0200
Subject: [PATCH 23/54] Synchronize notification handling behavior between
 Android and iOS

---
 .../FirebasePushNotificationManager.cs        |   5 -
 .../Platforms/Android/NotificationBuilder.cs  |  71 +----
 .../Plugin.FirebasePushNotifications.csproj   |   3 +-
 README.md                                     | 262 +++++++++++++-----
 azure-pipelines.yml                           |   4 +-
 5 files changed, 204 insertions(+), 141 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
index a809328..c91644b 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
@@ -137,11 +137,6 @@ private void InitializeFirebaseAppFromFirebaseOptions(Context context, FirebaseO
             }
         }
 
-        protected override void OnNotificationReceived(IDictionary<string, object> data)
-        {
-            this.NotificationBuilder?.OnNotificationReceived(data);
-        }
-
         public void ProcessIntent(Activity activity, Intent intent)
         {
             if (activity == null)
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
index 5752f7f..195012b 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
@@ -87,73 +87,16 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 return true;
             }
 
-            // var (notificationImportance, notificationImportanceSource) = this.GetNotificationImportanceOrDefault(data);
-
-            // bool checkForHighImportance;
-            //
-            // if (Build.VERSION.SdkInt < BuildVersionCodes.O)
-            // {
-            //     // Priority was deprecated in API level 26.
-            //     var notificationPriority = GetNotificationPriority(notificationImportance);
-            //     checkForHighImportance = true;
-            // }
-            // else
+            // if (data.ContainsKey(Constants.LargeIconKey))
             // {
-            //     var notificationChannel = this.GetNotificationChannelOrDefault(data);
-            //     this.CheckAndLogNotificationImportanceDivergence(notificationChannel, notificationImportance, notificationImportanceSource);
-            //     checkForHighImportance = notificationChannel is { Importance: >= NotificationImportance.High };
+            //     // If we received a "large_icon"
+            //     // we need to show a local notification with SetLargeIcon
+            //     this.logger.LogDebug(
+            //         $"ShouldHandleNotificationReceived returns true " +
+            //         $"(Reason: Key '{Constants.LargeIconKey}' present)");
+            //     return true;
             // }
 
-            // We check notification importance ('priority' key present or DefaultNotificationImportance setting) only, if
-            // - the app runs in background mode OR
-            // - the app runs in foreground mode AND the target notification channel importance is >= high
-            // If we receive a notification message with priority=high while the app runs in foreground mode
-            // AND the target notification channel has importance < high, we cannot display a local notification popup!
-            // if (isAppInBackground || checkForHighImportance)
-            // {
-            //     // If the target/default notification channel has importance >= High
-            //     // we check if the notification importance is also >= High
-            //     if (notificationImportance >= NotificationImportance.High)
-            //     {
-            //         // In case we receive a notification with importance >= high
-            //         // we show it in a local notification popup.
-            //         this.logger.LogDebug(
-            //             $"ShouldHandleNotificationReceived returns true " +
-            //             $"(Reason: Notification importance '{notificationImportance}' (source: {notificationImportanceSource}) higher than or equal to 'High')");
-            //         return true;
-            //     }
-            // }
-
-            var presentClickActionKeys = Constants.ClickActionKeys
-                .Where(data.ContainsKey)
-                .ToArray();
-
-            if (presentClickActionKeys.Length > 0)
-            {
-                if (isAppInBackground)
-                {
-                    // If we received a "click_action" or "category"
-                    // and we run in background mode
-                    // we need to show a local notification with action buttons.
-                    this.logger.LogDebug(
-                        $"ShouldHandleNotificationReceived returns true " +
-                        $"(Reason: {(presentClickActionKeys.Length == 1 ?
-                            $"Key '{presentClickActionKeys.Single()}' is present" :
-                            $"Keys [{string.Join(",", presentClickActionKeys)}] are present")})");
-                    return true;
-                }
-            }
-
-            if (data.ContainsKey(Constants.LargeIconKey))
-            {
-                // If we received a "large_icon"
-                // we need to show a local notification with SetLargeIcon
-                this.logger.LogDebug(
-                    $"ShouldHandleNotificationReceived returns true " +
-                    $"(Reason: Key '{Constants.LargeIconKey}' present)");
-                return true;
-            }
-
             this.logger.LogDebug("ShouldHandleNotificationReceived returns false");
             return false;
         }
diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index 36a53f2..95f354e 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -37,11 +37,12 @@
 		<RepositoryUrl>https://github.com/thomasgalliker/Plugin.FirebasePushNotifications</RepositoryUrl>
 		<Company>superdev GmbH</Company>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-		<PackageReleaseNotes>3.3
+		<PackageReleaseNotes>4.0
 - Improved notification channel handling during app startup.
 - Data-only notifications are no longer displayed in the notification tray.
 - NotificationBuilder support for Android API 26 and below (where no notification channels are available).
 - OpenNotificationSettings now also works for Android API 26 and below.
+- Synchronized notification handling behavior between Android and iOS.
 - Renamed topic methods to follow the Async pattern: SubscribeToTopicAsync, UnsubscribeFromTopicAsync, etc.
 - Use AddOnCompleteListener for asynchronous tasks in Android.
 - Bug fixes and refactorings.
diff --git a/README.md b/README.md
index 1df9024..4a592e1 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,21 @@
 # Plugin.FirebasePushNotifications
+
 [![Version](https://img.shields.io/nuget/v/Plugin.FirebasePushNotifications.svg)](https://www.nuget.org/packages/Plugin.FirebasePushNotifications) [![Downloads](https://img.shields.io/nuget/dt/Plugin.FirebasePushNotifications.svg)](https://www.nuget.org/packages/Plugin.FirebasePushNotifications) [![Buy Me a Coffee](https://img.shields.io/badge/support-buy%20me%20a%20coffee-FFDD00)](https://buymeacoffee.com/thomasgalliker)
 
-Plugin.FirebasePushNotifications provides a seamless way to engage users and keep them informed about important events in your .NET MAUI applications. This open-source C# library integrates Firebase Cloud Messaging (FCM) into your .NET MAUI projects, enabling you to receive push notifications effortlessly.
+Plugin.FirebasePushNotifications provides a seamless way to engage users and keep them informed about important events
+in your .NET MAUI applications. This open-source C# library integrates Firebase Cloud Messaging (FCM) into your .NET
+MAUI projects, enabling you to receive push notifications effortlessly.
+
+## Features
 
-### Features
-* Cross-platform Compatibility: Works seamlessly with .NET MAUI, ensuring a consistent push notification experience across different devices and platforms.
+* Cross-platform Compatibility: Works seamlessly with .NET MAUI, ensuring a consistent push notification experience
+  across different devices and platforms.
 * Easy Integration: Simple setup process to incorporate Firebase Push Notifications into your .NET MAUI apps.
-* Flexible Messaging: Utilize FCM's powerful features, such as targeted messaging, to send notifications based on user segments or specific conditions.
+* Flexible Messaging: Utilize FCM's powerful features, such as targeted messaging, to send notifications based on user
+  segments or specific conditions.
+
+## Download and Install Plugin.FirebasePushNotifications
 
-### Download and Install Plugin.FirebasePushNotifications
 This library is available on NuGet: https://www.nuget.org/packages/Plugin.FirebasePushNotifications
 Use the following command to install Plugin.FirebasePushNotifications using NuGet package manager console:
 
@@ -16,10 +23,16 @@ Use the following command to install Plugin.FirebasePushNotifications using NuGe
 
 You can use this library in any .NET MAUI project compatible to .NET 7 and higher.
 
-### Setup
-#### Setup Firebase Push Notifications
-- Go to https://console.firebase.google.com and create a new project. The setup of Firebase projects is not (yet?) documented here. Contributors welcome!
-- You have to download the resulting Firebase service files and integrate them into your .NET MAUI csproj file. `google-services.json` is used by Android while `GoogleService-Info.plist` is accessible to iOS. Make sure the Include and the Link paths match.
+## Setup
+
+### Setup Firebase Push Notifications
+
+- Go to https://console.firebase.google.com and create a new project. The setup of Firebase projects is not (yet?)
+  documented here. Contributors welcome!
+- You have to download the resulting Firebase service files and integrate them into your .NET MAUI csproj file.
+  `google-services.json` is used by Android while `GoogleService-Info.plist` is accessible to iOS. Make sure the Include
+  and the Link paths match.
+
 ```
 <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
 	<GoogleServicesJson Include="Platforms\Android\Resources\google-services.json" Link="Platforms\Android\Resources\google-services.json" />
@@ -29,10 +42,14 @@ You can use this library in any .NET MAUI project compatible to .NET 7 and highe
 	<BundleResource Include="Platforms\iOS\GoogleService-Info.plist" Link="GoogleService-Info.plist" />
 </ItemGroup>
 ```
-- iOS apps need to be enabled to support push notifications. Turn on the "Push Notifications" capability of your app in the [Apple Developer Portal](https://developer.apple.com).
 
-#### MAUI App Startup
-This plugin provides an extension method for MauiAppBuilder `UseFirebasePushNotifications` which ensure proper startup and initialization. Call this method within your `MauiProgram` just as demonstrated in the MauiSampleApp:
+- iOS apps need to be enabled to support push notifications. Turn on the "Push Notifications" capability of your app in
+  the [Apple Developer Portal](https://developer.apple.com).
+
+### MAUI App Startup
+
+This plugin provides an extension method for MauiAppBuilder `UseFirebasePushNotifications` which ensure proper startup
+and initialization. Call this method within your `MauiProgram` just as demonstrated in the MauiSampleApp:
 
 ```csharp
 var builder = MauiApp.CreateBuilder()
@@ -40,16 +57,22 @@ var builder = MauiApp.CreateBuilder()
     .UseFirebasePushNotifications();
 ```
 
-`UseFirebasePushNotifications` has optional configuration parameters which are documented in another section of this document.
+`UseFirebasePushNotifications` has optional configuration parameters which are documented in another section of this
+document.
 
+### Android-specific Setup
 
-#### Android-specific Setup
-- Copy the google-services.json to path location Platforms\Android\Resources\google-services.json (depending on what is configured in the csproj file).
-- Make sure your launcher activity (usually this is MainActivity - but not always) uses `LaunchMode = LaunchMode.SingleTask`. You can also use a different LaunchMode; just be very sure what you do!
+- Copy the google-services.json to path location Platforms\Android\Resources\google-services.json (depending on what is
+  configured in the csproj file).
+- Make sure your launcher activity (usually this is MainActivity - but not always) uses
+  `LaunchMode = LaunchMode.SingleTask`. You can also use a different LaunchMode; just be very sure what you do!
 
-#### iOS-specific Setup
-- Copy the GoogleService-Info.plist to path location Platforms\iOS\GoogleService-Info.plist (depending on what is configured in the csproj file).
+### iOS-specific Setup
+
+- Copy the GoogleService-Info.plist to path location Platforms\iOS\GoogleService-Info.plist (depending on what is
+  configured in the csproj file).
 - Extend the AppDelegate.cs file with following method exports:
+
 ```csharp
 [Export("application:didRegisterForRemoteNotificationsWithDeviceToken:")]
 [BindingImpl(BindingImplOptions.GeneratedCode | BindingImplOptions.Optimizable)]
@@ -73,11 +96,16 @@ public void DidReceiveRemoteNotification(UIApplication application, NSDictionary
 }
 ```
 
+## API Usage
 
-### API Usage
-`IFirebasePushNotification` is the main interface which handles most of the desired Firebase push notification features. This interface is injectable via dependency injection or accessible as a static singleton instance `IFirebasePushNotification.Current`. We strongly encourage you to use the dependency injection approach in order to keep your code testable.
+`IFirebasePushNotification` is the main interface which handles most of the desired Firebase push notification features.
+This interface is injectable via dependency injection or accessible as a static singleton instance
+`IFirebasePushNotification.Current`. We strongly encourage you to use the dependency injection approach in order to keep
+your code testable.
+
+The following lines of code demonstrate how the `IFirebasePushNotification` instance is injected in `MainViewModel` and
+assigned to a local field for later use:
 
-The following lines of code demonstrate how the `IFirebasePushNotification` instance is injected in `MainViewModel` and assigned to a local field for later use:
 ```csharp
 public MainViewModel(
     ILogger<MainViewModel> logger,
@@ -88,39 +116,54 @@ public MainViewModel(
 }
 ```
 
-#### Managing Notification Permissions
-Before we can receive any notification we need to make sure the user has given consent to receive notifications. `INotificationPermissions` is the service you can use to check the current authorization status or ask for notification permission.
-You can either inject `INotificationPermissions` into your view models or access it via the the static singleton instance `INotificationPermissions.Current`.
+### Notification Permissions
+
+Before we can receive any notification we need to make sure the user has given consent to receive notifications.
+`INotificationPermissions` is the service you can use to check the current authorization status or ask for notification
+permission.
+You can either inject `INotificationPermissions` into your view models or access it via the the static singleton
+instance `INotificationPermissions.Current`.
 
 - Check the current notification permission status:
+
 ```csharp
 this.AuthorizationStatus = await this.notificationPermissions.GetAuthorizationStatusAsync();
 ```
 
 - Ask the user for notification permission:
+
 ```csharp
 await this.notificationPermissions.RequestPermissionAsync();
 ```
 
-Notification permissions are handled by the underlying operating system (iOS, Android). This library just wraps the platform-specific methods and provides a uniform API for them.
+Notification permissions are handled by the underlying operating system (iOS, Android). This library just wraps the
+platform-specific methods and provides a uniform API for them.
+
+### Register for Notifications
 
-#### Receive Notifications
-The main goal of a push notification client library is to receive notification messages. This library provides a set of classic .NET events to inform your code about incoming push notifications.
-Before any notification event is received, we have to inform the Firebase client library, that we're ready to receive notifications.
-`RegisterForPushNotificationsAsync` registers our app with the Firebase push notification backend and receives a token. This token is used by your own server/backend to send push notifications directly to this particular app instance.
-The token may change after some time. It is not controllable by this library if/when the token is going to be updated. The `TokenRefreshed` event will be fired whenever a new token is available.
+The main goal of a push notification client library is to receive notification messages. This library provides a set of
+classic .NET events to inform your code about incoming push notifications.
+Before any notification event is received, we have to inform the Firebase client library, that we're ready to receive
+notifications.
+`RegisterForPushNotificationsAsync` registers our app with the Firebase push notification backend and receives a token.
+This token is used by your own server/backend to send push notifications directly to this particular app instance.
+The token may change after some time. It is not controllable by this library if/when the token is going to be updated.
+The `TokenRefreshed` event will be fired whenever a new token is available.
 See `Token` property and `TokenRefreshed` event provided by `IFirebasePushNotification` for more info.
 
 ```csharp
 await this.firebasePushNotification.RegisterForPushNotificationsAsync();
 ```
 
-If we want to turn off any incoming notifications, we can unregister from push notifications. The `Token` can no longer be used to send push notifications to.
+If we want to turn off any incoming notifications, we can unregister from push notifications. The `Token` can no longer
+be used to send push notifications to.
+
 ```csharp
 await this.firebasePushNotification.UnregisterForPushNotificationsAsync();
 ```
 
-Following .NET events can be subscribed:
+### Receive Notifications
+Following .NET events can be subscribed.
 
 | Events                 | Description                                                                                                                                                                                                                                          |
 |------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -130,25 +173,69 @@ Following .NET events can be subscribed:
 | `NotificationAction`   | Is raised when the user taps a notification action. Notification actions allow users to make simple decisions when a notification is received, e.g. "Do you like to take your medicine?" could be answered with "Take medicine" and "Skip medicine". |
 | `NotificationDeleted`  | Is raised when the user deletes a received notification.                                                                                                                                                                                             |
 
-#### Topics
+#### Notification Handling Behavior
+The following table documents the behavior of each platform for incoming push notifications. We distinguish between notification message and data message.
+- **Notification messages** must have a `notification` part with `title` and/or `body`. Other sections such as `data` are optional.
+- **Data messages** must only have a `data` section (and can have platform specific options). The purpose of this message type is to send data-only messages without displaying a system notification popup.
+
+The behavior when receiving notifications is also different if the app runs in foreground or in background mode.
+The following table illustrates some use cases with different message types, priority flags and app states.
+
+| Message Type         | Data Payload       | OS      | App State  | Notification Channel | Behavior                                                                    |
+|----------------------|--------------------|---------|------------|----------------------|-----------------------------------------------------------------------------|
+| Notification message | -                  | Android | Foreground |                      | `NotificationReceived` event is fired                                       |
+| Notification message | -                  | iOS     | Foreground |                      | `NotificationReceived` event is fired                                       |
+| Notification message | `priority: "low"`  | Android | Foreground |                      | `NotificationReceived` event is fired                                       |
+| Notification message | `priority: "low"`  | iOS     | Foreground |                      | `NotificationReceived` event is fired                                       |
+| Notification message | `priority: "high"` | Android | Foreground | `Importance=Default` | `NotificationReceived` event is fired + Notification icon in status bar     |
+| Notification message | `priority: "high"` | Android | Foreground | `Importance=High`    | `NotificationReceived` event is fired + System notification popup           |
+| Notification message | `priority: "high"` | iOS     | Foreground |                      | `NotificationReceived` event is fired + System notification popup           |
+| Notification message | -                  | Android | Background | `Importance=Default` | Notification icon in status bar                                             |
+| Notification message | -                  | Android | Background | `Importance=High`    | System notification popup                                                   |
+| Notification message | -                  | iOS     | Background |                      | System notification popup                                                   |
+| Notification message | `priority: "low"`  | Android | Background | `Importance=Default` | Notification icon in status bar                                             |
+| Notification message | `priority: "low"`  | Android | Background | `Importance=High`    | System notification popup                                                   |
+| Notification message | `priority: "low"`  | iOS     | Background |                      | System notification popup                                                   |
+| Notification message | `priority: "high"` | Android | Background | `Importance=Default` | Notification icon in status bar                                             |
+| Notification message | `priority: "high"` | Android | Background | `Importance=High`    | System notification popup                                                   |
+| Notification message | `priority: "high"` | iOS     | Background |                      | System notification popup                                                   |
+|                      |                    |         |            |                      |                                                                             |
+| Data message         |                    | Android | Foreground |                      | `NotificationReceived` event is fired                                       |
+| Data message         |                    | iOS     | Foreground |                      | `NotificationReceived` event is fired                                       |
+| Data message         |                    | Android | Background |                      | `NotificationReceived` event is fired as soon as app enters foreground mode |
+| Data message         |                    | iOS     | Background |                      | `NotificationReceived` event is fired as soon as app enters foreground mode |
+
+*) _System notification popup: Official name is **heads-up notification** on Android and **banner notification** on
+iOS._
+
+*) _Notification channels exist on Android since Android 8.0 (API level 26)._
+
+### Topics
+
 The most common way of sending push notifications is by targeting notification message directly to push tokens.
 Firebase allows to send push notifications to groups of devices, so-called topics.
-If a user subscribes to a topic, e.g. "weather_updates" you can send push notifications to this topic instead of a list of push tokens.
+If a user subscribes to a topic, e.g. "weather_updates" you can send push notifications to this topic instead of a list
+of push tokens.
+
+#### Subscribe to Topic
+
+Use method `SubscribeTopicAsync` with the name of the topic.
 
-##### Subscribe to Topics
-Use method `SubscribeTopic` with the name of the topic.
 ```csharp
-this.firebasePushNotification.SubscribeTopic("weather_updates");
+this.firebasePushNotification.SubscribeTopicAsync("weather_updates");
 ```
 
-Important:
-- Make sure you did run `RegisterForPushNotificationsAsync` before you subscribe to topics.
-- Topic names are case-sensitive: Registrations for topic `"weather_updates"` will not receive messages targeted to topic `"Weather_Updates"`.
+> [!IMPORTANT]
+> - Make sure you did run `RegisterForPushNotificationsAsync` before you subscribe to topics.
+> - Topic names are case-sensitive: Registrations for topic `"weather_updates"` will not receive messages targeted to topic `"Weather_Updates"`.
 
-##### Send Notifications to Topic Subscribers
-Use the Firebase Admin SDK (or any other HTTP client) to send a push notification targeting subscribers of the "weather_updates" topic:
+#### Send Notifications to Topic Subscribers
+
+Use the Firebase Admin SDK (or any other HTTP client) to send a push notification targeting subscribers of the topic `"weather_updates"`. 
+Instead of message property `to` which addresses an FCM token directly, we use `topic` to send notification messages to a whole group of subscribed devices.
 
 `HTTP POST https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send`
+
 ```
 {
     "message": {
@@ -169,11 +256,16 @@ Use the Firebase Admin SDK (or any other HTTP client) to send a push notificatio
 
 ![Notification Topic weather_updates](Docs/notificationtopic_weatherupdates.png?raw=true)
 
-#### Notification Actions
-Notification actions are special buttons which allow for immediate response to a particular notification. A list of `NotificationActions` is consolidated within a `NotificationCategory`.
+### Notification Actions
+
+Notification actions are special buttons which allow for immediate response to a particular notification. A list of
+`NotificationActions` is consolidated within a `NotificationCategory`.
+
+#### Register Notification Actions
+
+The following example demonstrates the registration of a notification category with identifier "medication_intake" and
+two actions "Take medicine" and "Skip medicine":
 
-##### Register Notification Actions
-The following example demonstrates the registration of a notification category with identifier "medication_intake" and two actions "Take medicine" and "Skip medicine":
 ```csharp
 var categories = new[]
 {
@@ -186,18 +278,23 @@ var categories = new[]
 ```
 
 Notification categories are usually registered at app startup time using the following method call:
+
 ```csharp
 IFirebasePushNotification.Current.RegisterNotificationCategories(categories);
 ```
 
-##### Subscribe to Notification Actions
-Subscribe the event `IFirebasePushNotification.NotificationAction` to get notified if a user presses one of the notification action buttons.
+#### Subscribe to Notification Actions
+
+Subscribe the event `IFirebasePushNotification.NotificationAction` to get notified if a user presses one of the
+notification action buttons.
 The delivered event args `FirebasePushNotificationResponseEventArgs` will let you know which action was pressed.
 
-##### Send Notification Actions
+#### Send Notification Actions
+
 Use the Firebase Admin SDK (or any other HTTP client) to send a push notification with:
 
 `HTTP POST https://fcm.googleapis.com/v1/projects/myproject-b5ae1/messages:send`
+
 ```
 {
     "message": {
@@ -229,46 +326,73 @@ If everything works fine, the mobile device with the given token displays the no
 
 ![Notification Category medication_intake](Docs/notificationcategory_takemedicine.png?raw=true)
 
-#### Notification Channels
-Notification channels are an Android feature introduced in Android 8.0 (API level 26) that let users manage notification settings for different categories of notifications within the app.
-Each notification channel represents a distinct type of notification (such as chat messages, medication intake, or promotions) and allows users to customize notification preferences per channel, rather than for the whole app.
+### Notification Channels
+
+Notification channels are an Android feature introduced in Android 8.0 (API level 26) that let users manage notification
+settings for different categories of notifications within the app.
+Each notification channel represents a distinct type of notification (such as chat messages, medication intake, or
+promotions) and allows users to customize notification preferences per channel, rather than for the whole app.
 
-##### Default Notification Channel
-Your app must always have at least one notification channel. This library will use this channel for any notifications that are not targeting a specific channel. This ensures that push notifications are delivered even if a custom channel is not set up.
+#### Default Notification Channel
 
-It is highly recommended to create the default notification channel by yourself so that all properties are under your control.
-Use `INotificationChannels.Channels` methods to create notification channels manually at startup or specify them in the Android-specific options under `UseFirebasePushNotifications(o => o.Android.NotificationChannels = ...)`).
-To get an idea of how to use the `NotificationChannels` option, take a look at `MauiProgram.cs` in the sample app in this repository.
+Your app must always have at least one notification channel. This library will use this channel for any notifications
+that are not targeting a specific channel. This ensures that push notifications are delivered even if a custom channel
+is not set up.
 
-##### Notification Channel Importance
-When your app (or this library) creates a notification channel, you must specify its importance (e.g., `Low`, `Default`, `High`). 
-Importance controls how notifications are presented (such as whether they make a sound or appear as a heads-up notification).
+It is highly recommended to create the default notification channel by yourself so that all properties are under your
+control.
+Use `INotificationChannels.Channels` methods to create notification channels manually at startup or specify them in the
+Android-specific options under `UseFirebasePushNotifications(o => o.Android.NotificationChannels = ...)`).
+To get an idea of how to use the `NotificationChannels` option, take a look at `MauiProgram.cs` in the sample app in
+this repository.
+
+#### Notification Channel Importance
+
+When your app (or this library) creates a notification channel, you must specify its importance (e.g., `Low`, `Default`,
+`High`).
+Importance controls how notifications are presented (such as whether they make a sound or appear as a heads-up
+notification).
 
 > [!IMPORTANT]
-> The importance level can only be set once when the channel is created. It cannot be changed afterward. 
+> The importance level can only be set once when the channel is created. It cannot be changed afterward.
 > If you need to modify a channel’s importance, you must create a new channel with a different ID.
 
-##### Notification Channel Groups
+#### Notification Channel Groups
+
 Multiple notification channels may be grouped together within a notification channel group.
 Use `INotificationChannels.ChannelGroups` methods to create/delete notification channel groups.
 
-#### More Push Notification Scenarios
+### More Push Notification Scenarios
+
 There are a lot of features in this library that can be controlled via specific data flags. The most common scenarios
-are end-to-end tested using postman calls. You can find an up-to-date postman collection in this repository:
-[FCM Plugin.FirebasePushNotifications.postman_collection.json](<Docs/FCM Plugin.FirebasePushNotifications.postman_collection.json>)
+are end-to-end tested with the MauiSampleApp using postman calls. You can find an
+up-to-date [postman collection](<Docs/FCM Plugin.FirebasePushNotifications.postman_collection.json>) in this repository.
 
 - Import the collection in postman.
 - Adjust the variables, especially the `project_id` and the `fcm_token` accordingly.
-- Get a Bearer authentication token either by selecting the Auth Type "Firebase Cloud Messaging API (Oauth 2.0)" or by creating it manually via https://developers.google.com/oauthplayground (see this [youtube video](https://www.youtube.com/watch?v=PYfpBwupoMQ)).
+- Get a Bearer authentication token either by selecting the Auth Type "Firebase Cloud Messaging API (Oauth 2.0)" or by
+  creating it manually via https://developers.google.com/oauthplayground (see
+  this [youtube video](https://www.youtube.com/watch?v=PYfpBwupoMQ)).
 
 ### Options
+
 > *to be documented*
 
-### Contribution
-Your contribution is valuable! If you find a bug or want to propose a new feature, feel free to create a new issue [here](https://github.com/thomasgalliker/Plugin.FirebasePushNotifications/issues/new/choose).
+## Contribution
+
+If you find a bug or want to propose a new feature, feel free to create a new
+issue [here](https://github.com/thomasgalliker/Plugin.FirebasePushNotifications/issues/new/choose).
 Please use the **predefined issue templates** when submitting a new issue.
 
-### Links
+## Thank You
+
+Your contribution is valuable!
+Open source software isn’t just something you can pick up for free — it represents the hard work and dedication of many
+people who often not even know each other.
+We sincerely appreciate the time, effort, and dedication shown by everyone who helps keep this plugin going forward.
+
+## Links
+
 - FCM messages, data format, concepts and options:
 
   https://firebase.google.com/docs/cloud-messaging/concept-options
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e1cb8f8..2c98164 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,8 +25,8 @@ variables:
   solution: 'Plugin.FirebasePushNotifications.sln'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
-  majorVersion: 3
-  minorVersion: 3
+  majorVersion: 4
+  minorVersion: 0
   patchVersion: $[counter(format('{0}.{1}', variables.majorVersion, variables.minorVersion), 0)]
   ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
     # Versioning: 1.0.0

From f81b2ac6f46f52013761651babc96ef49e299bcd Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 14:07:53 +0200
Subject: [PATCH 24/54] Don't process intent actions with
 android.intent.action.MAIN

---
 .../Android/FirebasePushNotificationManager.cs     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
index c91644b..4fb6acb 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
@@ -163,10 +163,6 @@ public void ProcessIntent(Activity activity, Intent intent)
                 return;
             }
 
-            var extras = intent.GetExtrasDict();
-            this.logger.LogDebug(
-                $"ProcessIntent: activity.Type={activityType.Name}, intent.Flags=[{intent.Flags}], intent.Extras=[{extras.ToDebugString()}]");
-
             var launchedFromHistory = intent.Flags.HasFlag(ActivityFlags.LaunchedFromHistory);
             if (launchedFromHistory)
             {
@@ -174,6 +170,16 @@ public void ProcessIntent(Activity activity, Intent intent)
                 return;
             }
 
+            if (string.Equals(intent.Action, Intent.ActionMain, StringComparison.InvariantCultureIgnoreCase))
+            {
+                // Don't process the intent if intent action is android.intent.action.MAIN
+                return;
+            }
+
+            var extras = intent.GetExtrasDict();
+            this.logger.LogDebug(
+                $"ProcessIntent: activity.Type={activityType.Name}, intent.Flags=[{intent.Flags}], intent.Extras=[{extras.ToDebugString()}]");
+
             if (extras.Any())
             {
                 // Don't process old/historic intents which are recycled for whatever reason

From 59987d85ebff4392df25b2a33020aaf4f70564cd Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 14:08:30 +0200
Subject: [PATCH 25/54] Refactor and reuse icon resource methods

---
 .../Platforms/Android/NotificationBuilder.cs  | 73 +++++++++----------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
index 195012b..7025208 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
@@ -305,8 +305,8 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
                                     PendingIntentFlags.UpdateCurrent | PendingIntentFlags.Immutable);
                             }
 
-                            var icon = context.Resources.GetIdentifier(notificationAction.Icon ?? "", "drawable", context.PackageName);
-                            var action = new NotificationCompat.Action.Builder(icon, notificationAction.Title, pendingActionIntent).Build();
+                            var iconResource = this.GetIconResourceFromDrawableOrMipmap(context, notificationAction.Icon);
+                            var action = new NotificationCompat.Action.Builder(iconResource, notificationAction.Title, pendingActionIntent).Build();
                             notificationBuilder.AddAction(action);
                         }
                     }
@@ -440,12 +440,7 @@ private static long[] GetNotificationVibrationPattern(NotificationImportance not
 
         private Bitmap GetLargeIconBitmap(IDictionary<string, object> data, Context context)
         {
-            var largeIconResource = this.GetIconResourceFromDrawable(context, data, Constants.LargeIconKey);
-
-            if (largeIconResource == 0)
-            {
-                largeIconResource = this.GetIconResourceFromMipmap(context, data, Constants.LargeIconKey);
-            }
+            var largeIconResource = this.GetIconResourceFromDrawableOrMipmap(context, data, Constants.LargeIconKey);
 
             if (largeIconResource == 0 &&
                 data.TryGetString(Constants.LargeIconKey, out var largeIconUrl) &&
@@ -509,12 +504,7 @@ private Bitmap DownloadBitmap(string url)
 
         private int GetSmallIconResource(IDictionary<string, object> data, Context context)
         {
-            var smallIconResource = this.GetIconResourceFromDrawable(context, data, Constants.IconKey);
-
-            if (smallIconResource == 0)
-            {
-                smallIconResource = this.GetIconResourceFromMipmap(context, data, Constants.IconKey);
-            }
+            var smallIconResource = this.GetIconResourceFromDrawableOrMipmap(context, data, Constants.IconKey);
 
             if (smallIconResource == 0 && this.options.Android.DefaultIconResource is int defaultIconResource)
             {
@@ -590,48 +580,55 @@ private string TryGetResourceName(Context context, int resid, string residName,
             return resourceName;
         }
 
-        private static int GetIconResourceFromDrawableOrMipmap___(Context context, IDictionary<string, object> data, string dataKey)
+        private int GetIconResourceFromDrawableOrMipmap(Context context, IDictionary<string, object> data, string iconKey)
         {
-            var iconResourceId = 0;
+            var iconResource = 0;
 
-            if (data.TryGetString(dataKey, out var iconKey) && iconKey != null)
+            if (data.TryGetString(iconKey, out var iconName))
             {
-                iconResourceId = context.Resources.GetIdentifier(iconKey, "drawable", context.PackageName);
-
-                if (iconResourceId == 0)
-                {
-                    iconResourceId = context.Resources.GetIdentifier(iconKey, "mipmap", context.PackageName);
-                }
+                iconResource = this.GetIconResourceFromDrawableOrMipmap(context, iconName);
             }
 
-            return iconResourceId;
+            return iconResource;
         }
 
-        private int GetIconResourceFromDrawable(Context context, IDictionary<string, object> data, string dataKey)
+        private int GetIconResourceFromDrawableOrMipmap(Context context, string iconName)
         {
-            return this.GetIconResource(context, data, dataKey, "drawable");
+            if (string.IsNullOrEmpty(iconName))
+            {
+                return 0;
+            }
+
+            var iconResource = this.GetIconResourceFromDrawable(context, iconName);
+
+            if (iconResource == 0)
+            {
+                iconResource = this.GetIconResourceFromMipmap(context, iconName);
+            }
+
+            return iconResource;
         }
 
-        private int GetIconResourceFromMipmap(Context context, IDictionary<string, object> data, string dataKey)
+        private int GetIconResourceFromMipmap(Context context, string iconName)
         {
-            return this.GetIconResource(context, data, dataKey, "mipmap");
+            return this.GetIconResource(context, iconName, "mipmap");
         }
 
-        private int GetIconResource(Context context, IDictionary<string, object> data, string dataKey, string defType)
+        private int GetIconResourceFromDrawable(Context context, string iconName)
         {
-            var iconResourceId = 0;
+            return this.GetIconResource(context, iconName, "drawable");
+        }
 
-            if (data.TryGetString(dataKey, out var iconKey) && iconKey != null)
+        private int GetIconResource(Context context, string iconName, string defType)
+        {
+            var resourceId = context.Resources.GetIdentifier(iconName, defType, context.PackageName);
+            var resourceName = this.TryGetResourceName(context, resourceId, nameof(resourceId), nameof(this.GetIconResource), defType);
+            if (resourceName == null)
             {
-                iconResourceId = context.Resources.GetIdentifier(iconKey, defType, context.PackageName);
-                var resourceName = this.TryGetResourceName(context, iconResourceId, nameof(iconResourceId), nameof(this.GetIconResource), defType);
-                if (resourceName == null)
-                {
-                    iconResourceId = 0;
-                }
+                resourceId = 0;
             }
 
-            return iconResourceId;
+            return resourceId;
         }
 
         private int? GetNotificationColor(IDictionary<string, object> data)

From 76efcf84321fa7a7611e20a16794e76d81cf30a8 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 14:08:58 +0200
Subject: [PATCH 26/54] Refactor notification id and tag methods

---
 .../Platforms/Android/NotificationBuilder.cs  | 36 ++++++++-----------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
index 7025208..b7d39a4 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs
@@ -123,12 +123,13 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
                 extras.PutString(kvp.Key, kvp.Value.ToString());
             }
 
-            var notificationId = this.GetNotificationId(data);
+            var notificationId = GetNotificationId(data);
             extras.PutInt(Constants.ActionNotificationIdKey, notificationId);
 
-            if (data.TryGetString(Constants.NotificationTagKey, out var tag))
+            var notificationTag = GetNotificationTag(data);
+            if (notificationTag != null)
             {
-                extras.PutString(Constants.ActionNotificationTagKey, tag);
+                extras.PutString(Constants.ActionNotificationTagKey, notificationTag);
             }
 
             var context = Application.Context;
@@ -330,13 +331,13 @@ public virtual void OnNotificationReceived(IDictionary<string, object> data)
             var notificationManager = (NotificationManager)context.GetSystemService(Context.NotificationService);
             var notification = notificationBuilder.Build();
 
-            if (tag == null)
+            if (notificationTag == null)
             {
                 notificationManager.Notify(notificationId, notification);
             }
             else
             {
-                notificationManager.Notify(tag, notificationId, notification);
+                notificationManager.Notify(notificationTag, notificationId, notification);
             }
         }
 
@@ -727,27 +728,18 @@ private NotificationChannel GetNotificationChannel(IDictionary<string, object> d
             return notificationChannel;
         }
 
-        private int GetNotificationId(IDictionary<string, object> data)
+        private static int GetNotificationId(IDictionary<string, object> data)
         {
-            var notificationId = 0;
-
-            // TODO: Use TryGetInt here
-            if (data.TryGetString(Constants.IdKey, out var id))
-            {
-                try
-                {
-                    notificationId = Convert.ToInt32(id);
-                }
-                catch (Exception ex)
-                {
-                    // Keep the default value of zero for the notify_id, but log the conversion problem.
-                    this.logger.LogError(ex, $"Failed to convert {id} to an integer");
-                }
-            }
-
+            data.TryGetInt(Constants.IdKey, out var notificationId);
             return notificationId;
         }
 
+        private static string GetNotificationTag(IDictionary<string, object> data)
+        {
+            data.TryGetString(Constants.NotificationTagKey, out var notificationTag);
+            return notificationTag;
+        }
+
         private static NotificationImportance? GetNotificationImportance(IDictionary<string, object> data)
         {
             NotificationImportance? notificationImportance = null;

From 99a0bf274071ebaf05c6f0b586ba80c279cb4e4a Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 14:09:35 +0200
Subject: [PATCH 27/54] Adjust sample app to comply with latest changes/renames

---
 .../NotificationChannelSamples.cs             |  30 ++++++++++++----
 .../drawable/ic_radiobox_checked.png          | Bin 0 -> 345 bytes
 .../drawable/ic_radiobox_unchecked.png        | Bin 0 -> 319 bytes
 .../Android/Resources/values/colors.xml       |   4 +--
 .../MauiSampleApp/ViewModels/MainViewModel.cs |   6 ++--
 .../ViewModels/NotificationCategorySamples.cs |   8 ++---
 .../SubscribedTopicItemTemplate.xaml          |   7 ++--
 Samples/MauiSampleApp/Views/MainPage.xaml     |  34 +++++++++++-------
 8 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_checked.png
 create mode 100644 Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_unchecked.png

diff --git a/Samples/MauiSampleApp/Platforms/Android/Notifications/NotificationChannelSamples.cs b/Samples/MauiSampleApp/Platforms/Android/Notifications/NotificationChannelSamples.cs
index b784bd4..44eaeb6 100644
--- a/Samples/MauiSampleApp/Platforms/Android/Notifications/NotificationChannelSamples.cs
+++ b/Samples/MauiSampleApp/Platforms/Android/Notifications/NotificationChannelSamples.cs
@@ -23,26 +23,44 @@ public static IEnumerable<NotificationChannelRequest> GetAll()
             {
                 ChannelId = "test_channel_1",
                 ChannelName = "Test Channel 1",
-                Description = "Description for test channel 1",
+                Description = "Low priority test channel",
                 LockscreenVisibility = NotificationVisibility.Public,
-                Importance = NotificationImportance.High,
+                Importance = NotificationImportance.Low,
             };
 
             yield return new NotificationChannelRequest
             {
                 ChannelId = "test_channel_2",
                 ChannelName = "Test Channel 2",
-                Description = "Description for test channel 2",
-                Group = NotificationChannelGroupSamples.TestGroup1.GroupId,
+                Description = "Default priority test channel",
                 LockscreenVisibility = NotificationVisibility.Public,
-                Importance = NotificationImportance.High,
+                Importance = NotificationImportance.Default,
             };
 
             yield return new NotificationChannelRequest
             {
                 ChannelId = "test_channel_3",
                 ChannelName = "Test Channel 3",
-                Description = "Description for test channel 3",
+                Description = "High priority test channel",
+                LockscreenVisibility = NotificationVisibility.Public,
+                Importance = NotificationImportance.High,
+            };
+
+            yield return new NotificationChannelRequest
+            {
+                ChannelId = "test_channel_4",
+                ChannelName = "Test Channel 4",
+                Description = "Test channel assigned to group 1",
+                Group = NotificationChannelGroupSamples.TestGroup1.GroupId,
+                LockscreenVisibility = NotificationVisibility.Public,
+                Importance = NotificationImportance.High,
+            };
+
+            yield return new NotificationChannelRequest
+            {
+                ChannelId = "test_channel_5",
+                ChannelName = "Test Channel 5",
+                Description = "Test channel assigned to group 1",
                 Group = NotificationChannelGroupSamples.TestGroup1.GroupId,
                 LockscreenVisibility = NotificationVisibility.Public,
                 Importance = NotificationImportance.High,
diff --git a/Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_checked.png b/Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..1192c5a26ef54b64ffd862281c6d375686c6dff4
GIT binary patch
literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$6G=otR7gv`Ra*|iFbvC12Am8y8E`VdQ(c)fY0F1fY1-6B>^P~n+2XM+j&Cyn
zXEVDNBKXF5n%S#--+Cl_01V8ay*T&pVhEH0U^7{hE#7!A0IHc`E(D1HG<eEP(&_H^
z0RILjj-I<nrcIIG<%DPM>p|I6cY<IIAp6h^ltni03+;(KN^NQuQ6N2}pjj8GBuy3y
z(4d<c=Xx!wl0ZtFsdEZI{iC_jg-_!g3b0%v0%(z`>8wq#$Tfya)D%d}jJ7dq)8-!e
zn;d0<pkQ_?Jx(_TOL`OckVuW|0aTJ1ABwEv=iK3D7crt0M|Q2UP1|(_l64Y*eLd>l
rnO`Oy(-&DYOWSw`U}O{B_2mE`%7a`PXAJYS00000NkvXXu0mjflG}{%

literal 0
HcmV?d00001

diff --git a/Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_unchecked.png b/Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_unchecked.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8ee7956409eb3f2267b3b4a3b20150a06f362a5
GIT binary patch
literal 319
zcmV-F0l@x=P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#`AI}UR7gv`m4ObzAPhviFH^rv{WA5-)H58pLCYA5B+Hf!?)6&e7Mnbl$@<m<
zIGWix1%hXcyO}-G^Q9GJ3qWCtwsfxVk1i+zU^1g-w7BEK092jfoeS{*Djr5AcAE1`
zz+Q23blpjuRz-fM6+MxcH6a9P1mrW+fkx4@yS$>`Qf;ye4=@sanX2qU0Tq4V5MpOR
z#|1F|qv>HhD;*V^4w#-I0)A2Ctf48Y3N%pU>Kv5?{l<lRj!FPsgv~2(6}FhaH#@I+
z(T&%x52-cmYS$4YsyV>eHT+ks=JlLf{;4!tiiN^nHyzlO+e>;JY^yY8yZ``gNEvHH
R;*tOW002ovPDHLkV1fw4gg5{I

literal 0
HcmV?d00001

diff --git a/Samples/MauiSampleApp/Platforms/Android/Resources/values/colors.xml b/Samples/MauiSampleApp/Platforms/Android/Resources/values/colors.xml
index d5df092..8e7a6bb 100644
--- a/Samples/MauiSampleApp/Platforms/Android/Resources/values/colors.xml
+++ b/Samples/MauiSampleApp/Platforms/Android/Resources/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#FDA612</color>
-    <color name="colorPrimaryDark">#F6820C</color>
-    <color name="colorAccent">#F6820C</color>
+    <color name="colorPrimaryDark">#FDA612</color>
+    <color name="colorAccent">#FDA612</color>
     <color name="ic_default_notification_color">#FF00FF</color>
 </resources>
\ No newline at end of file
diff --git a/Samples/MauiSampleApp/ViewModels/MainViewModel.cs b/Samples/MauiSampleApp/ViewModels/MainViewModel.cs
index a58ce4b..a5263c4 100644
--- a/Samples/MauiSampleApp/ViewModels/MainViewModel.cs
+++ b/Samples/MauiSampleApp/ViewModels/MainViewModel.cs
@@ -746,7 +746,7 @@ private async Task SubscribeToTopicAsync()
             try
             {
                 var topic = this.Topic;
-                this.firebasePushNotification.SubscribeTopic(topic);
+                await this.firebasePushNotification.SubscribeTopicAsync(topic);
                 this.UpdateSubscribedTopics();
                 this.Topic = null;
             }
@@ -761,7 +761,7 @@ private async Task UnsubscribeFromTopicAsync(string topic)
         {
             try
             {
-                this.firebasePushNotification.UnsubscribeTopic(topic);
+                await this.firebasePushNotification.UnsubscribeTopicAsync(topic);
                 this.UpdateSubscribedTopics();
             }
             catch (Exception ex)
@@ -780,7 +780,7 @@ private async Task UnsubscribeAllTopicsAsync()
         {
             try
             {
-                this.firebasePushNotification.UnsubscribeAllTopics();
+                await this.firebasePushNotification.UnsubscribeAllTopicsAsync();
                 this.UpdateSubscribedTopics();
             }
             catch (Exception ex)
diff --git a/Samples/MauiSampleApp/ViewModels/NotificationCategorySamples.cs b/Samples/MauiSampleApp/ViewModels/NotificationCategorySamples.cs
index 5ba0356..47a0158 100644
--- a/Samples/MauiSampleApp/ViewModels/NotificationCategorySamples.cs
+++ b/Samples/MauiSampleApp/ViewModels/NotificationCategorySamples.cs
@@ -23,16 +23,16 @@ public static IEnumerable<NotificationCategory> GetAll()
             });
             yield return new NotificationCategory("contract", new[]
             {
-                new NotificationAction("Accept", "Accept", NotificationActionType.Default, "accept"),
-                new NotificationAction("Reject", "Reject", NotificationActionType.Default, "reject")
+                new NotificationAction("Accept", "Accept", NotificationActionType.Default, "ic_radiobox_checked"),
+                new NotificationAction("Reject", "Reject", NotificationActionType.Default, "ic_radiobox_unchecked")
             });
             yield return new NotificationCategory("dismiss",new []
             {
-                new NotificationAction("dismiss","Dismiss", NotificationActionType.Default),
+                new NotificationAction("dismiss","Dismiss", NotificationActionType.Destructive),
             });
             yield return new NotificationCategory("navigate", new []
             {
-                new NotificationAction("dismiss", "Dismiss", NotificationActionType.Default),
+                new NotificationAction("dismiss", "Dismiss", NotificationActionType.Destructive),
                 new NotificationAction("navigate", "Navigate To", NotificationActionType.Foreground)
             });
         }
diff --git a/Samples/MauiSampleApp/Views/ItemTemplates/SubscribedTopicItemTemplate.xaml b/Samples/MauiSampleApp/Views/ItemTemplates/SubscribedTopicItemTemplate.xaml
index c84713f..543c336 100644
--- a/Samples/MauiSampleApp/Views/ItemTemplates/SubscribedTopicItemTemplate.xaml
+++ b/Samples/MauiSampleApp/Views/ItemTemplates/SubscribedTopicItemTemplate.xaml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
+    x:Class="MauiSampleApp.Views.ItemTemplates.SubscribedTopicItemTemplate"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:vm="clr-namespace:MauiSampleApp.ViewModels"
-    x:Class="MauiSampleApp.Views.ItemTemplates.SubscribedTopicItemTemplate"
     x:DataType="vm:SubscribedTopicViewModel">
 
-    <Grid
-        Padding="4"
-        ColumnDefinitions="*, Auto"
-        ColumnSpacing="4">
+    <Grid ColumnDefinitions="*, Auto" ColumnSpacing="4">
         <Label
             Grid.Column="0"
             FontFamily="{StaticResource FontFamily.Monospace.Regular}"
diff --git a/Samples/MauiSampleApp/Views/MainPage.xaml b/Samples/MauiSampleApp/Views/MainPage.xaml
index 53f8009..cf3f9e1 100644
--- a/Samples/MauiSampleApp/Views/MainPage.xaml
+++ b/Samples/MauiSampleApp/Views/MainPage.xaml
@@ -267,20 +267,28 @@
                     VerticalOptions="Start" />
                 <VerticalStackLayout
                     BindableLayout.ItemTemplate="{StaticResource SubscribedTopicItemTemplate}"
-                    BindableLayout.ItemsSource="{Binding SubscribedTopics}" />
+                    BindableLayout.ItemsSource="{Binding SubscribedTopics}"
+                    Spacing="4" />
+
+                <Grid
+                    ColumnDefinitions="*,Auto"
+                    ColumnSpacing="4">
+                    <Entry
+                        Grid.Column="0"
+                        FontFamily="{StaticResource FontFamily.Monospace.Regular}"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        Keyboard="Url"
+                        Placeholder="New topic name"
+                        Text="{Binding Topic}" />
+                    <Button
+                        Grid.Column="1"
+                        Command="{Binding SubscribeToTopicCommand}"
+                        Text="Subscribe"
+                        HorizontalOptions="Fill"
+                        VerticalOptions="Start" />
+                </Grid>
 
-                <Entry
-                    FontFamily="{StaticResource FontFamily.Monospace.Regular}"
-                    IsSpellCheckEnabled="False"
-                    IsTextPredictionEnabled="False"
-                    Keyboard="Url"
-                    Placeholder="New topic name"
-                    Text="{Binding Topic}" />
-                <Button
-                    Command="{Binding SubscribeToTopicCommand}"
-                    Text="Subscribe to topic"
-                    HorizontalOptions="Fill"
-                    VerticalOptions="Start" />
                 <Button
                     Command="{Binding UnsubscribeAllTopicsCommand}"
                     LineBreakMode="MiddleTruncation"

From 8b2fa0a0af4e26639adcc4d9e239562307c36e1d Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Thu, 12 Jun 2025 14:18:20 +0200
Subject: [PATCH 28/54] Update postman collection with more firebase
 notification messages

---
 ...ePushNotifications.postman_collection.json | 923 +++++++++++++++---
 1 file changed, 801 insertions(+), 122 deletions(-)

diff --git a/Docs/FCM Plugin.FirebasePushNotifications.postman_collection.json b/Docs/FCM Plugin.FirebasePushNotifications.postman_collection.json
index ac2a9e8..12b9354 100644
--- a/Docs/FCM Plugin.FirebasePushNotifications.postman_collection.json	
+++ b/Docs/FCM Plugin.FirebasePushNotifications.postman_collection.json	
@@ -36,7 +36,113 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body sent @ {{currentDateTime}}\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"Notification body @ {{currentDateTime}}\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Notification Message with priority=low",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"Low priority notification message @ {{currentDateTime}}\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"low\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Notification Message with priority=default",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"Default priority notification message @ {{currentDateTime}}\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"default\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -65,6 +171,73 @@
 				},
 				{
 					"name": "Notification Message with priority=high",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"High priority notification message @ {{currentDateTime}}\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"high\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Notification Message with priority=high (2)",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
 					"request": {
 						"method": "POST",
 						"header": [
@@ -75,7 +248,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"high\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"High priority notification message @ {{currentDateTime}}\"\r\n        },\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"data\": {\r\n            \"eventId\": \"32935962\",\r\n            \"product_id\": \"111881503\",\r\n            \"location\": \"{\\\"Timestamp\\\":1749168728,\\\"DateTime\\\":\\\"2025-06-06T00:12:08Z\\\",\\\"Longitude\\\":0,\\\"Latitude\\\":0,\\\"Altitude\\\":0,\\\"Accuracy\\\":17.0,\\\"Course\\\":null,\\\"Speed\\\":null}\",\r\n            \"priority\": \"high\"\r\n        },\r\n        \"android\": {\r\n            \"priority\": \"HIGH\",\r\n            \"ttl\": \"2419200s\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -153,7 +326,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"high\",\r\n            \"large_icon\": \"ic_notification_icon_large\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"large_icon\": \"ic_notification_icon_large\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -192,7 +365,46 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"high\",\r\n            \"large_icon\": \"https://firebase.google.com/static/images/brand-guidelines/logo-vertical.png\",\r\n            \"bigtextstyle\": \"0\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"large_icon\": \"https://firebase.google.com/static/images/brand-guidelines/logo-vertical.png\",\r\n            \"bigtextstyle\": \"0\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Notification Message with data payload",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"value2\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -216,11 +428,438 @@
 								}
 							]
 						}
-					},
-					"response": []
-				},
-				{
-					"name": "Notification Message with priority=low",
+					},
+					"response": []
+				},
+				{
+					"name": "Notification Message with data payload",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Medication Notification\",\r\n            \"body\": \"Test notification sent via Postman\"\r\n        },\r\n        \"data\": {\r\n            \"notificationAction\": \"medicationReminder\",\r\n            \"reminderId\": \"85799965-48fc-11ef-90b6-6740da731683\",\r\n            \"notifyDate\": \"2024-07-25T04:00Z\",\r\n            \"medications[0].medicationRequestId\": \"f24d43aa-3290-41f0-95dc-4f5525532a03\",\r\n            \"medications[0].medicationName\": \"Medication 1\",\r\n            \"medications[0].dosage\": \"1\",\r\n            \"userNotificationMessageId\": \"-490366181\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Notification Message with localizable keys",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"value2\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Data Messages",
+			"item": [
+				{
+					"name": "Data Message",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"{{currentDateTime}}\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Data Message with priority=high",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"{{currentDateTime}}\",\r\n            \"priority\": \"high\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Channels",
+			"item": [
+				{
+					"name": "Notification Message with channel_id=test_channel_1",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification test_channel_1\",\r\n            \"body\": \"Notification to channel_id=test_channel_1\"\r\n        },\r\n        \"data\": {\r\n            \"channel_id\": \"test_channel_1\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Notification Message with channel_id=test_channel_2",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification test_channel_2\",\r\n            \"body\": \"Notification to channel_id=test_channel_2\"\r\n        },\r\n        \"data\": {\r\n            \"channel_id\": \"test_channel_2\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Topics",
+			"item": [
+				{
+					"name": "Notification Message with topic=general",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"Topic body @ {{currentDateTime}}\"\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							]
+						},
+						"description": "## Send Message to Topic\n\nThis endpoint allows you to send a message to a specified topic in Firebase Cloud Messaging (FCM). It is useful for broadcasting notifications to multiple subscribers who are subscribed to the given topic.\n\n### Request\n\nThe request is a POST request to the following URL:\n\n```\nPOST https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send\n\n ```\n\n#### Request Body\n\nThe request body must be in JSON format and contains the following parameters:\n\n- `message`: An object that defines the message to be sent.\n    \n    - `topic`: A string that specifies the topic to which the message is sent.\n        \n    - `notification`: An object that contains the notification details.\n        \n        - `title`: A string representing the title of the notification.\n            \n        - `body`: A string that contains the body text of the notification.\n            \n\n**Example Request Body:**\n\n``` json\n{\n  \"message\": {\n    \"topic\": \"general\",\n    \"notification\": {\n      \"title\": \"Topic Title\",\n      \"body\": \"Topic Body @ {{currentDateTime}}\"\n    }\n  }\n}\n\n ```\n\n### Response\n\nUpon successful execution, the API will return a response with the following characteristics:\n\n- **Status Code**: `200 OK`\n    \n- **Content-Type**: `application/json`\n    \n- **Response Body**: An object that contains a `name` field, which indicates the identifier of the sent message.\n    \n\n**Example Response:**\n\n``` json\n{\n  \"name\": \"\"\n}\n\n ```\n\n### Usage Notes\n\n- Ensure that the `topic` specified in the request matches an existing topic that subscribers are registered to.\n    \n- The `title` and `body` fields in the notification are customizable to provide relevant information to the users receiving the notifications.\n    \n- This endpoint is part of the Firebase Cloud Messaging service, and appropriate authentication and permissions must be set up to use it effectively."
+					},
+					"response": []
+				},
+				{
+					"name": "Notification Message with topic=general, tag=chat_111",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"Topic body @ {{currentDateTime}}\"\r\n        },\r\n        \"data\": {\r\n            \"tag\": \"chat_111\",\r\n            \"id\": \"1\"\r\n        },\r\n        \"apns\": {\r\n            \"headers\": {\r\n                \"apns-collapse-id\": \"1\"\r\n            }\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							]
+						},
+						"description": "## Send Message to Topic\n\nThis endpoint allows you to send a message to a specified topic in Firebase Cloud Messaging (FCM). It is useful for broadcasting notifications to multiple subscribers who are subscribed to the given topic.\n\n### Request\n\nThe request is a POST request to the following URL:\n\n```\nPOST https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send\n\n ```\n\n#### Request Body\n\nThe request body must be in JSON format and contains the following parameters:\n\n- `message`: An object that defines the message to be sent.\n    \n    - `topic`: A string that specifies the topic to which the message is sent.\n        \n    - `notification`: An object that contains the notification details.\n        \n        - `title`: A string representing the title of the notification.\n            \n        - `body`: A string that contains the body text of the notification.\n            \n\n**Example Request Body:**\n\n``` json\n{\n  \"message\": {\n    \"topic\": \"general\",\n    \"notification\": {\n      \"title\": \"Topic Title\",\n      \"body\": \"Topic Body @ {{currentDateTime}}\"\n    }\n  }\n}\n\n ```\n\n### Response\n\nUpon successful execution, the API will return a response with the following characteristics:\n\n- **Status Code**: `200 OK`\n    \n- **Content-Type**: `application/json`\n    \n- **Response Body**: An object that contains a `name` field, which indicates the identifier of the sent message.\n    \n\n**Example Response:**\n\n``` json\n{\n  \"name\": \"\"\n}\n\n ```\n\n### Usage Notes\n\n- Ensure that the `topic` specified in the request matches an existing topic that subscribers are registered to.\n    \n- The `title` and `body` fields in the notification are customizable to provide relevant information to the users receiving the notifications.\n    \n- This endpoint is part of the Firebase Cloud Messaging service, and appropriate authentication and permissions must be set up to use it effectively."
+					},
+					"response": []
+				},
+				{
+					"name": "Notification Message with topic=general, tag=chat_222",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
 					"request": {
 						"method": "POST",
 						"header": [
@@ -231,7 +870,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"low\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"Topic body @ {{currentDateTime}}\"\r\n        },\r\n        \"data\": {\r\n            \"tag\": \"chat_222\",\r\n            \"id\": \"1\"\r\n        },\r\n        \"apns\": {\r\n            \"headers\": {\r\n                \"apns-collapse-id\": \"1\"\r\n            }\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -246,20 +885,38 @@
 								"projects",
 								"{{project_id}}",
 								"messages:send"
-							],
-							"query": [
-								{
-									"key": "",
-									"value": null,
-									"disabled": true
-								}
 							]
-						}
+						},
+						"description": "## Send Message to Topic\n\nThis endpoint allows you to send a message to a specified topic in Firebase Cloud Messaging (FCM). It is useful for broadcasting notifications to multiple subscribers who are subscribed to the given topic.\n\n### Request\n\nThe request is a POST request to the following URL:\n\n```\nPOST https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send\n\n ```\n\n#### Request Body\n\nThe request body must be in JSON format and contains the following parameters:\n\n- `message`: An object that defines the message to be sent.\n    \n    - `topic`: A string that specifies the topic to which the message is sent.\n        \n    - `notification`: An object that contains the notification details.\n        \n        - `title`: A string representing the title of the notification.\n            \n        - `body`: A string that contains the body text of the notification.\n            \n\n**Example Request Body:**\n\n``` json\n{\n  \"message\": {\n    \"topic\": \"general\",\n    \"notification\": {\n      \"title\": \"Topic Title\",\n      \"body\": \"Topic Body @ {{currentDateTime}}\"\n    }\n  }\n}\n\n ```\n\n### Response\n\nUpon successful execution, the API will return a response with the following characteristics:\n\n- **Status Code**: `200 OK`\n    \n- **Content-Type**: `application/json`\n    \n- **Response Body**: An object that contains a `name` field, which indicates the identifier of the sent message.\n    \n\n**Example Response:**\n\n``` json\n{\n  \"name\": \"\"\n}\n\n ```\n\n### Usage Notes\n\n- Ensure that the `topic` specified in the request matches an existing topic that subscribers are registered to.\n    \n- The `title` and `body` fields in the notification are customizable to provide relevant information to the users receiving the notifications.\n    \n- This endpoint is part of the Firebase Cloud Messaging service, and appropriate authentication and permissions must be set up to use it effectively."
 					},
 					"response": []
 				},
 				{
-					"name": "Notification Message with data payload",
+					"name": "Notification Message with topic=general, priority=low",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
 					"request": {
 						"method": "POST",
 						"header": [
@@ -270,7 +927,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"value2\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"Low priority notification message @ {{currentDateTime}}\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"low\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -298,12 +955,24 @@
 					"response": []
 				},
 				{
-					"name": "Notification Message with data payload",
+					"name": "Notification Message with topic=general, priority=default",
 					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
 						{
 							"listen": "prerequest",
 							"script": {
 								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
 									""
 								],
 								"type": "text/javascript",
@@ -321,7 +990,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Medication Notification\",\r\n            \"body\": \"Test notification sent via Postman\"\r\n        },\r\n        \"data\": {\r\n            \"notificationAction\": \"medicationReminder\",\r\n            \"reminderId\": \"85799965-48fc-11ef-90b6-6740da731683\",\r\n            \"notifyDate\": \"2024-07-25T04:00Z\",\r\n            \"medications[0].medicationRequestId\": \"f24d43aa-3290-41f0-95dc-4f5525532a03\",\r\n            \"medications[0].medicationName\": \"Medication 1\",\r\n            \"medications[0].dosage\": \"1\",\r\n            \"userNotificationMessageId\": \"-490366181\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"Default priority notification message @ {{currentDateTime}}\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"default\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -349,7 +1018,31 @@
 					"response": []
 				},
 				{
-					"name": "Notification Message with localizable keys",
+					"name": "Notification Message with topic=general, priority=high",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
 					"request": {
 						"method": "POST",
 						"header": [
@@ -360,7 +1053,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"value2\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Notification Title\",\r\n            \"body\": \"High priority notification message @ {{currentDateTime}}\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"high\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -386,28 +1079,9 @@
 						}
 					},
 					"response": []
-				}
-			]
-		},
-		{
-			"name": "Data Messages",
-			"item": [
+				},
 				{
-					"name": "Data Message",
-					"event": [
-						{
-							"listen": "prerequest",
-							"script": {
-								"exec": [
-									"var moment = require('moment');",
-									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
-									""
-								],
-								"type": "text/javascript",
-								"packages": {}
-							}
-						}
-					],
+					"name": "Notification Message with topic=general, icon=ic_number_one",
 					"request": {
 						"method": "POST",
 						"header": [
@@ -418,7 +1092,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"{{currentDateTime}}\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"high\",\r\n            \"icon\": \"ic_number_one\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -446,21 +1120,7 @@
 					"response": []
 				},
 				{
-					"name": "Data Message with priority=high",
-					"event": [
-						{
-							"listen": "prerequest",
-							"script": {
-								"exec": [
-									"var moment = require('moment');",
-									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
-									""
-								],
-								"type": "text/javascript",
-								"packages": {}
-							}
-						}
-					],
+					"name": "Notification Message with topic=general, large_icon=ic_notification_icon_large",
 					"request": {
 						"method": "POST",
 						"header": [
@@ -471,7 +1131,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"{{currentDateTime}}\",\r\n            \"priority\": \"high\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"large_icon\": \"ic_notification_icon_large\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -497,14 +1157,9 @@
 						}
 					},
 					"response": []
-				}
-			]
-		},
-		{
-			"name": "Channels",
-			"item": [
+				},
 				{
-					"name": "Notification Message with channel_id=test_channel_1",
+					"name": "Notification Message with topic=general, large_icon=url",
 					"request": {
 						"method": "POST",
 						"header": [
@@ -515,7 +1170,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"token\": \"{{fcm_token}}\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"channel_id\": \"test_channel_1\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Notification title\",\r\n            \"body\": \"Notification body\"\r\n        },\r\n        \"data\": {\r\n            \"large_icon\": \"https://firebase.google.com/static/images/brand-guidelines/logo-vertical.png\",\r\n            \"bigtextstyle\": \"0\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -541,17 +1196,12 @@
 						}
 					},
 					"response": []
-				}
-			]
-		},
-		{
-			"name": "Topics",
-			"item": [
+				},
 				{
-					"name": "Notification Message with topic=general",
+					"name": "Notification Message with topic=subscriber-updates",
 					"event": [
 						{
-							"listen": "test",
+							"listen": "prerequest",
 							"script": {
 								"exec": [
 									""
@@ -561,11 +1211,9 @@
 							}
 						},
 						{
-							"listen": "prerequest",
+							"listen": "test",
 							"script": {
 								"exec": [
-									"var moment = require('moment');",
-									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
 									""
 								],
 								"type": "text/javascript",
@@ -583,7 +1231,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Topic Title\",\r\n            \"body\": \"Topic Body @ {{currentDateTime}}\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"subscriber-updates\",\r\n        \"notification\": {\r\n            \"title\": \"NewsMagazine.com\",\r\n            \"body\": \"This week's edition is now available.\"\r\n        },\r\n        \"data\": {\r\n            \"volume\": \"3.21.15\",\r\n            \"contents\": \"http://www.news-magazine.com/world-week/1234\"\r\n        },\r\n        \"android\": {\r\n            \"priority\": \"normal\"\r\n        },\r\n        \"apns\": {\r\n            \"headers\": {\r\n                \"apns-priority\": \"5\"\r\n            }\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -604,32 +1252,7 @@
 					"response": []
 				},
 				{
-					"name": "Data Message with topic=general",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"exec": [
-									""
-								],
-								"type": "text/javascript",
-								"packages": {}
-							}
-						},
-						{
-							"listen": "prerequest",
-							"script": {
-								"exec": [
-									"var moment = require('moment');",
-									"",
-									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
-									""
-								],
-								"type": "text/javascript",
-								"packages": {}
-							}
-						}
-					],
+					"name": "Notification Message with topic=weather_updates",
 					"request": {
 						"method": "POST",
 						"header": [
@@ -640,7 +1263,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"{{currentDateTime}}\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"condition\": \"'weather_updates' in topics\",\r\n        \"notification\": {\r\n            \"title\": \"Weather Update\",\r\n            \"body\": \"Pleasant with clouds and sun\"\r\n        },\r\n        \"data\": {\r\n            \"sunrise\": \"1684926645\",\r\n            \"sunset\": \"1684977332\",\r\n            \"temp\": \"292.55\",\r\n            \"feels_like\": \"292.87\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -661,10 +1284,10 @@
 					"response": []
 				},
 				{
-					"name": "Notification Message with topic=subscriber-updates",
+					"name": "Data Message with topic=general",
 					"event": [
 						{
-							"listen": "prerequest",
+							"listen": "test",
 							"script": {
 								"exec": [
 									""
@@ -674,9 +1297,11 @@
 							}
 						},
 						{
-							"listen": "test",
+							"listen": "prerequest",
 							"script": {
 								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
 									""
 								],
 								"type": "text/javascript",
@@ -694,7 +1319,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\":{\r\n    \"topic\":\"subscriber-updates\",\r\n    \"notification\":{\r\n      \"title\" : \"NewsMagazine.com\",\r\n      \"body\" : \"This week's edition is now available.\"\r\n    },\r\n    \"data\" : {\r\n      \"volume\" : \"3.21.15\",\r\n      \"contents\" : \"http://www.news-magazine.com/world-week/1234\"\r\n    },\r\n    \"android\":{\r\n      \"priority\":\"normal\"\r\n    },\r\n    \"apns\":{\r\n      \"headers\":{\r\n        \"apns-priority\":\"5\"\r\n      }\r\n    }\r\n  }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"{{currentDateTime}}\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -715,7 +1340,21 @@
 					"response": []
 				},
 				{
-					"name": "Notification Message with topic=weather_updates",
+					"name": "Data Message with topic=general, priority=high",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"var moment = require('moment');",
+									"pm.environment.set('currentDateTime', moment().format((\"YYYY-MM-DD HH:mm:ss\")));",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
 					"request": {
 						"method": "POST",
 						"header": [
@@ -726,7 +1365,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"condition\": \"'weather_updates' in topics\",\r\n        \"notification\": {\r\n            \"title\": \"Weather Update\",\r\n            \"body\": \"Pleasant with clouds and sun\"\r\n        },\r\n        \"data\": {\r\n            \"sunrise\": \"1684926645\",\r\n            \"sunset\": \"1684977332\",\r\n            \"temp\": \"292.55\",\r\n            \"feels_like\": \"292.87\"\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"data\": {\r\n            \"key1\": \"value1\",\r\n            \"key2\": \"{{currentDateTime}}\",\r\n            \"priority\": \"high\"\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -741,6 +1380,13 @@
 								"projects",
 								"{{project_id}}",
 								"messages:send"
+							],
+							"query": [
+								{
+									"key": "",
+									"value": null,
+									"disabled": true
+								}
 							]
 						}
 					},
@@ -1412,7 +2058,7 @@
 					"response": []
 				},
 				{
-					"name": "navigate with priority=high",
+					"name": "meeting_invitation with priority=default",
 					"request": {
 						"method": "POST",
 						"header": [
@@ -1423,7 +2069,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Navigation\",\r\n            \"body\": \"Want start navigation?\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"high\",\r\n            \"click_action\": \"navigate\"\r\n        },\r\n        \"apns\": {\r\n            \"payload\": {\r\n                \"aps\": {\r\n                    \"category\": \"navigate\"\r\n                }\r\n            }\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Meeting Invitation\",\r\n            \"body\": \"Want to participate?\"\r\n        },\r\n        \"data\": {\r\n            \"click_action\": \"meeting_invitation\"\r\n        },\r\n        \"apns\": {\r\n            \"payload\": {\r\n                \"aps\": {\r\n                    \"category\": \"meeting_invitation\"\r\n                }\r\n            }\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -1439,12 +2085,13 @@
 								"{{project_id}}",
 								"messages:send"
 							]
-						}
+						},
+						"description": "- meeting_invitation\n    \n- priority: default"
 					},
 					"response": []
 				},
 				{
-					"name": "meeting_invitation with priority=default",
+					"name": "message with priority=high",
 					"request": {
 						"method": "POST",
 						"header": [
@@ -1455,7 +2102,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Meeting Invitation\",\r\n            \"body\": \"Want to participate?\"\r\n        },\r\n        \"data\": {\r\n            \"click_action\": \"meeting_invitation\"\r\n        },\r\n        \"apns\": {\r\n            \"payload\": {\r\n                \"aps\": {\r\n                    \"category\": \"meeting_invitation\"\r\n                }\r\n            }\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Message\",\r\n            \"body\": \"Hello, how are you?\"\r\n        },\r\n        \"data\": {\r\n            \"click_action\": \"message\",\r\n            \"priority\": \"high\"\r\n        },\r\n        \"apns\": {\r\n            \"payload\": {\r\n                \"aps\": {\r\n                    \"category\": \"message\"\r\n                }\r\n            }\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
@@ -1477,7 +2124,7 @@
 					"response": []
 				},
 				{
-					"name": "contract with priority=default",
+					"name": "contract with priority=high",
 					"request": {
 						"method": "POST",
 						"header": [
@@ -1488,7 +2135,39 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Contract\",\r\n            \"body\": \"Accept contract?\"\r\n        },\r\n        \"data\": {\r\n            \"click_action\": \"contract\"\r\n        },\r\n        \"apns\": {\r\n            \"payload\": {\r\n                \"aps\": {\r\n                    \"category\": \"contract\"\r\n                }\r\n            }\r\n        }\r\n    }\r\n}"
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Contract\",\r\n            \"body\": \"Accept contract?\"\r\n        },\r\n        \"data\": {\r\n            \"click_action\": \"contract\",\r\n            \"priority\": \"high\"\r\n        },\r\n        \"apns\": {\r\n            \"payload\": {\r\n                \"aps\": {\r\n                    \"category\": \"contract\"\r\n                }\r\n            }\r\n        }\r\n    }\r\n}"
+						},
+						"url": {
+							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",
+							"protocol": "https",
+							"host": [
+								"fcm",
+								"googleapis",
+								"com"
+							],
+							"path": [
+								"v1",
+								"projects",
+								"{{project_id}}",
+								"messages:send"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "navigate with priority=high",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"message\": {\r\n        \"topic\": \"general\",\r\n        \"notification\": {\r\n            \"title\": \"Navigation\",\r\n            \"body\": \"Want start navigation?\"\r\n        },\r\n        \"data\": {\r\n            \"priority\": \"high\",\r\n            \"click_action\": \"navigate\"\r\n        },\r\n        \"apns\": {\r\n            \"payload\": {\r\n                \"aps\": {\r\n                    \"category\": \"navigate\"\r\n                }\r\n            }\r\n        }\r\n    }\r\n}"
 						},
 						"url": {
 							"raw": "https://fcm.googleapis.com/v1/projects/{{project_id}}/messages:send",

From 6b8e6cf657548eab89c7d2b8073bc9c238d033d8 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 13:36:20 +0200
Subject: [PATCH 29/54] Remove target framework net7.0 + add target framework
 net9.0

---
 .../Plugin.FirebasePushNotifications.csproj   | 29 +++++++++----------
 Samples/MauiSampleApp/MauiSampleApp.csproj    | 13 ++++-----
 .../Platforms/Android/AndroidManifest.xml     |  4 ---
 ...gin.FirebasePushNotifications.Tests.csproj |  4 +--
 azure-pipelines.yml                           |  4 +--
 5 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index 95f354e..e67fd53 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -1,18 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0;net7.0-android33.0;net7.0-ios;net8.0;net8.0-android34.0;net8.0-ios17.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net8.0-android34.0;net8.0-ios17.0;net9.0;net9.0-android35.0;net9.0-ios18.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<UseMaui>true</UseMaui>
 		<MauiVersion Condition="$(TargetFramework.Contains('net8.0'))">8.0.3</MauiVersion>
-		<MauiVersion Condition="$(TargetFramework.Contains('net7.0'))">7.0.49</MauiVersion>
+		<MauiVersion Condition="$(TargetFramework.Contains('net9.0'))">9.0.0</MauiVersion>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 		<IsPackable>true</IsPackable>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' and $(TargetFramework.Contains('net8.0'))">12.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' and $(TargetFramework.Contains('net9.0'))">12.2</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
 
 		<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
@@ -45,6 +46,8 @@
 - Synchronized notification handling behavior between Android and iOS.
 - Renamed topic methods to follow the Async pattern: SubscribeToTopicAsync, UnsubscribeFromTopicAsync, etc.
 - Use AddOnCompleteListener for asynchronous tasks in Android.
+- Add target framework net9.0, net9.0-android and net9.0-ios.
+- Remove target framework net7.0, net7.0-android and net7.0-ios.
 - Bug fixes and refactorings.
 
 3.2
@@ -97,27 +100,21 @@
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="[13.0.3,)" />
 	</ItemGroup>
-	
-	<ItemGroup Condition="$(TargetFramework.Contains('net7.0'))">
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[7.0.0,)" />
-	</ItemGroup>
-	
+  
 	<ItemGroup Condition="$(TargetFramework.Contains('net8.0'))">
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0,)" />
 	</ItemGroup>
 
+	<ItemGroup Condition="$(TargetFramework.Contains('net9.0'))">
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0,)" />
+	</ItemGroup>
+
   <!--Platform-specific package references-->
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-    <PackageReference Include="Xamarin.Firebase.Messaging" Version="123.1.2.2" />
-    <PackageReference Include="Xamarin.Firebase.Common" Version="120.3.3.1" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="118.0.2.3" />
-
-    <!--Temporary workaround for issue in AndroidX: https://github.com/xamarin/AndroidX/issues/742-->
-    <PackageReference Include="Xamarin.AndroidX.Activity" Version="1.7.2.1" />
-    <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.7.2.1" />
+    <PackageReference Include="Xamarin.Firebase.Messaging" Version="124.1.1.2" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
-    <PackageReference Include="AdamE.Firebase.iOS.CloudMessaging" Version="11.10.0" />
+    <PackageReference Include="AdamE.Firebase.iOS.CloudMessaging" Version="[11.10.0,)" />
   </ItemGroup>
 </Project>
diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index 4063ce1..5d3ea20 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net8.0-android;net8.0-ios</TargetFrameworks>
+		<TargetFrameworks>net9.0;net9.0-android;net9.0-ios</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>MauiSampleApp</RootNamespace>
 		<UseMaui>true</UseMaui>
-    <MauiVersion>8.0.100</MauiVersion>
+    <MauiVersion>9.0.80</MauiVersion>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>
@@ -19,10 +19,10 @@
 		<ApplicationIdGuid>da8d1bd2-3ced-4171-b0da-3f1a7806e5af</ApplicationIdGuid>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
@@ -82,7 +82,7 @@
     <AndroidLinkMode>None</AndroidLinkMode>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.Contains('-android')) and '$(Configuration)' == 'Release'">
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
@@ -136,8 +136,7 @@
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.1" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
 		<PackageReference Include="NLog.Extensions.Logging" Version="5.3.15" />
 		<PackageReference Include="Sentry.Maui" Version="5.0.0" />
 		<PackageReference Include="ValueConverters.MAUI" Version="3.1.22" />
diff --git a/Samples/MauiSampleApp/Platforms/Android/AndroidManifest.xml b/Samples/MauiSampleApp/Platforms/Android/AndroidManifest.xml
index 9970642..9ce82b1 100644
--- a/Samples/MauiSampleApp/Platforms/Android/AndroidManifest.xml
+++ b/Samples/MauiSampleApp/Platforms/Android/AndroidManifest.xml
@@ -24,10 +24,6 @@
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
-
     <queries>
         <intent>
             <action android:name="android.media.action.IMAGE_CAPTURE"/>
diff --git a/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj b/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
index 151cd88..c11a2ab 100644
--- a/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
+++ b/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 		<IsPackable>false</IsPackable>
@@ -19,7 +19,7 @@
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
 		<PackageReference Include="ObjectDumper.NET" Version="4.3.2" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
 		<PackageReference Include="xunit" Version="2.9.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2c98164..0fe2f37 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -68,9 +68,9 @@ steps:
     DisableTelemetry: true
     
 - task: UseDotNet@2
-  displayName: 'Use .NET 8.x'
+  displayName: 'Use .NET 9.x'
   inputs:
-    version: 8.x
+    version: 9.x
     
 - task: Bash@3
   displayName: Install .NET MAUI

From a39c38249d28b9154f9d75ac5619bf57ce4f86bd Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 14:00:38 +0200
Subject: [PATCH 30/54] Update community toolkit in sample app

---
 Samples/MauiSampleApp/MauiSampleApp.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index 5d3ea20..4f169d7 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -134,7 +134,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.1" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="12.0.0" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
 		<PackageReference Include="NLog.Extensions.Logging" Version="5.3.15" />

From 1a9210c75a148d3918454a54b5cef7bcfe5bfb9d Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 14:49:54 +0200
Subject: [PATCH 31/54] Replace arrow in log messages

---
 .../Platforms/Android/FirebasePushNotificationManager.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
index 4fb6acb..c8f2c97 100644
--- a/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/FirebasePushNotificationManager.cs
@@ -187,7 +187,7 @@ public void ProcessIntent(Activity activity, Intent intent)
                 if (!intent.GetBooleanExtra(intentAlreadyHandledKey, false))
                 {
                     intent.PutExtra(intentAlreadyHandledKey, true);
-                    this.logger.LogDebug($"ProcessIntent: {intentAlreadyHandledKey} not present --> Process notification");
+                    this.logger.LogDebug($"ProcessIntent: {intentAlreadyHandledKey} not present → Process notification");
 
                     if (extras.TryGetInt(Constants.ActionNotificationIdKey, out var notificationId))
                     {
@@ -216,7 +216,7 @@ public void ProcessIntent(Activity activity, Intent intent)
                 }
                 else
                 {
-                    this.logger.LogDebug($"ProcessIntent: {intentAlreadyHandledKey} is present --> Notification already processed");
+                    this.logger.LogDebug($"ProcessIntent: {intentAlreadyHandledKey} is present → Notification already processed");
                 }
             }
         }

From 5ad809c57d4a2e89fa2689b17ac03232b56642d0 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 14:50:33 +0200
Subject: [PATCH 32/54] Update nugets in test project

---
 .../Plugin.FirebasePushNotifications.Tests.csproj           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj b/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
index c11a2ab..492b3ab 100644
--- a/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
+++ b/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="coverlet.msbuild" Version="6.0.2">
+		<PackageReference Include="coverlet.msbuild" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -20,8 +20,8 @@
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
 		<PackageReference Include="ObjectDumper.NET" Version="4.3.2" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
-		<PackageReference Include="xunit" Version="2.9.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>

From 942e94efffa01d831c80c6eb88a711b431ef7476 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 14:51:58 +0200
Subject: [PATCH 33/54] GenerateDocumentationFile only in release mode

---
 .../Plugin.FirebasePushNotifications.csproj                | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index e67fd53..43186d0 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -10,7 +10,6 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 		<IsPackable>true</IsPackable>
-		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' and $(TargetFramework.Contains('net8.0'))">12.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' and $(TargetFramework.Contains('net9.0'))">12.2</SupportedOSPlatformVersion>
@@ -97,7 +96,11 @@
     <None Include="..\Images\logo.png" Pack="True" PackagePath="\" />
   </ItemGroup>
 
-	<ItemGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="[13.0.3,)" />
 	</ItemGroup>
   

From b844f38e3d61b3a71c187c9f7a62b7a524bdca22 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 14:53:45 +0200
Subject: [PATCH 34/54] Add Android proguard and trimmer config

---
 .../Platforms/Android/ILLink.Descriptors.xml             | 3 +++
 .../Platforms/Android/proguard.cfg                       | 6 ++++++
 .../Plugin.FirebasePushNotifications.csproj              | 9 +++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 Plugin.FirebasePushNotifications/Platforms/Android/ILLink.Descriptors.xml
 create mode 100644 Plugin.FirebasePushNotifications/Platforms/Android/proguard.cfg

diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/ILLink.Descriptors.xml b/Plugin.FirebasePushNotifications/Platforms/Android/ILLink.Descriptors.xml
new file mode 100644
index 0000000..5a86e3d
--- /dev/null
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/ILLink.Descriptors.xml
@@ -0,0 +1,3 @@
+<linker>
+    <assembly fullname="Plugin.FirebasePushNotifications"/>
+</linker>
\ No newline at end of file
diff --git a/Plugin.FirebasePushNotifications/Platforms/Android/proguard.cfg b/Plugin.FirebasePushNotifications/Platforms/Android/proguard.cfg
new file mode 100644
index 0000000..04a0f10
--- /dev/null
+++ b/Plugin.FirebasePushNotifications/Platforms/Android/proguard.cfg
@@ -0,0 +1,6 @@
+-dontwarn com.google.android.gms.**
+-keep class com.google.android.gms.** { *; }
+-keep class com.google.firebase.** { *; }
+-keep class androidx.startup.AppInitializer
+-keep class androidx.startup.InitializationProvider
+-keep class androidx.startup.Initializer
\ No newline at end of file
diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index 43186d0..3cb1586 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -120,4 +120,13 @@
   <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
     <PackageReference Include="AdamE.Firebase.iOS.CloudMessaging" Version="[11.10.0,)" />
   </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
+    <ProguardConfiguration Include="Platforms\Android\proguard.cfg" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
+    <TrimmerRootDescriptor Include="ILLink.Descriptors.xml" RootMode="All" />
+    <EmbeddedResource Include="Platforms\Android\ILLink.Descriptors.xml" LogicalName="ILLink.Descriptors.xml" />
+  </ItemGroup>
 </Project>

From d17cae4c2d5d34fea6b57c9b7734c57f8f88a667 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 15:04:02 +0200
Subject: [PATCH 35/54] Use .net 8 and .net 9

---
 azure-pipelines.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0fe2f37..fc9585e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -68,9 +68,14 @@ steps:
     DisableTelemetry: true
     
 - task: UseDotNet@2
-  displayName: 'Use .NET 9.x'
+  displayName: 'Use .NET 8'
   inputs:
-    version: 9.x
+    version: 8.0.x
+    
+- task: UseDotNet@2
+  displayName: 'Use .NET 9'
+  inputs:
+    version: 9.0.x
     
 - task: Bash@3
   displayName: Install .NET MAUI

From 003d5bc92cf4d1679184301d934848c4633be8a1 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 15:09:18 +0200
Subject: [PATCH 36/54] Publish snupkg

---
 .../Plugin.FirebasePushNotifications.csproj               | 8 ++++++--
 azure-pipelines.yml                                       | 6 ++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index 3cb1586..e27743f 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -32,11 +32,13 @@
 		<PackageTags>firebase;push;notification;notifications</PackageTags>
     <PackageIcon>logo.png</PackageIcon>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageProjectUrl>https://github.com/thomasgalliker/Plugin.FirebasePushNotifications</PackageProjectUrl>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/thomasgalliker/Plugin.FirebasePushNotifications</RepositoryUrl>
 		<Company>superdev GmbH</Company>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <Copyright>Copyright $([System.DateTime]::Now.ToString(`yyyy`)) © Thomas Galliker</Copyright>
 		<PackageReleaseNotes>4.0
 - Improved notification channel handling during app startup.
 - Data-only notifications are no longer displayed in the notification tray.
@@ -86,8 +88,10 @@
 1.0
 - Initial release.
 		</PackageReleaseNotes>
-		<Copyright>Copyright $([System.DateTime]::Now.ToString(`yyyy`)) © Thomas Galliker</Copyright>
-		<PackageReadmeFile>README.md</PackageReadmeFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedAllSources>true</EmbedAllSources>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
 	</PropertyGroup>
 
   <ItemGroup>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fc9585e..eee0312 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -163,11 +163,9 @@ steps:
   displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)'
   inputs:
     SourceFolder: '$(system.defaultworkingdirectory)'
-
     Contents: |
-     **\bin\$(BuildConfiguration)\**
-     **\bin\*.nupkg
-
+      **\bin\*.nupkg
+      **\bin\*.snupkg
     TargetFolder: '$(Build.ArtifactStagingDirectory)'
      
 - task: PublishCodeCoverageResults@2

From 2da03414c3063de47525170586f800643e47c72a Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 15:28:04 +0200
Subject: [PATCH 37/54] Remove 32 bit runtime identifiers in android sample app

---
 Samples/MauiSampleApp/MauiSampleApp.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index 4f169d7..e1012b4 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -90,7 +90,7 @@
     <AndroidPackageFormat>aab</AndroidPackageFormat>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-    <RuntimeIdentifiers>android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>android-arm64;android-x64</RuntimeIdentifiers>
     <RunAOTCompilation>true</RunAOTCompilation>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
   </PropertyGroup>

From ce138972dd93c4c73d8fa639355d9b8ecbb5b825 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 15:44:35 +0200
Subject: [PATCH 38/54] Restore nugets with release configuration

---
 Samples/MauiSampleApp/MauiSampleApp.csproj | 2 +-
 azure-pipelines.yml                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index e1012b4..4f169d7 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -90,7 +90,7 @@
     <AndroidPackageFormat>aab</AndroidPackageFormat>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-    <RuntimeIdentifiers>android-arm64;android-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
     <RunAOTCompilation>true</RunAOTCompilation>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
   </PropertyGroup>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index eee0312..d3d330d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -102,6 +102,7 @@ steps:
   inputs:
     command: restore
     projects: '$(solution)'
+    configuration: '$(buildConfiguration)'
 
 - task: DownloadSecureFile@1
   name: GoogleServiceFileAndroid

From bb5a834f4e2f1699880217356da9d11725e91da1 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 15:59:29 +0200
Subject: [PATCH 39/54] Use nuget restore arguments to add release
 configuration parameter

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d3d330d..0fa43be 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -102,7 +102,7 @@ steps:
   inputs:
     command: restore
     projects: '$(solution)'
-    configuration: '$(buildConfiguration)'
+    arguments: '--configuration $(buildConfiguration)'
 
 - task: DownloadSecureFile@1
   name: GoogleServiceFileAndroid

From f497f06616c44625a91b987e45b0740cdfe90c57 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 16:14:50 +0200
Subject: [PATCH 40/54] Try restoreArguments

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0fa43be..4823d5d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -102,7 +102,7 @@ steps:
   inputs:
     command: restore
     projects: '$(solution)'
-    arguments: '--configuration $(buildConfiguration)'
+    restoreArguments: '--configuration $(buildConfiguration)'
 
 - task: DownloadSecureFile@1
   name: GoogleServiceFileAndroid

From dbe986bc88ec5d04ecb3a20ffe743280c9b12208 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 16:22:51 +0200
Subject: [PATCH 41/54] Reformat argument

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4823d5d..9c9e731 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -102,7 +102,7 @@ steps:
   inputs:
     command: restore
     projects: '$(solution)'
-    restoreArguments: '--configuration $(buildConfiguration)'
+    restoreArguments: '/p:Configuration=$(buildConfiguration)'
 
 - task: DownloadSecureFile@1
   name: GoogleServiceFileAndroid

From 2691600d1dcd129badd70869e487507d5dfb44e3 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 16 Jun 2025 16:34:08 +0200
Subject: [PATCH 42/54] Cleanup

---
 azure-pipelines.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9c9e731..1cf9ccd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -67,11 +67,6 @@ steps:
     FailOnWarning: false
     DisableTelemetry: true
     
-- task: UseDotNet@2
-  displayName: 'Use .NET 8'
-  inputs:
-    version: 8.0.x
-    
 - task: UseDotNet@2
   displayName: 'Use .NET 9'
   inputs:

From 674673f93a2d9e6c84681a67db6fa5c04504e0f5 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Tue, 17 Jun 2025 08:08:15 +0200
Subject: [PATCH 43/54] Extract release notes to text file

---
 Plugin.FirebasePushNotifications.sln          |  1 +
 .../Plugin.FirebasePushNotifications.csproj   | 50 +------------------
 ReleaseNotes.txt                              | 48 ++++++++++++++++++
 azure-pipelines.yml                           |  1 +
 4 files changed, 51 insertions(+), 49 deletions(-)
 create mode 100644 ReleaseNotes.txt

diff --git a/Plugin.FirebasePushNotifications.sln b/Plugin.FirebasePushNotifications.sln
index 2df1b09..daa184b 100644
--- a/Plugin.FirebasePushNotifications.sln
+++ b/Plugin.FirebasePushNotifications.sln
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		azure-pipelines.yml = azure-pipelines.yml
 		LICENSE = LICENSE
 		README.md = README.md
+		ReleaseNotes.txt = ReleaseNotes.txt
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.FirebasePushNotifications", "Plugin.FirebasePushNotifications\Plugin.FirebasePushNotifications.csproj", "{49F1F62D-5A20-49A6-B508-408BE32B0DC6}"
diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index e27743f..2761199 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -39,55 +39,7 @@
 		<Company>superdev GmbH</Company>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Copyright>Copyright $([System.DateTime]::Now.ToString(`yyyy`)) © Thomas Galliker</Copyright>
-		<PackageReleaseNotes>4.0
-- Improved notification channel handling during app startup.
-- Data-only notifications are no longer displayed in the notification tray.
-- NotificationBuilder support for Android API 26 and below (where no notification channels are available).
-- OpenNotificationSettings now also works for Android API 26 and below.
-- Synchronized notification handling behavior between Android and iOS.
-- Renamed topic methods to follow the Async pattern: SubscribeToTopicAsync, UnsubscribeFromTopicAsync, etc.
-- Use AddOnCompleteListener for asynchronous tasks in Android.
-- Add target framework net9.0, net9.0-android and net9.0-ios.
-- Remove target framework net7.0, net7.0-android and net7.0-ios.
-- Bug fixes and refactorings.
-
-3.2
-- Improved default notification channel handling.
-- Bug fixes and refactorings.
-
-3.1
-- Extend INotificationChannels to manage notification channel groups.
-- Internal refactoring of INotificationChannels implementation.
-- Removed properties IsActive and IsDefault from NotificationChannelRequest. Set the default notification channel via UseFirebasePushNotifications(o => o.Android.DefaultNotificationChannelId = ...).
-- Configure initial list of notification channels via o.Android.NotificationChannels and notification groups via o.Android.NotificationChannelGroups.
-
-3.0
-- Update firebase-ios-sdk by replacing nuget package Xamarin.Firebase.iOS.CloudMessaging with AdamE.Firebase.iOS.CloudMessaging.
-
-2.5
-- Move static properties from Android's FirebasePushNotificationManager to FirebasePushNotificationAndroidOptions.
-- iOS 18 workaround for duplicate notifications in foreground mode.
-- iOS options to override default UNNotificationPresentationOptions for notifications received in foreground mode.
-- Handle gcm.notification.click_action payload as click_action in Android.
-      
-2.4
-- Refactor instanciation of IFirebasePushNotification.
-- Refactor startup procedure of platform-specific services.
-- Add singleton instance INotificationPermissions.Current.
-
-2.3
-- General bug fixes and code cleanup.
-- Bug fixes in the area of topic subscriptions.
-- IFirebasePushNotification.Current.
-- Add singleton instance IFirebasePushNotification.Current and INotificationPermissions.Current.
-
-2.2
-- Complete refactoring of the original 1.x implementation.
-- Simplified APIs, less static code, support for dependency injection.
-
-1.0
-- Initial release.
-		</PackageReleaseNotes>
+    <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../ReleaseNotes.txt"))</PackageReleaseNotes>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <EmbedAllSources>true</EmbedAllSources>
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
new file mode 100644
index 0000000..5e66fb4
--- /dev/null
+++ b/ReleaseNotes.txt
@@ -0,0 +1,48 @@
+4.0
+- Improved notification channel handling during app startup.
+- Data-only notifications are no longer displayed in the notification tray.
+- NotificationBuilder support for Android API 26 and below (where no notification channels are available).
+- OpenNotificationSettings now also works for Android API 26 and below.
+- Synchronized notification handling behavior between Android and iOS.
+- Renamed topic methods to follow the Async pattern: SubscribeToTopicAsync, UnsubscribeFromTopicAsync, etc.
+- Use AddOnCompleteListener for asynchronous tasks in Android.
+- Add target framework net9.0, net9.0-android and net9.0-ios.
+- Remove target framework net7.0, net7.0-android and net7.0-ios.
+- Bug fixes and refactorings.
+
+3.2
+- Improved default notification channel handling.
+- Bug fixes and refactorings.
+
+3.1
+- Extend INotificationChannels to manage notification channel groups.
+- Internal refactoring of INotificationChannels implementation.
+- Removed properties IsActive and IsDefault from NotificationChannelRequest. Set the default notification channel via UseFirebasePushNotifications(o => o.Android.DefaultNotificationChannelId = ...).
+- Configure initial list of notification channels via o.Android.NotificationChannels and notification groups via o.Android.NotificationChannelGroups.
+
+3.0
+- Update firebase-ios-sdk by replacing nuget package Xamarin.Firebase.iOS.CloudMessaging with AdamE.Firebase.iOS.CloudMessaging.
+
+2.5
+- Move static properties from Android's FirebasePushNotificationManager to FirebasePushNotificationAndroidOptions.
+- iOS 18 workaround for duplicate notifications in foreground mode.
+- iOS options to override default UNNotificationPresentationOptions for notifications received in foreground mode.
+- Handle gcm.notification.click_action payload as click_action in Android.
+      
+2.4
+- Refactor instanciation of IFirebasePushNotification.
+- Refactor startup procedure of platform-specific services.
+- Add singleton instance INotificationPermissions.Current.
+
+2.3
+- General bug fixes and code cleanup.
+- Bug fixes in the area of topic subscriptions.
+- IFirebasePushNotification.Current.
+- Add singleton instance IFirebasePushNotification.Current and INotificationPermissions.Current.
+
+2.2
+- Complete refactoring of the original 1.x implementation.
+- Simplified APIs, less static code, support for dependency injection.
+
+1.0
+- Initial release.
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1cf9ccd..3903ea5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -162,6 +162,7 @@ steps:
     Contents: |
       **\bin\*.nupkg
       **\bin\*.snupkg
+      **\ReleaseNotes.txt
     TargetFolder: '$(Build.ArtifactStagingDirectory)'
      
 - task: PublishCodeCoverageResults@2

From 39cc949a29f6d41b91abd089200ffcfa0ccc7497 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Wed, 18 Jun 2025 07:52:39 +0200
Subject: [PATCH 44/54] Replace communitytoolkit's EventToCommandBehavior with
 Superdev.Maui

---
 Samples/MauiSampleApp/MauiProgram.cs       | 2 ++
 Samples/MauiSampleApp/MauiSampleApp.csproj | 1 +
 Samples/MauiSampleApp/Views/MainPage.xaml  | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Samples/MauiSampleApp/MauiProgram.cs b/Samples/MauiSampleApp/MauiProgram.cs
index 185adc9..289532e 100644
--- a/Samples/MauiSampleApp/MauiProgram.cs
+++ b/Samples/MauiSampleApp/MauiProgram.cs
@@ -7,6 +7,7 @@
 using Plugin.FirebasePushNotifications.Model.Queues;
 using MauiSampleApp.Services.Logging;
 using NLog.Extensions.Logging;
+using Superdev.Maui;
 
 #if ANDROID
 using Android.App;
@@ -66,6 +67,7 @@ public static MauiApp CreateMauiApp()
                     // o.iOS.iOS18Workaround.Enable = true;
 #endif
                 })
+                .UseSuperdevMaui()
                 .ConfigureFonts(fonts =>
                 {
                     fonts.AddFont("IBMPlexSans-Regular.ttf", "IBMPlexSans");
diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index 4f169d7..5c267a9 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -139,6 +139,7 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
 		<PackageReference Include="NLog.Extensions.Logging" Version="5.3.15" />
 		<PackageReference Include="Sentry.Maui" Version="5.0.0" />
+		<PackageReference Include="Superdev.Maui" Version="1.0.107-pre" />
 		<PackageReference Include="ValueConverters.MAUI" Version="3.1.22" />
     
     <!--To avoid silly build errors... incredible!-->
diff --git a/Samples/MauiSampleApp/Views/MainPage.xaml b/Samples/MauiSampleApp/Views/MainPage.xaml
index cf3f9e1..119d049 100644
--- a/Samples/MauiSampleApp/Views/MainPage.xaml
+++ b/Samples/MauiSampleApp/Views/MainPage.xaml
@@ -3,9 +3,9 @@
 <ContentPage
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:b="clr-namespace:Superdev.Maui.Behaviors;assembly=Superdev.Maui"
     xmlns:controls="clr-namespace:MauiSampleApp.Controls"
     xmlns:itemTemplates="clr-namespace:MauiSampleApp.Views.ItemTemplates"
-    xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     xmlns:vm="clr-namespace:MauiSampleApp.ViewModels"
     x:Class="MauiSampleApp.Views.MainPage"
     Title="Firebase Push Notifications"
@@ -29,7 +29,7 @@
     </ContentPage.Resources>
 
     <ContentPage.Behaviors>
-        <mct:EventToCommandBehavior
+        <b:EventToCommandBehavior
             Command="{Binding AppearingCommand}"
             EventName="Appearing" />
     </ContentPage.Behaviors>

From 2e83c6b7486e8a5fdab0942e7bf8bf70b2930833 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Wed, 18 Jun 2025 07:54:31 +0200
Subject: [PATCH 45/54] Update nugets in sample app

---
 Samples/MauiSampleApp/MauiSampleApp.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index 5c267a9..4b3485b 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -135,10 +135,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Maui" Version="12.0.0" />
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
-		<PackageReference Include="NLog.Extensions.Logging" Version="5.3.15" />
-		<PackageReference Include="Sentry.Maui" Version="5.0.0" />
+		<PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
+		<PackageReference Include="Sentry.Maui" Version="5.10.0" />
 		<PackageReference Include="Superdev.Maui" Version="1.0.107-pre" />
 		<PackageReference Include="ValueConverters.MAUI" Version="3.1.22" />
     

From 8527ec70a8e9cb23ffca3eeea2f2ff3094611ff5 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Tue, 1 Jul 2025 08:39:59 +0200
Subject: [PATCH 46/54] Update mauiversion in sample app

---
 Samples/MauiSampleApp/MauiSampleApp.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index 4b3485b..5d52c14 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -5,7 +5,7 @@
 		<OutputType>Exe</OutputType>
 		<RootNamespace>MauiSampleApp</RootNamespace>
 		<UseMaui>true</UseMaui>
-    <MauiVersion>9.0.80</MauiVersion>
+    <MauiVersion>9.0.81</MauiVersion>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>

From ed0859fbdc22c2c01e3d5c0721180568ed35d83e Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Mon, 14 Jul 2025 13:04:34 +0200
Subject: [PATCH 47/54] Updates maui version in sample app

---
 Samples/MauiSampleApp/MauiSampleApp.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index 5d52c14..f9b7492 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -5,7 +5,7 @@
 		<OutputType>Exe</OutputType>
 		<RootNamespace>MauiSampleApp</RootNamespace>
 		<UseMaui>true</UseMaui>
-    <MauiVersion>9.0.81</MauiVersion>
+    <MauiVersion>9.0.82</MauiVersion>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>

From f86789e798739807c4ba404907965b1f4ca8c9ae Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 18 Jul 2025 08:32:35 +0200
Subject: [PATCH 48/54] Update maui version in sample app

---
 Samples/MauiSampleApp/MauiSampleApp.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index f9b7492..7438294 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -5,7 +5,7 @@
 		<OutputType>Exe</OutputType>
 		<RootNamespace>MauiSampleApp</RootNamespace>
 		<UseMaui>true</UseMaui>
-    <MauiVersion>9.0.82</MauiVersion>
+    <MauiVersion>9.0.90</MauiVersion>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>

From 6b1ddce8e7fcbe03fc045a5510ba4ff72dae13b2 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 18 Jul 2025 08:33:03 +0200
Subject: [PATCH 49/54] Remove obsolete tfm in sample app

---
 Samples/MauiSampleApp/MauiSampleApp.csproj | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index 7438294..d50fe2e 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net9.0-android;net9.0-ios</TargetFrameworks>
+		<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>MauiSampleApp</RootNamespace>
 		<UseMaui>true</UseMaui>
@@ -26,11 +26,6 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
-	<PropertyGroup Condition=" $(TargetFramework.StartsWith('net')) == true AND $(TargetFramework.EndsWith('.0')) == true AND $(TargetFramework.Contains('-')) != true ">
-		<!-- In order to use this project as a test target, we mark it as OutputType=Library -->
-		<OutputType>Library</OutputType>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<!-- App Icon -->
     <MauiIcon

From 9174782dff03e9fcedd2650f07925df5dc27dbe5 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <>
Date: Fri, 18 Jul 2025 08:33:32 +0200
Subject: [PATCH 50/54] Update nugets in sample app + test project

---
 Samples/MauiSampleApp/MauiSampleApp.csproj                    | 4 ++--
 .../Plugin.FirebasePushNotifications.Tests.csproj             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index d50fe2e..63236bc 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -129,9 +129,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui" Version="12.0.0" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="12.1.0" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.7" />
 		<PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
 		<PackageReference Include="Sentry.Maui" Version="5.10.0" />
 		<PackageReference Include="Superdev.Maui" Version="1.0.107-pre" />
diff --git a/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj b/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
index 492b3ab..451990d 100644
--- a/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
+++ b/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
@@ -17,7 +17,7 @@
 		<PackageReference Include="Moq" Version="4.18.4" />
 		<PackageReference Include="Moq.AutoMock" Version="3.5.0" />
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
 		<PackageReference Include="ObjectDumper.NET" Version="4.3.2" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
 		<PackageReference Include="xunit" Version="2.9.3" />

From 1a896d8cf3f8e4fe2b2399640672890cbb80484c Mon Sep 17 00:00:00 2001
From: Thomas Galliker <thomas@bluewin.ch>
Date: Thu, 25 Sep 2025 08:42:33 +0200
Subject: [PATCH 51/54] Update bundle identifier of sample app

---
 Samples/MauiSampleApp/MauiSampleApp.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index 63236bc..ee5e585 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -5,7 +5,7 @@
 		<OutputType>Exe</OutputType>
 		<RootNamespace>MauiSampleApp</RootNamespace>
 		<UseMaui>true</UseMaui>
-    <MauiVersion>9.0.90</MauiVersion>
+    <MauiVersion>9.0.110</MauiVersion>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>
@@ -15,7 +15,7 @@
 		<ApplicationTitle>Firebase Push Demo</ApplicationTitle>
 
 		<!-- App Identifier -->
-		<ApplicationId>com.companyname.firebasepushdemo</ApplicationId>
+		<ApplicationId>ch.superdev.firebasepushdemo</ApplicationId>
 		<ApplicationIdGuid>da8d1bd2-3ced-4171-b0da-3f1a7806e5af</ApplicationIdGuid>
 
 		<!-- Versions -->

From 218bd2b2cd9148d0c257901fabf24fc92fa817f8 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <thomas@bluewin.ch>
Date: Sat, 11 Apr 2026 22:02:17 +0200
Subject: [PATCH 52/54] Update target framework of library to net9.0 and
 net10.0 + tests to net10.0

---
 Plugin.FirebasePushNotifications.sln          |  1 +
 .../Plugin.FirebasePushNotifications.csproj   | 30 +++++++++++--------
 Samples/MauiSampleApp/MauiSampleApp.csproj    | 14 ++++-----
 .../FirebasePushNotificationManagerTests.cs   |  6 ++--
 ...gin.FirebasePushNotifications.Tests.csproj | 18 +++++------
 azure-pipelines.yml                           |  8 +++--
 global.json                                   |  8 +++++
 7 files changed, 51 insertions(+), 34 deletions(-)
 create mode 100644 global.json

diff --git a/Plugin.FirebasePushNotifications.sln b/Plugin.FirebasePushNotifications.sln
index daa184b..4c2cbf8 100644
--- a/Plugin.FirebasePushNotifications.sln
+++ b/Plugin.FirebasePushNotifications.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		LICENSE = LICENSE
 		README.md = README.md
 		ReleaseNotes.txt = ReleaseNotes.txt
+		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.FirebasePushNotifications", "Plugin.FirebasePushNotifications\Plugin.FirebasePushNotifications.csproj", "{49F1F62D-5A20-49A6-B508-408BE32B0DC6}"
diff --git a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
index 2761199..ced1baf 100644
--- a/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
+++ b/Plugin.FirebasePushNotifications/Plugin.FirebasePushNotifications.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net8.0-android34.0;net8.0-ios17.0;net9.0;net9.0-android35.0;net9.0-ios18.0</TargetFrameworks>
+		<TargetFrameworks>net9.0;net9.0-android35.0;net9.0-ios18.0;net10.0;net10.0-android36.0;net10.0-ios26.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<UseMaui>true</UseMaui>
-		<MauiVersion Condition="$(TargetFramework.Contains('net8.0'))">8.0.3</MauiVersion>
 		<MauiVersion Condition="$(TargetFramework.Contains('net9.0'))">9.0.0</MauiVersion>
+    <MauiVersion Condition="$(TargetFramework.Contains('net10.0'))">10.0.0</MauiVersion>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 		<IsPackable>true</IsPackable>
+    
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' and $(TargetFramework.Contains('net8.0'))">12.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' and $(TargetFramework.Contains('net9.0'))">12.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
 
 		<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
@@ -57,32 +57,38 @@
   </PropertyGroup>
 
   <ItemGroup>
-		<PackageReference Include="Newtonsoft.Json" Version="[13.0.3,)" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
 	</ItemGroup>
   
-	<ItemGroup Condition="$(TargetFramework.Contains('net8.0'))">
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0,)" />
+	<ItemGroup Condition="$(TargetFramework.Contains('net9.0'))">
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$(TargetFramework.Contains('net9.0'))">
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0,)" />
+	<ItemGroup Condition="$(TargetFramework.Contains('net10.0'))">
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
 	</ItemGroup>
 
   <!--Platform-specific package references-->
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-    <PackageReference Include="Xamarin.Firebase.Messaging" Version="124.1.1.2" />
+    <PackageReference Include="Xamarin.Firebase.Messaging" Version="125.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
+  <ItemGroup Condition="$(TargetFramework.Contains('net9.0-ios'))">    
     <PackageReference Include="AdamE.Firebase.iOS.CloudMessaging" Version="[11.10.0,)" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(TargetFramework.Contains('net10.0-ios'))">
+    <PackageReference Include="AdamE.Firebase.iOS.CloudMessaging" Version="12.5.0.4" />
+  </ItemGroup>
+
+
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
     <ProguardConfiguration Include="Platforms\Android\proguard.cfg" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-    <TrimmerRootDescriptor Include="ILLink.Descriptors.xml" RootMode="All" />
+    <TrimmerRootDescriptor Include="Platforms\Android\ILLink.Descriptors.xml" RootMode="All" />
     <EmbeddedResource Include="Platforms\Android\ILLink.Descriptors.xml" LogicalName="ILLink.Descriptors.xml" />
   </ItemGroup>
+
 </Project>
diff --git a/Samples/MauiSampleApp/MauiSampleApp.csproj b/Samples/MauiSampleApp/MauiSampleApp.csproj
index ee5e585..5a00e09 100644
--- a/Samples/MauiSampleApp/MauiSampleApp.csproj
+++ b/Samples/MauiSampleApp/MauiSampleApp.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
+		<TargetFrameworks>net10.0-android36.0;net10.0-ios26.2</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>MauiSampleApp</RootNamespace>
 		<UseMaui>true</UseMaui>
-    <MauiVersion>9.0.110</MauiVersion>
+    <MauiVersion>10.0.51</MauiVersion>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>
@@ -129,13 +129,13 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui" Version="12.1.0" />
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.7" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="14.1.0" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.5" />
 		<PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
-		<PackageReference Include="Sentry.Maui" Version="5.10.0" />
+		<PackageReference Include="Sentry.Maui" Version="5.16.3" />
 		<PackageReference Include="Superdev.Maui" Version="1.0.107-pre" />
-		<PackageReference Include="ValueConverters.MAUI" Version="3.1.22" />
+		<PackageReference Include="ValueConverters.MAUI" Version="4.1.16-pre" />
     
     <!--To avoid silly build errors... incredible!-->
 		<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
diff --git a/Tests/Plugin.FirebasePushNotifications.Tests/FirebasePushNotificationManagerTests.cs b/Tests/Plugin.FirebasePushNotifications.Tests/FirebasePushNotificationManagerTests.cs
index fca920a..dfbf9d3 100644
--- a/Tests/Plugin.FirebasePushNotifications.Tests/FirebasePushNotificationManagerTests.cs
+++ b/Tests/Plugin.FirebasePushNotifications.Tests/FirebasePushNotificationManagerTests.cs
@@ -31,7 +31,7 @@ public FirebasePushNotificationManagerTests(ITestOutputHelper testOutputHelper)
         public void OnTokenRefresh_ShouldDeliverImmediately_IfEventIsSubscribed()
         {
             // Arrange
-            var firebasePushNotificationPreferences = this.autoMocker.GetMock<IFirebasePushNotificationPreferences>();
+            var firebasePushNotificationPreferencesMock = this.autoMocker.GetMock<IFirebasePushNotificationPreferences>();
 
             var listOfEventArgs = new List<EventArgs>();
 
@@ -48,8 +48,8 @@ public void OnTokenRefresh_ShouldDeliverImmediately_IfEventIsSubscribed()
             listOfEventArgs.Should().HaveCount(2);
             listOfEventArgs.Should().AllBeOfType<FirebasePushNotificationTokenEventArgs>();
 
-            firebasePushNotificationPreferences.Verify(p => p.Set(Constants.Preferences.TokenKey, token), Times.Exactly(2));
-            firebasePushNotificationPreferences.VerifyNoOtherCalls();
+            firebasePushNotificationPreferencesMock.Verify(p => p.Set(Constants.Preferences.TokenKey, token), Times.Exactly(2));
+            firebasePushNotificationPreferencesMock.VerifyNoOtherCalls();
         }
 
         [Fact]
diff --git a/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj b/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
index 451990d..0c59eec 100644
--- a/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
+++ b/Tests/Plugin.FirebasePushNotifications.Tests/Plugin.FirebasePushNotifications.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 		<IsPackable>false</IsPackable>
@@ -9,19 +9,19 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="coverlet.msbuild" Version="6.0.4">
+		<PackageReference Include="coverlet.msbuild" Version="8.0.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.7" />
-		<PackageReference Include="Moq" Version="4.18.4" />
-		<PackageReference Include="Moq.AutoMock" Version="3.5.0" />
-		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.51" />
+		<PackageReference Include="Moq" Version="4.20.72" />
+		<PackageReference Include="Moq.AutoMock" Version="4.0.2" />
+		<PackageReference Include="FluentAssertions" Version="8.9.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
 		<PackageReference Include="ObjectDumper.NET" Version="4.3.2" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
 		<PackageReference Include="xunit" Version="2.9.3" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3903ea5..57ad125 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,7 +7,7 @@
 name: $[format('{0}', variables['buildName'])]
 
 pool:
-  vmImage: 'windows-2022'
+  vmImage: 'windows-latest'
 
 trigger:
   branches:
@@ -68,9 +68,11 @@ steps:
     DisableTelemetry: true
     
 - task: UseDotNet@2
-  displayName: 'Use .NET 9'
+  displayName: 'Use .NET SDK from global.json'
   inputs:
-    version: 9.0.x
+    packageType: 'sdk'
+    useGlobalJson: true
+    workingDirectory: '$(Build.SourcesDirectory)'
     
 - task: Bash@3
   displayName: Install .NET MAUI
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..801259b
--- /dev/null
+++ b/global.json
@@ -0,0 +1,8 @@
+{
+  "sdk": {
+    "version": "10.0.201",
+    "workloadVersion": "10.0.201",
+    "rollForward": "latestFeature",
+    "allowPrerelease": false
+  }
+}

From 3c75bbf4f5627514e722c1eeabd81c6d2b6c6011 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <thomas@bluewin.ch>
Date: Sat, 11 Apr 2026 22:02:34 +0200
Subject: [PATCH 53/54] Refactor sample app to no longer use MainPage

---
 Samples/MauiSampleApp/App.xaml.cs               | 17 ++++++++++++-----
 .../Services/ApplicationExtensions.cs           | 17 +++++++++++++++++
 Samples/MauiSampleApp/Services/DialogService.cs |  5 +++--
 .../Services/MauiNavigationService.cs           |  8 +++++---
 4 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 Samples/MauiSampleApp/Services/ApplicationExtensions.cs

diff --git a/Samples/MauiSampleApp/App.xaml.cs b/Samples/MauiSampleApp/App.xaml.cs
index 7662a91..bf23227 100644
--- a/Samples/MauiSampleApp/App.xaml.cs
+++ b/Samples/MauiSampleApp/App.xaml.cs
@@ -1,24 +1,31 @@
-using MauiSampleApp.ViewModels;
+using MauiSampleApp.Services;
+using MauiSampleApp.ViewModels;
 using MauiSampleApp.Views;
 
 namespace MauiSampleApp
 {
     public partial class App : Application
     {
+        private readonly IServiceProvider serviceProvider;
+
         public App(IServiceProvider serviceProvider)
         {
+            this.serviceProvider = serviceProvider;
             this.InitializeComponent();
+        }
 
-            var mainPage = serviceProvider.GetRequiredService<MainPage>();
-            this.MainPage = new NavigationPage(mainPage);
+        protected override Window CreateWindow(IActivationState activationState)
+        {
+            var mainPage = this.serviceProvider.GetRequiredService<MainPage>();
+            return new Window(new NavigationPage(mainPage));
         }
 
         protected override void OnResume()
         {
-            if (this.MainPage is NavigationPage { CurrentPage: MainPage { BindingContext: MainViewModel mainViewModel } })
+            if (this.GetCurrentPage() is MainPage { BindingContext: MainViewModel mainViewModel })
             {
                 mainViewModel.OnResume();
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Samples/MauiSampleApp/Services/ApplicationExtensions.cs b/Samples/MauiSampleApp/Services/ApplicationExtensions.cs
new file mode 100644
index 0000000..538452d
--- /dev/null
+++ b/Samples/MauiSampleApp/Services/ApplicationExtensions.cs
@@ -0,0 +1,17 @@
+namespace MauiSampleApp.Services
+{
+    internal static class ApplicationExtensions
+    {
+        public static Page GetRootPage(this Application application)
+        {
+            return application.Windows.FirstOrDefault()?.Page
+                ?? throw new InvalidOperationException("The application does not have an active window page.");
+        }
+
+        public static Page GetCurrentPage(this Application application)
+        {
+            var page = application.GetRootPage();
+            return page is NavigationPage navigationPage ? navigationPage.CurrentPage : page;
+        }
+    }
+}
diff --git a/Samples/MauiSampleApp/Services/DialogService.cs b/Samples/MauiSampleApp/Services/DialogService.cs
index 3feb612..03fa586 100644
--- a/Samples/MauiSampleApp/Services/DialogService.cs
+++ b/Samples/MauiSampleApp/Services/DialogService.cs
@@ -6,8 +6,9 @@ public Task ShowDialogAsync(string title, string message, string cancel)
         {
             return MainThread.InvokeOnMainThreadAsync(async () =>
             {
-                 await Application.Current.MainPage.DisplayAlert(title, message, cancel);
+                var application = Application.Current ?? throw new InvalidOperationException("Application.Current is not available.");
+                await application.GetCurrentPage().DisplayAlertAsync(title, message, cancel);
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Samples/MauiSampleApp/Services/MauiNavigationService.cs b/Samples/MauiSampleApp/Services/MauiNavigationService.cs
index c50d29d..01c4ea2 100644
--- a/Samples/MauiSampleApp/Services/MauiNavigationService.cs
+++ b/Samples/MauiSampleApp/Services/MauiNavigationService.cs
@@ -12,12 +12,14 @@ public MauiNavigationService(IServiceProvider serviceProvider)
         public async Task PushAsync<TPage>() where TPage : Page
         {
             var page = this.serviceProvider.GetRequiredService<TPage>();
-            await Application.Current.MainPage.Navigation.PushAsync(page);
+            var application = Application.Current ?? throw new InvalidOperationException("Application.Current is not available.");
+            await application.GetRootPage().Navigation.PushAsync(page);
         }
 
         public async Task PopAsync()
         {
-            await Application.Current.MainPage.Navigation.PopAsync();
+            var application = Application.Current ?? throw new InvalidOperationException("Application.Current is not available.");
+            await application.GetRootPage().Navigation.PopAsync();
         }
     }
-}
\ No newline at end of file
+}

From 16a74155a12b3cbef4aeab18b63c5b2fd4d01a92 Mon Sep 17 00:00:00 2001
From: Thomas Galliker <thomas@bluewin.ch>
Date: Sat, 11 Apr 2026 22:04:48 +0200
Subject: [PATCH 54/54] Update release notes

---
 README.md        | 2 --
 ReleaseNotes.txt | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 4a592e1..38a5be9 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,6 @@ Use the following command to install Plugin.FirebasePushNotifications using NuGe
 
     PM> Install-Package Plugin.FirebasePushNotifications
 
-You can use this library in any .NET MAUI project compatible to .NET 7 and higher.
-
 ## Setup
 
 ### Setup Firebase Push Notifications
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 5e66fb4..37fa82f 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -6,8 +6,8 @@
 - Synchronized notification handling behavior between Android and iOS.
 - Renamed topic methods to follow the Async pattern: SubscribeToTopicAsync, UnsubscribeFromTopicAsync, etc.
 - Use AddOnCompleteListener for asynchronous tasks in Android.
-- Add target framework net9.0, net9.0-android and net9.0-ios.
-- Remove target framework net7.0, net7.0-android and net7.0-ios.
+- Remove support for net7.0 and net8.0.
+- Add support for net9.0 and net10.0.
 - Bug fixes and refactorings.
 
 3.2