Specialize notification enqueue

Author: aurimasc

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

@@ -1,18 +1,32 @@
 package com.unity.androidnotifications;
 
+import android.app.Notification;
 import android.content.Context;
 
 import java.util.concurrent.LinkedTransferQueue;
 import java.util.Set;
 
 public class UnityNotificationBackgroundThread extends Thread {
+    public static class ScheduleNotificationTask implements Runnable {
+        private Notification.Builder notificationBuilder;
+
+        public ScheduleNotificationTask(Notification.Builder builder) {
+            notificationBuilder = builder;
+        }
+
+        @Override
+        public void run() {
+            UnityNotificationManager.mUnityNotificationManager.performNotificationScheduling(notificationBuilder);
+        }
+    }
+
     private LinkedTransferQueue<Runnable> mTasks = new LinkedTransferQueue();
 
     public UnityNotificationBackgroundThread() {
         enqueueHousekeeping();
     }
 
-    public void enqueueTask(Runnable task) {
+    public void enqueueNotification(ScheduleNotificationTask task) {
         mTasks.add(task);
     }
 

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

@@ -261,35 +261,38 @@ public Object[] getNotificationChannels() {
     public void scheduleNotification(Notification.Builder notificationBuilder) {
         int id = notificationBuilder.getExtras().getInt(KEY_ID, -1);
         putScheduledNotification(id);
-        mBackgroundThread.enqueueTask(() -> {
-            Bundle extras = notificationBuilder.getExtras();
-            long repeatInterval = extras.getLong(KEY_REPEAT_INTERVAL, -1);
-            long fireTime = extras.getLong(KEY_FIRE_TIME, -1);
-            Notification notification = null;
-
-            // if less than a second in the future, notify right away
-            boolean fireNow = fireTime - Calendar.getInstance().getTime().getTime() < 1000;
-            if (!fireNow || repeatInterval > 0) {
-                if (fireNow) {
-                    // schedule at next repetition
-                    fireTime += repeatInterval;
-                }
+        mBackgroundThread.enqueueNotification(new UnityNotificationBackgroundThread.ScheduleNotificationTask(notificationBuilder));
+    }
 
-                Intent intent = buildNotificationIntentUpdateList(mContext, id);
+    protected void performNotificationScheduling(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;
 
-                if (intent != null) {
-                    UnityNotificationManager.saveNotification(mContext, notificationBuilder.build());
-                    notification = scheduleAlarmWithNotification(notificationBuilder, intent, fireTime);
-                }
+        // if less than a second in the future, notify right away
+        boolean fireNow = fireTime - Calendar.getInstance().getTime().getTime() < 1000;
+        if (!fireNow || repeatInterval > 0) {
+            if (fireNow) {
+                // schedule at next repetition
+                fireTime += repeatInterval;
             }
 
-            if (fireNow) {
-                if (notification == null) {
-                    notification = buildNotificationForSending(mContext, mOpenActivity, notificationBuilder);
-                }
-                notify(mContext, id, notification);
+            Intent intent = buildNotificationIntentUpdateList(mContext, id);
+
+            if (intent != null) {
+                UnityNotificationManager.saveNotification(mContext, notificationBuilder.build());
+                notification = scheduleAlarmWithNotification(notificationBuilder, intent, fireTime);
             }
-        });
+        }
+
+        if (fireNow) {
+            if (notification == null) {
+                notification = buildNotificationForSending(mContext, mOpenActivity, notificationBuilder);
+            }
+            notify(mContext, id, notification);
+        }
     }
 
     Notification scheduleAlarmWithNotification(Notification.Builder notificationBuilder, Intent intent, long fireTime) {