Refactor rescheduling to reuse the code

Author: aurimasc

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

@@ -301,6 +301,15 @@ Notification scheduleAlarmWithNotification(Notification.Builder notificationBuil
         return notification;
     }
 
+    static void scheduleAlarmWithNotification(Notification.Builder notificationBuilder, Context context) {
+        if (mUnityNotificationManager == null)
+            return;
+
+        long fireTime = notificationBuilder.getExtras().getLong(KEY_FIRE_TIME, 0L);
+        Intent intent = buildNotificationIntent(context);
+        mUnityNotificationManager.scheduleAlarmWithNotification(notificationBuilder, intent, fireTime);
+    }
+
     protected static Notification buildNotificationForSending(Context context, Class openActivity, Notification.Builder builder) {
         int id = builder.getExtras().getInt(KEY_ID, -1);
         Intent openAppIntent = buildOpenAppIntent(context, openActivity);

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

@@ -1,7 +1,6 @@
 package com.unity.androidnotifications;
 
 import android.app.Notification;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -12,8 +11,6 @@
 import java.util.List;
 
 import static com.unity.androidnotifications.UnityNotificationManager.KEY_FIRE_TIME;
-import static com.unity.androidnotifications.UnityNotificationManager.KEY_ID;
-import static com.unity.androidnotifications.UnityNotificationManager.KEY_NOTIFICATION;
 import static com.unity.androidnotifications.UnityNotificationManager.KEY_REPEAT_INTERVAL;
 
 public class UnityNotificationRestartOnBootReceiver extends BroadcastReceiver {
@@ -35,22 +32,10 @@ private static void rescheduleSavedNotifications(Context context) {
             Date currentDate = Calendar.getInstance().getTime();
             Date fireTimeDate = new Date(fireTime);
 
-            int id = extras.getInt(KEY_ID, -1);
             boolean isRepeatable = repeatInterval > 0;
 
             if (fireTimeDate.after(currentDate) || isRepeatable) {
-                Intent openAppIntent = UnityNotificationManager.buildOpenAppIntent(context, UnityNotificationUtilities.getOpenAppActivity(context, true));
-                openAppIntent.putExtra(KEY_NOTIFICATION, notificationBuilder.build());
-
-                PendingIntent pendingIntent = PendingIntent.getActivity(context, id, openAppIntent, 0);
-                Intent intent = UnityNotificationManager.buildNotificationIntent(context);
-                notificationBuilder.setContentIntent(pendingIntent);
-                UnityNotificationManager.finalizeNotificationForDisplay(context, notificationBuilder);
-                Notification notification = notificationBuilder.build();
-                intent.putExtra(KEY_NOTIFICATION, notification);
-
-                PendingIntent broadcast = UnityNotificationManager.getBroadcastPendingIntent(context, id, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-                UnityNotificationManager.scheduleNotificationIntentAlarm(context, repeatInterval, fireTime, broadcast);
+                UnityNotificationManager.scheduleAlarmWithNotification(notificationBuilder, context);
             }
         }
     }