Fix null exception in rescheduling when custom deserialization happens

Author: aurimasc

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

@@ -225,9 +225,9 @@ private static Object deserializeNotification(Context context, byte[] bytes) {
         if (notification != null)
             return notification;
         data.reset();
-        Notification.Builder builder = deserializeNotificationCustom(in);
+        Notification.Builder builder = deserializeNotificationCustom(context, in);
         if (builder == null) {
-            builder = deserializedFromOldIntent(bytes);
+            builder = deserializedFromOldIntent(context, bytes);
         }
         return builder;
     }
@@ -268,7 +268,7 @@ private static Notification deserializeNotificationParcelable(DataInputStream in
         return null;
     }
 
-    private static Notification.Builder deserializeNotificationCustom(DataInputStream in) {
+    private static Notification.Builder deserializeNotificationCustom(Context context, DataInputStream in) {
         try {
             if (!readAndCheckMagicNumber(in, UNITY_MAGIC_NUMBER))
                 return null;
@@ -329,7 +329,7 @@ private static Notification.Builder deserializeNotificationCustom(DataInputStrea
             String sortKey = deserializeString(in);
             long when = showWhen ? in.readLong() : 0;
 
-            Notification.Builder builder = UnityNotificationManager.mUnityNotificationManager.createNotificationBuilder(channelId);
+            Notification.Builder builder = UnityNotificationManager.createNotificationBuilder(context, channelId);
             if (extras != null)
                 builder.setExtras(extras);
             else {
@@ -377,7 +377,7 @@ private static Notification.Builder deserializeNotificationCustom(DataInputStrea
         return null;
     }
 
-    private static Notification.Builder deserializedFromOldIntent(byte[] bytes) {
+    private static Notification.Builder deserializedFromOldIntent(Context context, byte[] bytes) {
         try {
             Parcel p = Parcel.obtain();
             p.unmarshall(bytes, 0, bytes.length);
@@ -405,7 +405,7 @@ private static Notification.Builder deserializedFromOldIntent(byte[] bytes) {
             int groupAlertBehaviour = bundle.getInt("groupAlertBehaviour", -1);
             boolean showTimestamp = bundle.getBoolean("showTimestamp", false);
 
-            Notification.Builder builder = UnityNotificationManager.mUnityNotificationManager.createNotificationBuilder(channelId);
+            Notification.Builder builder = UnityNotificationManager.createNotificationBuilder(context, channelId);
             builder.getExtras().putInt(KEY_ID, id);
             builder.setContentTitle(textTitle);
             builder.setContentText(textContent);

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

@@ -221,8 +221,10 @@ AndroidNotificationIntentData SerializeDeserializeNotificationWithFunc(AndroidJa
         using (var byteStream = new AndroidJavaObject("java.io.ByteArrayInputStream", serializedBytes))
         {
             var dataStream = new AndroidJavaObject("java.io.DataInputStream", byteStream);
+            var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+            var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
             // don't dispose notification, it is kept in AndroidNotificationIntentData
-            using (var deserializedNotificationBuilder = utilsClass.CallStatic<AndroidJavaObject>("deserializeNotificationCustom", dataStream))
+            using (var deserializedNotificationBuilder = utilsClass.CallStatic<AndroidJavaObject>("deserializeNotificationCustom", activity, dataStream))
             {
                 Assert.IsNotNull(deserializedNotificationBuilder);
                 var deserializedNotification = deserializedNotificationBuilder.Call<AndroidJavaObject>("build");