From 35bfa0edb4fa7f3845f9252ea501e5e9039fc108 Mon Sep 17 00:00:00 2001
From: Adolfo Santiago <epoch@adol.pw>
Date: Thu, 28 Aug 2025 08:51:08 +0200
Subject: [PATCH] Fix possible crash with null account

---
 .../tusky/util/ViewDataUtils.java             | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/util/ViewDataUtils.java b/husky/app/src/main/java/com/keylesspalace/tusky/util/ViewDataUtils.java
index 9040760c..01a2fa11 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/util/ViewDataUtils.java
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/util/ViewDataUtils.java
@@ -115,21 +115,22 @@ public static StatusViewData.Concrete statusToViewData(
                 newStatus = newStatus.setQuoteEmojis(quote.getQuoteEmojis());
             }
 
-            newStatus = newStatus.setQuoteFullName(
-                    quote.getAccount().getDisplayName()
-            ).setQuoteUsername(
-                    quote.getAccount().getUsername()
-            ).setQuotedStatusId(
-                    quote.getQuotedStatusId()
-            ).setQuotedStatusUrl(
-                    quote.getQuotedStatusUrl()
-            );
+            if (quote.getAccount() != null) {
+                newStatus = newStatus.setQuoteFullName(quote.getAccount().getDisplayName())
+                    .setQuoteUsername(quote.getAccount().getUsername());
 
-            if (quote.getAccount().getEmojis() != null) {
-                newStatus = newStatus.setQuotedAccountEmojis(
+                if (quote.getAccount().getEmojis() != null) {
+                    newStatus = newStatus.setQuotedAccountEmojis(
                         quote.getAccount().getEmojis()
-                );
+                    );
+                }
             }
+
+            newStatus = newStatus.setQuotedStatusId(
+                quote.getQuotedStatusId()
+            ).setQuotedStatusUrl(
+                quote.getQuotedStatusUrl()
+            );
         }
 
         return newStatus.createStatusViewData();