Make mNotificationCallback an instance variable

Author: aurimasc

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

@@ -40,7 +40,6 @@
 import com.unity3d.player.UnityPlayer;
 
 public class UnityNotificationManager extends BroadcastReceiver {
-    protected static NotificationCallback mNotificationCallback;
     protected static UnityNotificationManager mUnityNotificationManager;
 
     private Context mContext = null;
@@ -50,6 +49,7 @@ public class UnityNotificationManager extends BroadcastReceiver {
     private Random mRandom;
     private HashSet<Integer> mVisibleNotifications;
     private ConcurrentHashMap<Integer, Notification.Builder> mScheduledNotifications;
+    private NotificationCallback mNotificationCallback;
 
     static final String TAG_UNITY = "UnityNotifications";
 
@@ -74,6 +74,7 @@ private void initialize(Activity activity, NotificationCallback notificationCall
         if (mContext == null)
             mContext = activity.getApplicationContext();
         mActivity = activity;
+        mNotificationCallback = notificationCallback;
         if (mScheduledNotifications == null)
             mScheduledNotifications = new ConcurrentHashMap();
         if (mBackgroundThread == null)
@@ -82,7 +83,6 @@ private void initialize(Activity activity, NotificationCallback notificationCall
             mRandom = new Random();
         if (mVisibleNotifications == null)
             mVisibleNotifications = new HashSet<>();
-        mNotificationCallback = notificationCallback;
 
         try {
             ApplicationInfo ai = activity.getPackageManager().getApplicationInfo(activity.getPackageName(), PackageManager.GET_META_DATA);

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

@@ -358,6 +358,10 @@ public IEnumerator SendNotification_CanReschedule()
         // simulate reboot by calling reschedule method, that is called after reboot
         rebootClass.CallStatic("rescheduleSavedNotifications", context);
 
+        var newManager = managerClass.GetStatic<AndroidJavaObject>("mUnityNotificationManager");
+        // new manager was supposed to be created, assign callback from original one to get notifications
+        newManager.Set("mNotificationCallback", manager.Get<AndroidJavaObject>("mNotificationCallback"));
+
         yield return WaitForNotification(120.0f);
 
         Debug.LogWarning("SendNotification_CanReschedule completed");