From 1819258dbc885843c2a8da12965ee6d5e477c82e Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 23 Jan 2024 16:05:38 -0500
Subject: [PATCH] Show thread subject if message has no subject itself

---
 .../eu/siacs/conversations/ui/adapter/MessageAdapter.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index dd9b52c5b2832eebc104b855a557cab1492dada1..04055368a668b4b140bd6291f37bc37c6a3f0a7f 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1172,11 +1172,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
 
         if (type == RECEIVED || type == SENT) {
-            if (message.getSubject() == null) {
+            String subject = message.getSubject();
+            if (subject == null && message.getThread() != null) {
+                subject = ((Conversation) message.getConversation()).getThread(message.getThread().getContent()).getSubject();
+            }
+            if (subject == null) {
                 viewHolder.subject.setVisibility(View.GONE);
             } else {
                 viewHolder.subject.setVisibility(View.VISIBLE);
-                viewHolder.subject.setText(message.getSubject());
+                viewHolder.subject.setText(subject);
             }
         }