Merge branch 'feature/ShowInForeground-feature-for-Android' of https://github.com/innogames/com.unity.mobile.notifications into innogames-feature/ShowInForeground-feature-for-Android

Author: aurimasc

com.unity.mobile.notifications/Runtime/Android/AndroidNotification.cs

@@ -177,11 +177,21 @@ public DateTime CustomTimestamp
             }
         }
 
+        /// <summary>
+        /// Set this notification to be shown when app is in the foreground.
+        /// </summary>
+        public bool ShowInForeground
+        {
+            get => !m_SilentInForeground;
+            set => m_SilentInForeground = !value;
+        }
+
         internal bool ShowCustomTimestamp { get; set; }
 
         private Color m_Color;
         private TimeSpan m_RepeatInterval;
         private DateTime m_CustomTimestamp;
+        private bool m_SilentInForeground;
 
         /// <summary>
         /// Create a notification struct with all optional fields set to default values.
@@ -212,6 +222,7 @@ public AndroidNotification(string title, string text, DateTime fireTime)
             m_RepeatInterval = (-1L).ToTimeSpan();
             m_Color = new Color(0, 0, 0, 0);
             m_CustomTimestamp = (-1L).ToDatetime();
+            m_SilentInForeground = false;
         }
 
         /// <summary>

com.unity.mobile.notifications/Runtime/Android/AndroidNotificationCenter.cs

@@ -66,6 +66,7 @@ public class AndroidNotificationCenter
         private static AndroidJavaObject KEY_REPEAT_INTERVAL;
         private static AndroidJavaObject KEY_NOTIFICATION;
         private static AndroidJavaObject KEY_SMALL_ICON;
+        private static AndroidJavaObject SHOW_IN_FOREGROUND;
 
         /// <summary>
         /// Initialize the AndroidNotificationCenter class.
@@ -115,6 +116,7 @@ public static bool Initialize()
             KEY_REPEAT_INTERVAL = s_NotificationManagerClass.GetStatic<AndroidJavaObject>("KEY_REPEAT_INTERVAL");
             KEY_NOTIFICATION = s_NotificationManagerClass.GetStatic<AndroidJavaObject>("KEY_NOTIFICATION");
             KEY_SMALL_ICON = s_NotificationManagerClass.GetStatic<AndroidJavaObject>("KEY_SMALL_ICON");
+            SHOW_IN_FOREGROUND = s_NotificationManagerClass.GetStatic<AndroidJavaObject>("SHOW_IN_FOREGROUND");
 
             s_Initialized = true;
 #endif
@@ -467,6 +469,7 @@ public static AndroidJavaObject CreateNotificationBuilder(int id, AndroidNotific
                 extras.Call("putInt", KEY_ID, id);
                 extras.Call("putLong", KEY_REPEAT_INTERVAL, notification.RepeatInterval.ToLong());
                 extras.Call("putLong", KEY_FIRE_TIME, fireTime);
+                extras.Call("putBoolean", SHOW_IN_FOREGROUND, notification.ShowInForeground);
                 if (!string.IsNullOrEmpty(notification.IntentData))
                     extras.Call("putString", KEY_INTENT_DATA, notification.IntentData);
             }
@@ -494,6 +497,7 @@ internal static AndroidNotificationIntentData GetNotificationData(AndroidJavaObj
                 notification.UsesStopwatch = extras.Call<bool>("getBoolean", Notification_EXTRA_SHOW_CHRONOMETER, false);
                 notification.FireTime = extras.Call<long>("getLong", KEY_FIRE_TIME, -1L).ToDatetime();
                 notification.RepeatInterval = extras.Call<long>("getLong", KEY_REPEAT_INTERVAL, -1L).ToTimeSpan();
+                notification.ShowInForeground = extras.Call<bool>("getBoolean", SHOW_IN_FOREGROUND, false);
 
                 if (extras.Call<bool>("containsKey", Notification_EXTRA_BIG_TEXT))
                     notification.Style = NotificationStyle.BigTextStyle;

com.unity.mobile.notifications/Runtime/Android/Plugins/com/unity/androidnotifications/UnityNotificationManager.java

@@ -1,6 +1,7 @@
 package com.unity.androidnotifications;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -21,6 +22,8 @@
 import android.service.notification.StatusBarNotification;
 import android.util.Log;
 
+import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
+import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE;
 import static android.app.Notification.VISIBILITY_PUBLIC;
 
 import java.lang.Integer;
@@ -57,6 +60,7 @@ public class UnityNotificationManager extends BroadcastReceiver {
     protected static final String KEY_NOTIFICATION_ID = "com.unity.NotificationID";
     protected static final String KEY_SMALL_ICON = "smallIcon";
     protected static final String KEY_CHANNEL_ID = "channelID";
+    protected static final String SHOW_IN_FOREGROUND = "com.unity.showInForeground";
 
     protected static final String NOTIFICATION_CHANNELS_SHARED_PREFS = "UNITY_NOTIFICATIONS";
     protected static final String NOTIFICATION_CHANNELS_SHARED_PREFS_KEY = "ChannelIDs";
@@ -677,7 +681,10 @@ public void onReceive(Context context, Intent intent) {
 
     // Call the system notification service to notify the notification.
     protected static void notify(Context context, int id, Notification notification) {
-        getNotificationManager(context).notify(id, notification);
+        boolean showInForeground = notification.extras.getBoolean(SHOW_IN_FOREGROUND, false);
+        if (!isInForeground() || showInForeground) {
+            getNotificationManager(context).notify(id, notification);
+        }
 
         try {
             mNotificationCallback.onSentNotification(notification);
@@ -802,6 +809,12 @@ public static String getNotificationChannelId(Notification notification) {
 
         return null;
     }
+    
+    private static boolean isInForeground() {
+        ActivityManager.RunningAppProcessInfo appProcessInfo = new ActivityManager.RunningAppProcessInfo();
+        ActivityManager.getMyMemoryState(appProcessInfo);
+        return (appProcessInfo.importance == IMPORTANCE_FOREGROUND || appProcessInfo.importance == IMPORTANCE_VISIBLE);
+    }
 
     public static Notification getNotificationFromIntent(Context context, Intent intent) {
         Object notification = getNotificationOrBuilderForIntent(context, intent);