Merge pull request #80 from thomasgalliker/foreground-handling-notification-actions

Merge foreground-handling-notification-actions into develop

Author: thomasgalliker

Plugin.FirebasePushNotifications/Platforms/Android/NotificationBuilder.cs

@@ -39,16 +39,7 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 // we don't display any local notification.
                 return false;
             }
-
-            if (data.ContainsKey(Constants.ClickActionKey) ||
-                data.ContainsKey(Constants.CategoryKey) ||
-                data.ContainsKey(Constants.GcmNotificationClickActionKey))
-            {
-                // If we received a "click_action" or "category"
-                // we need to show a local notification with action buttons.
-                return true;
-            }
-
+            
             var notificationImportance = this.GetNotificationImportance(data);
             if (notificationImportance >= NotificationImportance.High)
             {
@@ -57,6 +48,20 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 return true;
             }
 
+            if (data.ContainsKey(Constants.ClickActionKey) ||
+                data.ContainsKey(Constants.CategoryKey) ||
+                data.ContainsKey(Constants.GcmNotificationClickActionKey))
+            {
+                var isInForeground = IsInForeground();
+                if (isInForeground == false)
+                {
+                    // If we received a "click_action" or "category"
+                    // and we run in background mode
+                    // we need to show a local notification with action buttons.
+                    return true;
+                }
+            }
+
             var notificationChannel = GetChannel(data);
             if (notificationChannel is { Importance: >= NotificationImportance.High })
             {
@@ -73,12 +78,6 @@ public virtual bool ShouldHandleNotificationReceived(IDictionary<string, object>
                 return true;
             }
 
-            //var isInForeground = IsInForeground();
-            //if (isInForeground == false)
-            //{
-            //    // There is currently no special handling for apps that run in background mode
-            //}
-
             return false;
         }
 

Plugin.FirebasePushNotifications/Platforms/iOS/Constants.cs

@@ -0,0 +1,8 @@
+
+namespace Plugin.FirebasePushNotifications
+{
+    internal static partial class Constants
+    {
+        internal const string ApsPriorityKey = "aps.priority";
+    }
+}

Plugin.FirebasePushNotifications/Platforms/iOS/FirebasePushNotificationManager.cs

@@ -335,7 +335,8 @@ private static UNNotificationPresentationOptions GetNotificationPresentationOpti
         {
             var notificationPresentationOptions = defaultNotificationPresentationOptions;
 
-            if (data.TryGetValue(Constants.PriorityKey, out var p) && $"{p}".ToLower() is string priority)
+            var priority = GetPriorityValue(data);
+            if (!string.IsNullOrEmpty(priority))
             {
                 if (priority is "high" or "max")
                 {
@@ -386,6 +387,23 @@ private static UNNotificationPresentationOptions GetNotificationPresentationOpti
             return notificationPresentationOptions;
         }
 
+        private static string GetPriorityValue(IDictionary<string,object> data)
+        {
+            if (data.TryGetString(Constants.PriorityKey, out var priorityValue))
+            {
+            }
+            else if (data.TryGetString(Constants.ApsPriorityKey, out priorityValue))
+            {
+            }
+
+            if (!string.IsNullOrEmpty(priorityValue))
+            {
+                return priorityValue.ToLowerInvariant();
+            }
+
+            return null;
+        }
+
         /// <inheritdoc />
         public void SubscribeTopics(string[] topics)
         {