Refactor when ids are saved

Author: aurimasc

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

@@ -12,7 +12,8 @@
 
 public class UnityNotificationBackgroundThread extends Thread {
     private static abstract class Task {
-        public abstract void run(Context context, Set<String> notificationIds);
+        // returns true if notificationIds was modified (needs to be saved)
+        public abstract boolean run(Context context, Set<String> notificationIds);
     }
 
     private static class ScheduleNotificationTask extends Task {
@@ -25,14 +26,13 @@ public ScheduleNotificationTask(int id, Notification.Builder builder) {
         }
 
         @Override
-        public void run(Context context, Set<String> notificationIds) {
+        public boolean run(Context context, Set<String> notificationIds) {
             String id = String.valueOf(notificationId);
             // are we replacing existing alarm or have capacity to schedule new one
             if (!(notificationIds.contains(id) || UnityNotificationManager.canScheduleMoreAlarms(notificationIds)))
-                return;
-            notificationIds.add(id);
-            UnityNotificationManager.saveScheduledNotificationIDs(context, notificationIds);
+                return false;
             UnityNotificationManager.mUnityNotificationManager.performNotificationScheduling(notificationId, notificationBuilder);
+            return notificationIds.add(id);
         }
     }
 
@@ -44,23 +44,25 @@ public CancelNotificationTask(int id) {
         }
 
         @Override
-        public void run(Context context, Set<String> notificationIds) {
+        public boolean run(Context context, Set<String> notificationIds) {
             UnityNotificationManager.cancelPendingNotificationIntent(context, notificationId);
             String id = String.valueOf(notificationId);
             UnityNotificationManager.deleteExpiredNotificationIntent(context, id);
             notificationIds.remove(id);
+            return true;
         }
     }
 
     private static class CancelAllNotificationsTask extends Task {
         @Override
-        public void run(Context context, Set<String> notificationIds) {
+        public boolean run(Context context, Set<String> notificationIds) {
             for (String id : notificationIds) {
                 UnityNotificationManager.cancelPendingNotificationIntent(context, Integer.valueOf(id));
                 UnityNotificationManager.deleteExpiredNotificationIntent(context, id);
             }
 
             notificationIds.clear();
+            return true;
         }
     }
 
@@ -72,8 +74,9 @@ public HousekeepingTask(UnityNotificationBackgroundThread th) {
         }
 
         @Override
-        public void run(Context context, Set<String> notificationIds) {
+        public boolean run(Context context, Set<String> notificationIds) {
             thread.performHousekeeping(context, notificationIds);
+            return false;
         }
     }
 
@@ -105,26 +108,30 @@ private void enqueueHousekeeping() {
     public void run() {
         Context context = UnityNotificationManager.mUnityNotificationManager.mContext;
         HashSet<String> notificationIds = new HashSet(UnityNotificationManager.getScheduledNotificationIDs(context));
+        boolean haveChanges = false;
         while (true) {
             try {
                 Task task = mTasks.take();
-                executeTask(context, task, notificationIds);
+                haveChanges |= executeTask(context, task, notificationIds);
                 if (!(task instanceof HousekeepingTask))
                     ++mTasksSinceHousekeeping;
-                if (mTasks.size() == 0)
+                if (mTasks.size() == 0 && haveChanges) {
+                    haveChanges = false;
                     enqueueHousekeeping();
+                }
             } catch (InterruptedException e) {
                 if (mTasks.isEmpty())
                     break;
             }
         }
     }
 
-    private void executeTask(Context context, Task task, Set<String> notificationIds) {
+    private boolean executeTask(Context context, Task task, Set<String> notificationIds) {
         try {
-            task.run(context, notificationIds);
+            return task.run(context, notificationIds);
         } catch (Exception e) {
             Log.e(TAG_UNITY, "Exception executing notification task", e);
+            return false;
         }
     }
 
@@ -134,5 +141,6 @@ private void performHousekeeping(Context context, Set<String> notificationIds) {
         mTasksSinceHousekeeping = 0;
         if (performHousekeeping)
             UnityNotificationManager.performNotificationHousekeeping(context, notificationIds);
+        UnityNotificationManager.saveScheduledNotificationIDs(context, notificationIds);
     }
 }

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

@@ -380,7 +380,6 @@ protected static void performNotificationHousekeeping(Context context, Set<Strin
                 currentIds.remove(id);
                 removeScheduledNotification(Integer.valueOf(id));
             }
-            saveScheduledNotificationIDs(context, currentIds);
         }
 
         // in case we have saved intents, clear them