Move ID checking and saving out to task

Author: aurimasc

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

@@ -7,6 +7,7 @@
 import android.util.Log;
 
 import java.util.concurrent.LinkedTransferQueue;
+import java.util.HashSet;
 import java.util.Set;
 
 public class UnityNotificationBackgroundThread extends Thread {
@@ -21,6 +22,15 @@ public ScheduleNotificationTask(int id, Notification.Builder builder) {
 
         @Override
         public void run() {
+            Context context = UnityNotificationManager.mUnityNotificationManager.mContext;
+            Set<String> ids = UnityNotificationManager.getScheduledNotificationIDs(context);
+            String id = String.valueOf(notificationId);
+            // are we replacing existing alarm or have capacity to schedule new one
+            if (!(ids.contains(id) || UnityNotificationManager.canScheduleMoreAlarms(ids)))
+                return;
+            ids = new HashSet<>(ids);
+            ids.add(id);
+            UnityNotificationManager.saveScheduledNotificationIDs(context, ids);
             UnityNotificationManager.mUnityNotificationManager.performNotificationScheduling(notificationId, notificationBuilder);
         }
     }

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

@@ -277,7 +277,7 @@ protected void performNotificationScheduling(int id, Notification.Builder notifi
                 fireTime += repeatInterval;
             }
 
-            Intent intent = buildNotificationIntentUpdateList(mContext, id);
+            Intent intent = buildNotificationIntent(mContext);
 
             if (intent != null) {
                 UnityNotificationManager.saveNotification(mContext, notificationBuilder.build());
@@ -355,19 +355,6 @@ protected static Intent buildOpenAppIntent(Context context, Class className) {
         return openAppIntent;
     }
 
-    // Build a notification Intent to store the PendingIntent.
-    private static synchronized Intent buildNotificationIntentUpdateList(Context context, int notificationId) {
-        Set<String> ids = getScheduledNotificationIDs(context);
-        if (!canScheduleMoreAlarms(ids))
-            return null;
-
-        Intent intent = buildNotificationIntent(context);
-        ids = new HashSet<>(ids);
-        ids.add(String.valueOf(notificationId));
-        saveScheduledNotificationIDs(context, ids);
-        return intent;
-    }
-
     protected static boolean canScheduleMoreAlarms(Set<String> ids) {
         if (ids.size() < (SAMSUNG_NOTIFICATION_LIMIT - 1))
             return true;
@@ -574,7 +561,7 @@ protected static synchronized Set<String> getScheduledNotificationIDs(Context co
         return ids;
     }
 
-    private static synchronized void saveScheduledNotificationIDs(Context context, Set<String> ids) {
+    protected static synchronized void saveScheduledNotificationIDs(Context context, Set<String> ids) {
         SharedPreferences.Editor editor = context.getSharedPreferences(NOTIFICATION_IDS_SHARED_PREFS, Context.MODE_PRIVATE).edit().clear();
         editor.putStringSet(NOTIFICATION_IDS_SHARED_PREFS_KEY, ids);
         editor.apply();