Move notification id around along with notification

Author: aurimasc

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

@@ -11,15 +11,17 @@
 
 public class UnityNotificationBackgroundThread extends Thread {
     private static class ScheduleNotificationTask implements Runnable {
+        private int notificationId;
         private Notification.Builder notificationBuilder;
 
-        public ScheduleNotificationTask(Notification.Builder builder) {
+        public ScheduleNotificationTask(int id, Notification.Builder builder) {
+            notificationId = id;
             notificationBuilder = builder;
         }
 
         @Override
         public void run() {
-            UnityNotificationManager.mUnityNotificationManager.performNotificationScheduling(notificationBuilder);
+            UnityNotificationManager.mUnityNotificationManager.performNotificationScheduling(notificationId, notificationBuilder);
         }
     }
 
@@ -33,8 +35,8 @@ public UnityNotificationBackgroundThread() {
         enqueueHousekeeping();
     }
 
-    public void enqueueNotification(Notification.Builder notificationBuilder) {
-        mTasks.add(new UnityNotificationBackgroundThread.ScheduleNotificationTask(notificationBuilder));
+    public void enqueueNotification(int id, Notification.Builder notificationBuilder) {
+        mTasks.add(new UnityNotificationBackgroundThread.ScheduleNotificationTask(id, notificationBuilder));
     }
 
     public void enqueueCancelNotification(int id) {

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

@@ -260,12 +260,11 @@ public Object[] getNotificationChannels() {
     public void scheduleNotification(Notification.Builder notificationBuilder) {
         int id = notificationBuilder.getExtras().getInt(KEY_ID, -1);
         putScheduledNotification(id);
-        mBackgroundThread.enqueueNotification(notificationBuilder);
+        mBackgroundThread.enqueueNotification(id, notificationBuilder);
     }
 
-    protected void performNotificationScheduling(Notification.Builder notificationBuilder) {
+    protected void performNotificationScheduling(int id, Notification.Builder notificationBuilder) {
         Bundle extras = notificationBuilder.getExtras();
-        int id = extras.getInt(KEY_ID, -1);
         long repeatInterval = extras.getLong(KEY_REPEAT_INTERVAL, -1);
         long fireTime = extras.getLong(KEY_FIRE_TIME, -1);
         Notification notification = null;