diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java index 9bccb44b8..fa0a5d986 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java @@ -181,13 +181,13 @@ public abstract class StatusDisplayItem{ Bundle args=new Bundle(); args.putString("account", accountID); try{ + ScheduledStatus scheduledStatus=parentObject instanceof ScheduledStatus s ? s : null; + // Check if account is null. This should never happen, but it seems to do in latest versions of glitch-soc - if (status.account == null || (status.reblog != null && status.reblog.account == null) || (status.quote != null) && status.quote.account == null) { + if (scheduledStatus == null && status.account == null || (status.reblog != null && status.reblog.account == null) || (status.quote != null) && status.quote.account == null) { throw new Exception("status " + status.url + " has null account field"); } - ScheduledStatus scheduledStatus=parentObject instanceof ScheduledStatus s ? s : null; - HeaderStatusDisplayItem header=null; boolean hideCounts=!AccountSessionManager.get(accountID).getLocalPreferences().showInteractionCounts;