Make mScheduledNotifications an instance member

Author: aurimasc

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

@@ -42,14 +42,14 @@
 public class UnityNotificationManager extends BroadcastReceiver {
     protected static NotificationCallback mNotificationCallback;
     protected static UnityNotificationManager mUnityNotificationManager;
-    private static ConcurrentHashMap<Integer, Notification.Builder> mScheduledNotifications = new ConcurrentHashMap();
 
     private Context mContext = null;
     private Activity mActivity = null;
     private Class mOpenActivity = null;
     private UnityNotificationBackgroundThread mBackgroundThread;
     private Random mRandom;
     private HashSet<Integer> mVisibleNotifications;
+    private ConcurrentHashMap<Integer, Notification.Builder> mScheduledNotifications;
 
     static final String TAG_UNITY = "UnityNotifications";
 
@@ -74,6 +74,8 @@ private void initialize(Activity activity, NotificationCallback notificationCall
         if (mContext == null)
             mContext = activity.getApplicationContext();
         mActivity = activity;
+        if (mScheduledNotifications == null)
+            mScheduledNotifications = new ConcurrentHashMap();
         if (mBackgroundThread == null)
             mBackgroundThread = new UnityNotificationBackgroundThread(this, mScheduledNotifications);
         if (mRandom == null)
@@ -114,6 +116,7 @@ static synchronized UnityNotificationManager getNotificationManagerImpl(Context
             mUnityNotificationManager = new UnityNotificationManager();
             mUnityNotificationManager.mContext = context.getApplicationContext();
             mUnityNotificationManager.mVisibleNotifications = new HashSet<>();
+            mUnityNotificationManager.mScheduledNotifications = new ConcurrentHashMap();
         }
 
         return mUnityNotificationManager;

com.unity.mobile.notifications/Tests/Runtime/Android/AndroidNotificationSendingTests.cs

@@ -347,12 +347,12 @@ public IEnumerator SendNotification_CanReschedule()
         yield return new WaitForSeconds(0.2f);
 
         var manager = managerClass.GetStatic<AndroidJavaObject>("mUnityNotificationManager");
+        // clear cached notifications to not mess up future tests
+        manager.Get<AndroidJavaObject>("mScheduledNotifications").Call("clear");
         // simulate reboot by directly cancelling scheduled alarms preserving saves
         manager.Call("cancelPendingNotificationIntent", id);
         // temporary null the manager, cause that's what we have in reality
         managerClass.SetStatic<AndroidJavaObject>("mUnityNotificationManager", null);
-        // also clear cached notifications, since they don't exist after reboot
-        managerClass.GetStatic<AndroidJavaObject>("mScheduledNotifications").Call("clear");
 
         yield return new WaitForSeconds(0.2f);
         // simulate reboot by calling reschedule method, that is called after reboot