From ef7d8dfce92b04baf7e70d3d5a1f8812840d2d92 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Fri, 24 Feb 2017 12:43:44 +1100
Subject: [PATCH] Make updates/installed final to slightly simplify code.

---
 .../org/fdroid/fdroid/NotificationHelper.java | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
index cf51be63d..bc3f8e5ed 100644
--- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
@@ -53,8 +53,8 @@ class NotificationHelper {
     private final NotificationManagerCompat notificationManager;
     private final AppUpdateStatusManager appUpdateStatusManager;
     private final DisplayImageOptions displayImageOptions;
-    private ArrayList<AppUpdateStatusManager.AppUpdateStatus> updates;
-    private ArrayList<AppUpdateStatusManager.AppUpdateStatus> installed;
+    private final ArrayList<AppUpdateStatusManager.AppUpdateStatus> updates = new ArrayList<>();
+    private final ArrayList<AppUpdateStatusManager.AppUpdateStatus> installed = new ArrayList<>();
 
     NotificationHelper(Context context) {
         this.context = context;
@@ -151,22 +151,18 @@ class NotificationHelper {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
     }
 
+    /**
+     * Populate {@link NotificationHelper#updates} and {@link NotificationHelper#installed} with
+     * the relevant status entries from the {@link AppUpdateStatusManager}.
+     */
     private void updateStatusLists() {
         if (!notificationManager.areNotificationsEnabled()) {
             return;
         }
 
-        // Get the list of updates and installed available
-        if (updates == null) {
-            updates = new ArrayList<>();
-        } else {
-            updates.clear();
-        }
-        if (installed == null) {
-            installed = new ArrayList<>();
-        } else {
-            installed.clear();
-        }
+        updates.clear();
+        installed.clear();
+
         for (AppUpdateStatusManager.AppUpdateStatus entry : appUpdateStatusManager.getAll()) {
             if (entry.status == AppUpdateStatusManager.Status.Installed) {
                 installed.add(entry);