Even less statics

Author: aurimasc

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

@@ -338,7 +338,7 @@ protected void performNotificationScheduling(int id, Notification.Builder notifi
                 fireTime += repeatInterval;
             }
 
-            Intent intent = buildNotificationIntent(mContext);
+            Intent intent = buildNotificationIntent();
 
             if (intent != null) {
                 UnityNotificationManager.saveNotification(mContext, notificationBuilder.build());
@@ -370,19 +370,19 @@ static void scheduleAlarmWithNotification(Context context, Class activityClass,
         UnityNotificationManager.scheduleNotificationIntentAlarm(context, repeatInterval, fireTime, broadcast);
     }
 
-    static void scheduleAlarmWithNotification(Notification.Builder notificationBuilder, Context context) {
+    void scheduleAlarmWithNotification(Notification.Builder notificationBuilder) {
         long fireTime = notificationBuilder.getExtras().getLong(KEY_FIRE_TIME, 0L);
-        Intent intent = buildNotificationIntent(context);
+        Intent intent = buildNotificationIntent();
 
         Class openActivity;
-        if (mUnityNotificationManager == null || mUnityNotificationManager.mOpenActivity == null) {
-            openActivity = UnityNotificationUtilities.getOpenAppActivity(context, true);
+        if (mOpenActivity == null) {
+            openActivity = UnityNotificationUtilities.getOpenAppActivity(mContext, true);
         }
         else {
             openActivity = mUnityNotificationManager.mOpenActivity;
         }
 
-        scheduleAlarmWithNotification(context, openActivity, notificationBuilder, intent, fireTime);
+        scheduleAlarmWithNotification(mContext, openActivity, notificationBuilder, intent, fireTime);
     }
 
     private Notification buildNotificationForSending(Class openActivity, Notification.Builder builder) {
@@ -431,7 +431,7 @@ void performNotificationHousekeeping(Set<String> ids) {
     }
 
     private Set<String> findInvalidNotificationIds(Set<String> ids) {
-        Intent intent = buildNotificationIntent(mContext);
+        Intent intent = buildNotificationIntent();
         HashSet<String> invalid = new HashSet<String>();
         for (String id : ids) {
             // Get the given broadcast PendingIntent by id as request code.
@@ -469,8 +469,8 @@ else synchronized (UnityNotificationManager.class) {
         return invalid;
     }
 
-    protected static Intent buildNotificationIntent(Context context) {
-        Intent intent = new Intent(context, UnityNotificationManager.class);
+    private Intent buildNotificationIntent() {
+        Intent intent = new Intent(mContext, UnityNotificationManager.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         return intent;
     }

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

@@ -23,7 +23,8 @@ public void onReceive(Context context, Intent received_intent) {
     }
 
     private static void rescheduleSavedNotifications(Context context) {
-        List<Notification.Builder> saved_notifications = UnityNotificationManager.getNotificationManagerImpl(context).loadSavedNotifications();
+        UnityNotificationManager manager = UnityNotificationManager.getNotificationManagerImpl(context);
+        List<Notification.Builder> saved_notifications = manager.loadSavedNotifications();
 
         for (Notification.Builder notificationBuilder : saved_notifications) {
             Bundle extras = notificationBuilder.getExtras();
@@ -35,7 +36,7 @@ private static void rescheduleSavedNotifications(Context context) {
             boolean isRepeatable = repeatInterval > 0;
 
             if (fireTimeDate.after(currentDate) || isRepeatable) {
-                UnityNotificationManager.scheduleAlarmWithNotification(notificationBuilder, context);
+                manager.scheduleAlarmWithNotification(notificationBuilder);
             }
         }
     }