Merge branch 'master' into innogames-feature/ShowInForeground-feature-for-Android

Author: aurimasc

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

@@ -20,22 +20,20 @@ public class AndroidTest : MonoBehaviour
         private Dictionary<string, OrderedDictionary> m_groups;
         private Logger m_LOGGER;
         private int _notificationExplicitID;
-        private Button ButtonExplicitID;
+        private Button ButtonModifyExplicitID;
+        private Button ButtonCancelExplicitID;
+        private Button ButtonCheckStatusExplicitID;
 
         public int notificationExplicitID
         {
             get { return _notificationExplicitID; }
             set
             {
                 _notificationExplicitID = value;
-                if (_notificationExplicitID == 0)
-                {
-                    ButtonExplicitID.interactable = false;
-                }
-                else
-                {
-                    ButtonExplicitID.interactable = true;
-                }
+                bool buttonsEnabled = _notificationExplicitID != 0;
+                ButtonModifyExplicitID.interactable = buttonsEnabled;
+                ButtonCancelExplicitID.interactable = buttonsEnabled;
+                ButtonCheckStatusExplicitID.interactable = buttonsEnabled;
             }
         }
 
@@ -64,6 +62,7 @@ void OnNotificationReceivedHandler(AndroidNotificationIntentData notificationInt
                 .Properties(notificationIntentData.Notification, 1);
             if (notificationIntentData.Id == notificationExplicitID)
             {
+                AndroidNotificationCenter.CheckScheduledNotificationStatus(notificationExplicitID);
                 notificationExplicitID = 0;
             }
         }
@@ -122,6 +121,9 @@ private void InstantiateAllTestButtons()
             m_groups["Modify"] = new OrderedDictionary();
             //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)))
@@ -133,6 +135,7 @@ private void InstantiateAllTestButtons()
                         {
                             Title = template.Title,
                             Text = template.Text,
+
                             SmallIcon = template.SmallIcon,
                             LargeIcon = template.LargeIcon,
                             Style = template.NotificationStyle,
@@ -236,8 +239,13 @@ private void InstantiateAllTestButtons()
                 }
                 buttonGameObject.gameObject.SetActive(false);
             }
-            ButtonExplicitID = GameObject.Find("Modify/Modify pending Explicit notification").GetComponent<Button>();
-            ButtonExplicitID.interactable = false;
+            ButtonModifyExplicitID = GameObject.Find("Modify/Modify pending Explicit notification").GetComponent<Button>();
+            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);
         }
 
@@ -255,6 +263,21 @@ public void ModifyExplicitNotification()
                 .Properties(template, 1);
         }
 
+        public void CancelExplicitNotification()
+        {
+            AndroidNotificationCenter.CancelScheduledNotification(notificationExplicitID);
+            notificationExplicitID = 0;
+            m_LOGGER
+                .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)

com.unity.mobile.notifications/CHANGELOG.md

@@ -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/Runtime/Android/AndroidNotificationCenter.cs

@@ -360,7 +360,6 @@ public static void CancelAllDisplayedNotifications()
 
         /// <summary>
         /// Return the status of a scheduled notification.
-        /// Only available in API  23 and above.
         /// </summary>
         /// <param name="id">ID of the notification to check</param>
         /// <returns>The status of the notification</returns>

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

@@ -41,6 +41,7 @@ public class UnityNotificationManager extends BroadcastReceiver {
     protected static NotificationCallback mNotificationCallback;
     protected static UnityNotificationManager mUnityNotificationManager;
     private static HashMap<Integer, Notification> mScheduledNotifications = new HashMap();
+    private static HashSet<Integer> mVisibleNotifications = new HashSet<>();
     private static int mSentSinceLastHousekeeping = 0;
     private static boolean mPerformingHousekeeping = false;
 
@@ -61,6 +62,7 @@ public class UnityNotificationManager extends BroadcastReceiver {
     protected static final String KEY_SMALL_ICON = "smallIcon";
     protected static final String KEY_CHANNEL_ID = "channelID";
     protected static final String KEY_SHOW_IN_FOREGROUND = "com.unity.showInForeground";
+    protected static final String KEY_NOTIFICATION_DISMISSED = "com.unity.NotificationDismissed";
 
     protected static final String NOTIFICATION_CHANNELS_SHARED_PREFS = "UNITY_NOTIFICATIONS";
     protected static final String NOTIFICATION_CHANNELS_SHARED_PREFS_KEY = "ChannelIDs";
@@ -301,7 +303,7 @@ static Notification scheduleAlarmWithNotification(Context context, Class activit
         // fireTime not taken from notification, because we may have adjusted it
 
         Notification notification = buildNotificationForSending(context, activityClass, notificationBuilder);
-        mScheduledNotifications.put(Integer.valueOf(id), notification);
+        putScheduledNotification(Integer.valueOf(id), notification);
         intent.putExtra(KEY_NOTIFICATION_ID, id);
 
         PendingIntent broadcast = getBroadcastPendingIntent(context, id, intent, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -330,6 +332,16 @@ protected static Notification buildNotificationForSending(Context context, Class
         openAppIntent.putExtra(KEY_NOTIFICATION_ID, id);
         PendingIntent pendingIntent = getActivityPendingIntent(context, id, openAppIntent, 0);
         builder.setContentIntent(pendingIntent);
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            // Can't check StatusBar notifications pre-M, so ask to be notified when dismissed
+            Intent deleteIntent = new Intent(context, UnityNotificationManager.class);
+            deleteIntent.setAction(KEY_NOTIFICATION_DISMISSED); // need action to distinguish intent from content one
+            deleteIntent.putExtra(KEY_NOTIFICATION_DISMISSED, id);
+            PendingIntent deletePending = getBroadcastPendingIntent(context, id, deleteIntent, 0);
+            builder.setDeleteIntent(deletePending);
+        }
+
         finalizeNotificationForDisplay(context, builder);
         return builder.build();
     }
@@ -408,8 +420,10 @@ private static void performNotificationHousekeeping(Context context, Set<String>
         synchronized (UnityNotificationManager.class) {
             // list might have changed while we searched
             Set<String> currentIds = new HashSet<>(getScheduledNotificationIDs(context));
-            for (String id : invalid)
+            for (String id : invalid) {
                 currentIds.remove(id);
+                removeScheduledNotification(Integer.valueOf(id));
+            }
             saveScheduledNotificationIDs(context, currentIds);
             mSentSinceLastHousekeeping = 0;
         }
@@ -431,11 +445,19 @@ private static Set<String> findInvalidNotificationIds(Context context, Set<Strin
             }
         }
 
-        StatusBarNotification[] active = getNotificationManager(context).getActiveNotifications();
-        for (StatusBarNotification notification : active) {
-            // any notifications in status bar are still valid
-            String id = String.valueOf(notification.getId());
-            invalid.remove(id);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            StatusBarNotification[] active = getNotificationManager(context).getActiveNotifications();
+            for (StatusBarNotification notification : active) {
+                // any notifications in status bar are still valid
+                String id = String.valueOf(notification.getId());
+                invalid.remove(id);
+            }
+        }
+        else synchronized (UnityNotificationManager.class) {
+            for (Integer visibleId : mVisibleNotifications) {
+                String id = String.valueOf(visibleId);
+                invalid.remove(id);
+            }
         }
 
         // if app is launched with notification, user still has access to it
@@ -548,18 +570,21 @@ protected static void scheduleNotificationIntentAlarm(Context context, long repe
     // Check the notification status by id.
     public int checkNotificationStatus(int id) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // TODO: what if the notification has been dismissed by the user?
             for (StatusBarNotification n : getNotificationManager().getActiveNotifications()) {
                 if (id == n.getId())
                     return 2;
             }
+        } else synchronized (UnityNotificationManager.class) {
+            for (Integer notificationId : mVisibleNotifications) {
+                if (notificationId.intValue() == id)
+                    return 2;
+            }
+        }
 
-            if (checkIfPendingNotificationIsRegistered(id))
-                return 1;
+        if (checkIfPendingNotificationIsRegistered(id))
+            return 1;
 
-            return 0;
-        }
-        return -1;
+        return 0;
     }
 
     // Check if the pending notification with the given id has been registered.
@@ -583,6 +608,7 @@ public void cancelAllPendingNotificationIntents() {
                     cancelPendingNotificationIntent(context, Integer.valueOf(id));
                     deleteExpiredNotificationIntent(context, id);
                 }
+                triggerHousekeeping(context, null);
             }).start();
         }
     }
@@ -640,6 +666,15 @@ public void cancelAllNotifications() {
     @Override
     public void onReceive(Context context, Intent intent) {
         try {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                if (KEY_NOTIFICATION_DISMISSED.equals(intent.getAction())) {
+                    int removedId = intent.getIntExtra(KEY_NOTIFICATION_DISMISSED, -1);
+                    if (removedId > 0) synchronized (UnityNotificationManager.class) {
+                        mVisibleNotifications.remove(removedId);
+                    }
+                    return;
+                }
+            }
             Object notification = getNotificationOrBuilderForIntent(context, intent);
             if (notification != null) {
                 Notification notif = null;
@@ -667,7 +702,7 @@ public void onReceive(Context context, Intent intent) {
                     id = builder.getExtras().getInt(KEY_NOTIFICATION_ID, -1);
                     notif = buildNotificationForSending(context, openActivity, builder);
                     // if notification is not sendable, it wasn't cached
-                    mScheduledNotifications.put(Integer.valueOf(id), notif);
+                    putScheduledNotification(Integer.valueOf(id), notif);
                 }
 
                 if (notif != null) {
@@ -684,6 +719,8 @@ protected static void notify(Context context, int id, Notification notification)
         boolean showInForeground = notification.extras.getBoolean(KEY_SHOW_IN_FOREGROUND, true);
         if (!isInForeground() || showInForeground) {
             getNotificationManager(context).notify(id, notification);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) synchronized (UnityNotificationManager.class) {
+            mVisibleNotifications.add(Integer.valueOf(id));
         }
 
         try {
@@ -832,8 +869,7 @@ public static Object getNotificationOrBuilderForIntent(Context context, Intent i
         if (intent.hasExtra(KEY_NOTIFICATION_ID)) {
             int id = intent.getExtras().getInt(KEY_NOTIFICATION_ID);
             Integer notificationId = Integer.valueOf(id);
-            if (mScheduledNotifications.containsKey(notificationId)) {
-                notification = mScheduledNotifications.get(notificationId);
+            if ((notification = getScheduledNotification(notificationId)) != null) {
                 sendable = true;
             } else {
                 // in case we don't have cached notification, deserialize from storage
@@ -881,4 +917,16 @@ public void showNotificationSettings(String channelId) {
         settingsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mActivity.startActivity(settingsIntent);
     }
+
+    private static synchronized void putScheduledNotification(Integer id, Notification notification) {
+        mScheduledNotifications.put(id, notification);
+    }
+
+    private static synchronized Notification getScheduledNotification(Integer id) {
+        return mScheduledNotifications.get(id);
+    }
+
+    private static synchronized Notification removeScheduledNotification(Integer id) {
+        return mScheduledNotifications.remove(id);
+    }
 }

com.unity.mobile.notifications/package.json

@@ -1,9 +1,9 @@
 {
   "name": "com.unity.mobile.notifications",
   "displayName": "Mobile Notifications",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "unity": "2019.4",
-  "description": "Mobile Notifications package adds support for scheduling local repeatable or one-time notifications on iOS and Android.\n\nRequires iOS 10 and Android 4.4 or above.",
+  "description": "Mobile Notifications package adds support for scheduling local repeatable or one-time notifications on iOS and Android.\n\nRequires iOS 10 and Android 5.1 or above.",
   "keywords": [
     "Android",
     "iOS",