From 2d51946fd68adecda5c333133db960372f59d4f8 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 26 Oct 2022 09:45:31 +0200
Subject: [PATCH] Fix issue #362 - Crash with notifications

---
 .../ui/fragment/timeline/FragmentMastodonNotification.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
index fa2b61e8..134dc3f7 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
@@ -421,12 +421,12 @@ public class FragmentMastodonNotification extends Fragment implements Notificati
         }
     }
 
-    private List<Notification> aggregateNotifications(List<Notification> notifications) {
+    private List<Notification> aggregateNotifications(@NonNull List<Notification> notifications) {
         List<Notification> notificationList = new ArrayList<>();
         int refPosition = 0;
         for (int i = 0; i < notifications.size(); i++) {
             if (i != refPosition) {
-                if (notifications.get(i).type.equals(notifications.get(refPosition).type)
+                if (notifications.get(i).type != null && notifications.get(refPosition).type != null && notifications.get(i).type.equals(notifications.get(refPosition).type)
                         && (notifications.get(i).type.equals("favourite") || notifications.get(i).type.equals("reblog"))
                         && notifications.get(i).status != null && notifications.get(refPosition).status != null && notifications.get(i).status.id.equals(notifications.get(refPosition).status.id)
                 ) {