From bc0b56a90ee2c88fd01a5eb3942e3e663924fb54 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 2 Nov 2022 21:31:44 +0100
Subject: [PATCH 1/3] avoid null in notification display items fixes bug where
 type = status, but status = null, causing buildDisplayItems to return a null
 title status item and an account card

---
 .../android/fragments/NotificationsListFragment.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
index 073fd66ac..e014e85a1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -22,10 +22,12 @@ import org.parceler.Parcels;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
@@ -76,9 +78,11 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			if(titleItem!=null)
 				items.add(0, titleItem);
 			return items;
-		}else{
+		}else if(extraText!=null){
 			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this, n.account);
 			return Arrays.asList(titleItem, card);
+		}else{
+			return Collections.emptyList();
 		}
 	}
 

From 6906ac6c8fbda93a8ca8d19cfdb161ec2cf149fc Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 2 Nov 2022 21:34:05 +0100
Subject: [PATCH 2/3] remove unnecessary import

---
 .../android/fragments/NotificationsListFragment.java             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
index e014e85a1..4e5d9c196 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -27,7 +27,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;

From db4dd436b765cba8d05f0cc8cd512ccc873c918c Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 2 Nov 2022 21:36:14 +0100
Subject: [PATCH 3/3] more concise null check

---
 .../android/fragments/NotificationsListFragment.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
index 4e5d9c196..2804be5c4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -77,7 +77,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			if(titleItem!=null)
 				items.add(0, titleItem);
 			return items;
-		}else if(extraText!=null){
+		}else if(titleItem!=null){
 			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this, n.account);
 			return Arrays.asList(titleItem, card);
 		}else{