Merge branch 'master' into android/refactor-threading

Author: aurimasc

TestProjects/com.unity.mobile-notifications-sample/Assets/Resources/AndroidNotifications/Not shown in foreground.asset

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb7d100a40edf48f99686ea68a90ff4c, type: 3}
+  m_Name: Not shown in foreground
+  m_EditorClassIdentifier: 
+  ButtonName: Not shown in foreground
+  Channel: default_channel
+  FireInSeconds: 10
+  NotificationID: 0
+  Title: Not in foreground
+  Text: This notifications should not appear when app is in foreground
+  SmallIcon: 
+  LargeIcon: 
+  NotificationStyle: 0
+  Color: {r: 0, g: 0, b: 0, a: 1}
+  Number: -1
+  ShouldAutoCancel: 0
+  UsesStopWatch: 0
+  Group: 
+  GroupSummary: 0
+  GroupAlertBehaviours: 0
+  SortKey: 
+  IntentData: 
+  ShowTimestamp: 0
+  RepeatInterval: 0
+  ShowInForeground: 0

TestProjects/com.unity.mobile-notifications-sample/Assets/Resources/AndroidNotifications/Not shown in foreground.asset.meta

@@ -22,6 +22,7 @@ public class AndroidTest : MonoBehaviour
         private int _notificationExplicitID;
         private Button ButtonModifyExplicitID;
         private Button ButtonCancelExplicitID;
+        private Button ButtonCheckStatusExplicitID;
 
         public int notificationExplicitID
         {
@@ -32,6 +33,7 @@ public int notificationExplicitID
                 bool buttonsEnabled = _notificationExplicitID != 0;
                 ButtonModifyExplicitID.interactable = buttonsEnabled;
                 ButtonCancelExplicitID.interactable = buttonsEnabled;
+                ButtonCheckStatusExplicitID.interactable = buttonsEnabled;
             }
         }
 
@@ -60,6 +62,7 @@ void OnNotificationReceivedHandler(AndroidNotificationIntentData notificationInt
                 .Properties(notificationIntentData.Notification, 1);
             if (notificationIntentData.Id == notificationExplicitID)
             {
+                AndroidNotificationCenter.CheckScheduledNotificationStatus(notificationExplicitID);
                 notificationExplicitID = 0;
             }
         }
@@ -119,6 +122,8 @@ private void InstantiateAllTestButtons()
             //m_groups["Modify"]["Create notification preset"] = new Action(() => {  });
             m_groups["Modify"]["Modify pending Explicit notification"] = new Action(() => { ModifyExplicitNotification(); });
             m_groups["Modify"]["Cancel pending Explicit notification"] = new Action(() => { CancelExplicitNotification(); });
+            m_groups["Modify"]["Check status of Explicit notification"] = new Action(() => { CheckStatusOfExplicitNotification (); });
+
 
             m_groups["Send"] = new OrderedDictionary();
             foreach (AndroidNotificationTemplate template in Resources.LoadAll("AndroidNotifications", typeof(AndroidNotificationTemplate)))
@@ -130,6 +135,7 @@ private void InstantiateAllTestButtons()
                         {
                             Title = template.Title,
                             Text = template.Text,
+
                             SmallIcon = template.SmallIcon,
                             LargeIcon = template.LargeIcon,
                             Style = template.NotificationStyle,
@@ -143,7 +149,8 @@ private void InstantiateAllTestButtons()
                             SortKey = template.SortKey,
                             IntentData = template.IntentData,
                             ShowTimestamp = template.ShowTimestamp,
-                            RepeatInterval = TimeSpan.FromSeconds(template.RepeatInterval)
+                            RepeatInterval = TimeSpan.FromSeconds(template.RepeatInterval),
+                            ShowInForeground = template.ShowInForeground,
                         },
                         template.Channel, template.NotificationID
                     );
@@ -236,6 +243,9 @@ private void InstantiateAllTestButtons()
             ButtonModifyExplicitID.interactable = false;
             ButtonCancelExplicitID = GameObject.Find("Modify/Cancel pending Explicit notification").GetComponent<Button>();
             ButtonCancelExplicitID.interactable = false;
+            ButtonCheckStatusExplicitID = GameObject.Find("Modify/Check status of Explicit notification").GetComponent<Button>();
+            ButtonCheckStatusExplicitID.interactable = false;
+
             m_gameObjectReferences.ButtonGroupTemplate.gameObject.SetActive(false);
         }
 
@@ -261,6 +271,13 @@ public void CancelExplicitNotification()
                 .Blue($"[{DateTime.Now.ToString("HH:mm:ss.ffffff")}] Call {MethodBase.GetCurrentMethod().Name}");
         }
 
+        public void CheckStatusOfExplicitNotification()
+        {
+            m_LOGGER
+                .Blue($"[{DateTime.Now.ToString("HH:mm:ss.ffffff")}] Explicit notification (ID:{notificationExplicitID}) status: {AndroidNotificationCenter.CheckScheduledNotificationStatus(notificationExplicitID)}");
+
+        }
+
         public void SendNotification(AndroidNotification notification, string channel = "default_channel", int notificationID = 0, bool log = true)
         {
             if (log)

TestProjects/com.unity.mobile-notifications-sample/Assets/Scripts/AndroidTest.cs

@@ -36,6 +36,7 @@ public class AndroidNotificationTemplate : ScriptableObject
         [TextArea] public string IntentData = "";
         public bool ShowTimestamp = false;
         public long RepeatInterval;
+        public bool ShowInForeground = true;
 #endif
     }
 }

TestProjects/com.unity.mobile-notifications-sample/Assets/Scripts/ScriptableObjects/AndroidNotificationTemplate.cs

@@ -2,6 +2,15 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.0.2] - 2022-05-13
+
+### Changes & Improvements:
+- [Android] - AndroidNotificationCenter.CheckScheduledNotificationStatus now works on devices with all API levels
+
+### Fixes:
+- [Android] [issue 186](https://github.com/Unity-Technologies/com.unity.mobile.notifications/issues/186) Mitigate OutOfMemory errors causing application crash
+- [Android] [issue 188](https://github.com/Unity-Technologies/com.unity.mobile.notifications/issues/188) Fix unguarded API usage from level 23
+
 ## [2.0.1] - 2022-04-15
 
 ### Fixes:

com.unity.mobile.notifications/CHANGELOG.md

@@ -177,11 +177,21 @@ public DateTime CustomTimestamp
             }
         }
 
+        /// <summary>
+        /// Set this notification to be shown when app is in the foreground (default: true).
+        /// </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/AndroidNotification.cs

@@ -1,3 +1,4 @@
+using System;
 using UnityEngine;
 
 namespace Unity.Notifications.Android
@@ -8,6 +9,17 @@ public NotificationCallback() : base("com.unity.androidnotifications.Notificatio
         {
         }
 
+        public override AndroidJavaObject Invoke(string methodName, AndroidJavaObject[] args)
+        {
+            if (methodName.Equals("onSentNotification", StringComparison.InvariantCulture) && args != null && args.Length == 1)
+            {
+                onSentNotification(args[0]);
+                return null;
+            }
+
+            return base.Invoke(methodName, args);
+        }
+
         public void onSentNotification(AndroidJavaObject notification)
         {
             AndroidReceivedNotificationMainThreadDispatcher.GetInstance().EnqueueReceivedNotification(notification);