Move housekeeping scheduling logic to background thread

Author: aurimasc

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

@@ -1,7 +1,10 @@
 package com.unity.androidnotifications;
 
+import static com.unity.androidnotifications.UnityNotificationManager.TAG_UNITY;
+
 import android.app.Notification;
 import android.content.Context;
+import android.util.Log;
 
 import java.util.concurrent.LinkedTransferQueue;
 import java.util.Set;
@@ -21,8 +24,12 @@ public void run() {
     }
 
     private LinkedTransferQueue<Runnable> mTasks = new LinkedTransferQueue();
+    private int mSentNotificationsSinceHousekeeping = 0;
+    private int mOtherTasksSinceHousekeeping = 0;
 
     public UnityNotificationBackgroundThread() {
+        // force housekeeping
+        mOtherTasksSinceHousekeeping = 2;
         enqueueHousekeeping();
     }
 
@@ -50,7 +57,7 @@ public void enqueueCancelAllNotifications() {
         });
     }
 
-    public void enqueueHousekeeping() {
+    private void enqueueHousekeeping() {
         mTasks.add(() -> { performHousekeeping(); });
     }
 
@@ -59,15 +66,40 @@ public void run() {
         while (true) {
             try {
                 Runnable task = mTasks.take();
-                task.run();
+                executeTask(task);
             } catch (InterruptedException e) {
                 if (mTasks.isEmpty())
                     break;
             }
         }
     }
 
+    private void executeTask(Runnable task) {
+        try {
+            ScheduleNotificationTask scheduleTask = null;
+            if (task instanceof ScheduleNotificationTask)
+                scheduleTask = (ScheduleNotificationTask)task;
+
+            task.run();
+
+            if (scheduleTask != null)
+                ++mSentNotificationsSinceHousekeeping;
+            else
+                ++mOtherTasksSinceHousekeeping;
+            if (mSentNotificationsSinceHousekeeping >= 50)
+                enqueueHousekeeping();
+        } catch (Exception e) {
+            Log.e(TAG_UNITY, "Exception executing notification task", e);
+        }
+    }
+
     private void performHousekeeping() {
+        // don't do housekeeping if last task we did was housekeeping (other=1)
+        boolean performHousekeeping = mSentNotificationsSinceHousekeeping > 0 && mOtherTasksSinceHousekeeping > 1;
+        mSentNotificationsSinceHousekeeping = 0;
+        mOtherTasksSinceHousekeeping = 0;
+        if (!performHousekeeping)
+            return;
         Context context = UnityNotificationManager.mUnityNotificationManager.mContext;
         Set<String> notificationIds = UnityNotificationManager.getScheduledNotificationIDs(context);
         UnityNotificationManager.performNotificationHousekeeping(context, notificationIds);

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

@@ -39,7 +39,6 @@ public class UnityNotificationManager extends BroadcastReceiver {
     protected static UnityNotificationManager mUnityNotificationManager;
     private static HashMap<Integer, Notification> mScheduledNotifications = new HashMap();
     private static HashSet<Integer> mVisibleNotifications = new HashSet<>();
-    private static int mSentSinceLastHousekeeping = 0;
 
     public Context mContext = null;
     protected Activity mActivity = null;
@@ -373,24 +372,9 @@ private static synchronized Intent buildNotificationIntentUpdateList(Context con
         ids = new HashSet<>(ids);
         ids.add(String.valueOf(notificationId));
         saveScheduledNotificationIDs(context, ids);
-        scheduleHousekeeping(context, ids);
         return intent;
     }
 
-    private static synchronized void scheduleHousekeeping(Context context, Set<String> ids) {
-        ++mSentSinceLastHousekeeping;
-        if (mSentSinceLastHousekeeping > 50) {
-            mSentSinceLastHousekeeping = 0;
-            triggerHousekeeping();
-        }
-    }
-
-    private static synchronized void triggerHousekeeping() {
-        if (mUnityNotificationManager != null) {
-            mUnityNotificationManager.mBackgroundThread.enqueueHousekeeping();
-        }
-    }
-
     protected static void performNotificationHousekeeping(Context context, Set<String> ids) {
         Log.d(TAG_UNITY, "Checking for invalid notification IDs still hanging around");
 
@@ -402,7 +386,6 @@ protected static void performNotificationHousekeeping(Context context, Set<Strin
                 removeScheduledNotification(Integer.valueOf(id));
             }
             saveScheduledNotificationIDs(context, currentIds);
-            mSentSinceLastHousekeeping = 0;
         }
 
         // in case we have saved intents, clear them