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 f7d65c52..e6c3c1fd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java @@ -90,7 +90,7 @@ public class NotificationsListFragment extends BaseStatusListFragment result){ if(refreshing) relationships.clear(); - onDataLoaded(result, !result.isEmpty()); + onDataLoaded(result.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.isEmpty()); Set needRelationships=result.stream() .filter(ntf->ntf.status==null && !relationships.containsKey(ntf.account.id)) .map(ntf->ntf.account.id) diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java b/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java index 41a1346a..545028ad 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java @@ -12,7 +12,7 @@ import java.time.Instant; public class Notification extends BaseModel implements DisplayItemsParent{ @RequiredField public String id; - @RequiredField +// @RequiredField public Type type; @RequiredField public Instant createdAt;