- Avoid showing notifications in Android when in foreground and priority is high or notification channel importance is set to high

- Android ShowWhen & SetWhen support
- Other minor improvements

Author: rdelrosario

docs/AndroidCustomization.md

@@ -77,8 +77,10 @@ There are also some keys you can set on the payload:
 * **priority** : Sets the notification priority
 * **sound** : Sets the notification sound
 * **icon** : Sets the notification icon
-* **click_action** : Sets name for notification action
+* **large_icon** : Sets the notification large icon
+* **click_action** : Sets name for the notification action
 * **channel_id** : Sets id for the notification channel that will be used when notification is delivered
+* **show_when** : Indicates if the notification timestamp will be shown.
 
 If **sound** or **icon** keys present have priority over the **FirebasePushNotificationManager.SoundUri** and **FirebasePushNotificationManager.IconResource** static customization properties mentioned above.
 
@@ -215,6 +217,39 @@ Payload sample with icon and sound
 
 If icon not set will set the **FirebasePushNotificationManager.IconResource** value if not set either will use the default application icon.
 
+#####  Notification Large Icon
+
+* You can send the large_icon to be displayed on the notification by using **large_icon** key, an icon with the value set should be in your *Resources/drawable* folder.
+
+Payload sample with large icon
+
+```json
+{
+   "data" : {
+     "title": "hello",
+     "body": "world",
+     "priority":"high",
+     "large_icon":"test"
+  }
+}
+```
+
+Payload sample with large icon and sound
+
+```json
+{
+   "data" : {
+     "title": "hello",
+     "body": "world",
+     "priority":"high",
+     "large_icon":"test",
+     "sound":"test"
+  }
+}
+```
+
+If large icon not set will set the **FirebasePushNotificationManager.LargeIconResource** value.
+
 #####  Notification Actions
 
 * For notification with actions will look for **click_action** key value as the match. More information here:  [Notification Actions](NotificationActions.md)
@@ -236,5 +271,22 @@ If icon not set will set the **FirebasePushNotificationManager.IconResource** va
 }
 ```
 
+#####  Notification Show When
+
+* **show_when** key if set to false will not show the notification timestamp, otherwise will show it
+
+ Payload sample without timestamp
+
+```json
+{
+   "data" : {
+     "title": "hello",
+     "body": "firebase",
+     "show_when" : "false"
+
+  }
+}
+```
+
 <= Back to [Table of Contents](../README.md)
 

src/Plugin.FirebasePushNotification/DefaultPushNotificationHandler.android.cs

@@ -15,6 +15,7 @@
 using Android.Content.PM;
 using Android.Content.Res;
 using Java.Util;
+using static Android.App.ActivityManager;
 
 namespace Plugin.FirebasePushNotification
 {
@@ -111,6 +112,11 @@ public class DefaultPushNotificationHandler : IPushNotificationHandler
         /// </summary>
         public const string IconKey = "icon";
 
+        /// <summary>
+        /// Large Icon
+        /// </summary>
+        public const string LargeIconKey = "large_icon";
+
         /// <summary>
         /// Sound
         /// </summary>
@@ -127,6 +133,11 @@ public class DefaultPushNotificationHandler : IPushNotificationHandler
         /// </summary>
         public const string ChannelIdKey = "channel_id";
 
+        /// <summary>
+        /// Show Timestamp Key
+        /// </summary>
+        public const string ShowWhenKey = "show_when";
+
         public virtual void OnOpened(NotificationResponse response)
         {
             System.Diagnostics.Debug.WriteLine($"{DomainTag} - OnOpened");
@@ -136,7 +147,7 @@ public virtual void OnReceived(IDictionary<string, object> parameters)
         {
             System.Diagnostics.Debug.WriteLine($"{DomainTag} - OnReceived");
 
-            if ((parameters.TryGetValue(SilentKey, out object silent) && (silent.ToString() == "true" || silent.ToString() == "1")))
+            if ((parameters.TryGetValue(SilentKey, out object silent) && (silent.ToString() == "true" || silent.ToString() == "1")) || (IsInForeground() && (!(!parameters.ContainsKey(ChannelIdKey) && parameters.TryGetValue(PriorityKey, out var imp) && ($"{imp}" == "high" || $"{imp}" == "max")) || (!parameters.ContainsKey(PriorityKey) && !parameters.ContainsKey(ChannelIdKey) && FirebasePushNotificationManager.DefaultNotificationChannelImportance != NotificationImportance.High && FirebasePushNotificationManager.DefaultNotificationChannelImportance != NotificationImportance.Max))))
                 return;
 
             Context context = Application.Context;
@@ -145,6 +156,12 @@ public virtual void OnReceived(IDictionary<string, object> parameters)
             string title = context.ApplicationInfo.LoadLabel(context.PackageManager);
             var message = string.Empty;
             var tag = string.Empty;
+            var showWhenVisible = FirebasePushNotificationManager.ShouldShowWhen;
+            var soundUri = FirebasePushNotificationManager.SoundUri;
+            var largeIconResource = FirebasePushNotificationManager.LargeIconResource;
+            var smallIconResource = FirebasePushNotificationManager.IconResource;
+            var notificationColor = FirebasePushNotificationManager.Color;
+            var chanId = FirebasePushNotificationManager.DefaultNotificationChannelId;
 
             if (!string.IsNullOrEmpty(FirebasePushNotificationManager.NotificationContentTextKey) && parameters.TryGetValue(FirebasePushNotificationManager.NotificationContentTextKey, out object notificationContentText))
                 message = notificationContentText.ToString();
@@ -182,6 +199,11 @@ public virtual void OnReceived(IDictionary<string, object> parameters)
                 }
             }
 
+            if (parameters.TryGetValue(ShowWhenKey, out var shouldShowWhen))
+            {
+                showWhenVisible = $"{shouldShowWhen}".ToLower() == "true";
+            }
+
             if (parameters.TryGetValue(TagKey, out object tagContent))
                 tag = tagContent.ToString();
 
@@ -198,7 +220,7 @@ public virtual void OnReceived(IDictionary<string, object> parameters)
                         soundResId = context.Resources.GetIdentifier(soundName, "raw", context.PackageName);
                     }
 
-                    FirebasePushNotificationManager.SoundUri = new Android.Net.Uri.Builder()
+                    soundUri = new Android.Net.Uri.Builder()
                                 .Scheme(ContentResolver.SchemeAndroidResource)
                                 .Path($"{context.PackageName}/{soundResId}")
                                 .Build();
@@ -213,43 +235,73 @@ public virtual void OnReceived(IDictionary<string, object> parameters)
                 System.Diagnostics.Debug.WriteLine(ex.ToString());
             }
 
-            if (FirebasePushNotificationManager.SoundUri == null)
-                FirebasePushNotificationManager.SoundUri = RingtoneManager.GetDefaultUri(RingtoneType.Notification);
+            if (soundUri == null)
+                soundUri = RingtoneManager.GetDefaultUri(RingtoneType.Notification);
 
             try
             {
-                if (parameters.TryGetValue(IconKey, out object icon) && icon != null)
+                if (parameters.TryGetValue(IconKey, out var icon) && icon != null)
                 {
                     try
                     {
-                        FirebasePushNotificationManager.IconResource = context.Resources.GetIdentifier(icon.ToString(), "drawable", Application.Context.PackageName);
+                        smallIconResource = context.Resources.GetIdentifier(icon.ToString(), "drawable", Application.Context.PackageName);
+                        if (smallIconResource == 0)
+                        {
+                            smallIconResource = context.Resources.GetIdentifier($"{icon}", "mipmap", Application.Context.PackageName);
+                        }
                     }
                     catch (Resources.NotFoundException ex)
                     {
                         System.Diagnostics.Debug.WriteLine(ex.ToString());
                     }
                 }
 
-                if (FirebasePushNotificationManager.IconResource == 0)
-                    FirebasePushNotificationManager.IconResource = context.ApplicationInfo.Icon;
+                if (smallIconResource == 0)
+                    smallIconResource = context.ApplicationInfo.Icon;
                 else
                 {
-                    string name = context.Resources.GetResourceName(FirebasePushNotificationManager.IconResource);
+                    var name = context.Resources.GetResourceName(smallIconResource);
                     if (name == null)
-                        FirebasePushNotificationManager.IconResource = context.ApplicationInfo.Icon;
+                    {
+                        smallIconResource = context.ApplicationInfo.Icon;
+                    }
                 }
             }
             catch (Resources.NotFoundException ex)
             {
-                FirebasePushNotificationManager.IconResource = context.ApplicationInfo.Icon;
+                smallIconResource = context.ApplicationInfo.Icon;
+                System.Diagnostics.Debug.WriteLine(ex.ToString());
+            }
+
+            try
+            {
+                if (parameters.TryGetValue(LargeIconKey, out object largeIcon) && largeIcon != null)
+                {
+                    largeIconResource = context.Resources.GetIdentifier($"{largeIcon}", "drawable", Application.Context.PackageName);
+                    if (largeIconResource == 0)
+                    {
+                        largeIconResource = context.Resources.GetIdentifier($"{largeIcon}", "mipmap", Application.Context.PackageName);
+                    }
+                }
+
+                if (largeIconResource > 0)
+                {
+                    string name = context.Resources.GetResourceName(largeIconResource);
+                    if (name == null)
+                        largeIconResource = 0;
+                }
+            }
+            catch (Resources.NotFoundException ex)
+            {
+                largeIconResource = 0;
                 System.Diagnostics.Debug.WriteLine(ex.ToString());
             }
 
             if (parameters.TryGetValue(ColorKey, out object color) && color != null)
             {
                 try
                 {
-                    FirebasePushNotificationManager.Color = Color.ParseColor(color.ToString());
+                    notificationColor = Color.ParseColor(color.ToString());
                 }
                 catch (Exception ex)
                 {
@@ -278,30 +330,29 @@ public virtual void OnReceived(IDictionary<string, object> parameters)
 
             var pendingIntent = PendingIntent.GetActivity(context, requestCode, resultIntent, PendingIntentFlags.UpdateCurrent);
 
-            var chanId = FirebasePushNotificationManager.DefaultNotificationChannelId;
-            if (parameters.TryGetValue(ChannelIdKey, out object channelId) && channelId != null)
+            if (parameters.TryGetValue(ChannelIdKey, out var channelId) && channelId != null)
             {
                 chanId = $"{channelId}";
             }
 
             var notificationBuilder = new NotificationCompat.Builder(context,chanId)
-                 .SetSmallIcon(FirebasePushNotificationManager.IconResource)
+                 .SetSmallIcon(smallIconResource)
                  .SetContentTitle(title)
                  .SetContentText(message)
                  .SetAutoCancel(true)
+                 .SetWhen(Java.Lang.JavaSystem.CurrentTimeMillis())
                  .SetContentIntent(pendingIntent);
 
-            if (FirebasePushNotificationManager.LargeIconResource > 0)
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.JellyBeanMr1)
             {
-                try
-                {
-                    var largeIcon = BitmapFactory.DecodeResource(context.Resources, FirebasePushNotificationManager.LargeIconResource);
-                    notificationBuilder.SetLargeIcon(largeIcon);
-                }
-                catch (Exception ex)
-                {
-                    System.Diagnostics.Debug.WriteLine(ex.ToString());
-                }
+                notificationBuilder.SetShowWhen(showWhenVisible);
+            }
+
+
+            if (largeIconResource > 0)
+            {
+                Bitmap largeIconBitmap = BitmapFactory.DecodeResource(context.Resources, largeIconResource);
+                notificationBuilder.SetLargeIcon(largeIconBitmap);
             }
 
             var deleteIntent = new Intent(context,typeof(PushNotificationDeletedReceiver));
@@ -356,7 +407,7 @@ public virtual void OnReceived(IDictionary<string, object> parameters)
                 try
                 {
 
-                    notificationBuilder.SetSound(FirebasePushNotificationManager.SoundUri);
+                    notificationBuilder.SetSound(soundUri);
                 }
                 catch (Exception ex)
                 {
@@ -369,8 +420,8 @@ public virtual void OnReceived(IDictionary<string, object> parameters)
             // Try to resolve (and apply) localized parameters
             ResolveLocalizedParameters(notificationBuilder, parameters);
 
-            if (FirebasePushNotificationManager.Color != null)
-                notificationBuilder.SetColor(FirebasePushNotificationManager.Color.Value);
+            if (notificationColor != null)
+                notificationBuilder.SetColor(notificationColor.Value);
 
             if (Build.VERSION.SdkInt >= BuildVersionCodes.JellyBean)
             {
@@ -390,7 +441,6 @@ public virtual void OnReceived(IDictionary<string, object> parameters)
             var notificationCategories = CrossFirebasePushNotification.Current?.GetUserNotificationCategories();
             if (notificationCategories != null && notificationCategories.Length > 0)
             {
-                IntentFilter intentFilter = null;
                 foreach (var userCat in notificationCategories)
                 {
                     if (userCat != null && userCat.Actions != null && userCat.Actions.Count > 0)
@@ -503,5 +553,15 @@ public virtual void OnError(string error)
         /// <param name="parameters">Notification parameters.</param>
         public virtual void OnBuildNotification(NotificationCompat.Builder notificationBuilder, IDictionary<string, object> parameters) { }
 
+        bool IsInForeground()
+        {
+            bool isInForeground;
+
+            RunningAppProcessInfo myProcess = new RunningAppProcessInfo();
+            ActivityManager.GetMyMemoryState(myProcess);
+            isInForeground = myProcess.Importance == Android.App.Importance.Foreground;
+
+            return isInForeground;
+        }
     }
 }

src/Plugin.FirebasePushNotification/FirebasePushNotificationManager.android.cs

@@ -38,6 +38,7 @@ public class FirebasePushNotificationManager : Java.Lang.Object, IFirebasePushNo
         public static string NotificationContentDataKey { get; set; }
         public static int IconResource { get; set; }
         public static int LargeIconResource { get; set; }
+        public static bool ShouldShowWhen { get; set; } = true;
         public static Android.Net.Uri SoundUri { get; set; }
         public static Color? Color { get; set; }
         public static Type NotificationActivityType { get; set; }

src/Plugin.FirebasePushNotification/Plugin.FirebasePushNotification.csproj

@@ -25,7 +25,10 @@
     <PackageIconUrl>https://github.com/CrossGeeks/FirebasePushNotificationPlugin/blob/master/art/icon.png?raw=true</PackageIconUrl>
     <RepositoryUrl>https://github.com/CrossGeeks/FirebasePushNotificationPlugin</RepositoryUrl>
     <PackageTags>iOS,Android,firebase,push notifications,cloud messaging,xamarin,plugins</PackageTags>
-    <PackageReleaseNotes>Android token registration error handling</PackageReleaseNotes>
+    <PackageReleaseNotes>
+      - Avoid showing notifications in Android when in foreground and priority is high or notification channel importance is set to high
+      - Android ShowWhen & SetWhen support
+    </PackageReleaseNotes>
     <Title>Firebase Push Notification Plugin for Xamarin iOS and Android</Title>
     <Summary>Receive and handle firebase push notifications across Xamarin.iOS and Xamarin.Android</Summary>
     <Description>Receive and handle firebase push notifications across Xamarin.iOS and Xamarin.Android</Description>
@@ -62,14 +65,18 @@
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
      <Compile Include="**\*.ios.cs" />
      <Compile Include="**\*.ios.*.cs" />
-     <PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="4.1.1.1" />
-     <PackageReference Include="Xamarin.Firebase.iOS.InstanceID" Version="4.2.1" />
+     <PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="4.1.1.2" />
+     <PackageReference Include="Xamarin.Firebase.iOS.Core" Version="6.6.0" />
+     <PackageReference Include="Xamarin.Firebase.iOS.InstanceID" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
      <Compile Include="**\*.android.cs" />
      <Compile Include="**\*.android.*.cs" />
+     <PackageReference Include="Xamarin.Firebase.Common" Version="[71.1610.0, 72)" />
      <PackageReference Include="Xamarin.Firebase.Messaging" Version="[71.1740.0, 72)" />
+     <PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="[71.1620.0, 72)" />
+     <PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="[71.1601.0, 72)" />
   </ItemGroup>
    <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 </Project>