Move initial housekeeping to thread class

Author: aurimasc

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

@@ -1,6 +1,9 @@
 package com.unity.androidnotifications;
 
+import android.content.Context;
+
 import java.util.concurrent.LinkedTransferQueue;
+import java.util.Set;
 
 public class UnityNotificationBackgroundThread extends Thread {
     private LinkedTransferQueue<Runnable> mTasks = new LinkedTransferQueue();
@@ -11,6 +14,8 @@ public void enqueueTask(Runnable task) {
 
     @Override
     public void run() {
+        performHousekeeping();
+
         while (true) {
             try {
                 Runnable task = mTasks.take();
@@ -24,4 +29,10 @@ public void run() {
 
         android.util.Log.d("Unity", "Notification background thread exited");
     }
+
+    private void performHousekeeping() {
+        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

@@ -76,7 +76,6 @@ public UnityNotificationManager(Context context, Activity activity) {
         mContext = context;
         mActivity = activity;
         mBackgroundThread = new UnityNotificationBackgroundThread();
-        mBackgroundThread.start();
 
         try {
             ApplicationInfo ai = activity.getPackageManager().getApplicationInfo(activity.getPackageName(), PackageManager.GET_META_DATA);
@@ -102,7 +101,7 @@ public UnityNotificationManager(Context context, Activity activity) {
             Log.e(TAG_UNITY, "Failed to load meta-data, NullPointer: " + e.getMessage());
         }
 
-        triggerHousekeeping(context, null);
+        mBackgroundThread.start();
     }
 
     public static UnityNotificationManager getNotificationManagerImpl(Context context) {
@@ -397,7 +396,7 @@ private static synchronized void triggerHousekeeping(Context context, Set<String
         }
     }
 
-    private static void performNotificationHousekeeping(Context context, Set<String> ids) {
+    protected static void performNotificationHousekeeping(Context context, Set<String> ids) {
         Log.d(TAG_UNITY, "Checking for invalid notification IDs still hanging around");
 
         Set<String> invalid = findInvalidNotificationIds(context, ids);
@@ -598,7 +597,7 @@ public void cancelAllPendingNotificationIntents() {
         }
     }
 
-    private static synchronized Set<String> getScheduledNotificationIDs(Context context) {
+    protected static synchronized Set<String> getScheduledNotificationIDs(Context context) {
         SharedPreferences prefs = context.getSharedPreferences(NOTIFICATION_IDS_SHARED_PREFS, Context.MODE_PRIVATE);
         Set<String> ids = prefs.getStringSet(NOTIFICATION_IDS_SHARED_PREFS_KEY, new HashSet<String>());
         return ids;