From b4c6e323e5b16de7ff6e28f034f8dc9ffc6a2fb2 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Wed, 28 Feb 2024 15:57:43 -0500
Subject: [PATCH] Fix NPE

---
 .../java/eu/siacs/conversations/ui/ConversationFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index c2ab957fbc19977dbf0c4de021cd8dd341c5d72e..28a59624f6642ed85fc8d0c9699b34ed8491e840 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -387,7 +387,7 @@ public class ConversationFragment extends XmppFragment
                                                                     .populateWithMessages(
                                                                             ConversationFragment
                                                                                     .this
-                                                                                    .messageList, activity.xmppConnectionService);
+                                                                                    .messageList, activity == null ? null : activity.xmppConnectionService);
                                                             try {
                                                                 updateStatusMessages();
                                                             } catch (IllegalStateException e) {