From cafbf17beabf4da57fb0b251a6aee5ed744d31d5 Mon Sep 17 00:00:00 2001
From: Phillip Davis <phdavis1027@gmail.com>
Date: Mon, 24 Nov 2025 16:33:47 -0500
Subject: [PATCH] dont try to load messages if the activity is null

---
 .../java/eu/siacs/conversations/ui/ConversationFragment.java   | 3 ++-
 1 file changed, 2 insertions(+), 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 57e652901f5892009d8dccab019f9447423143bb..2ba54997b3fa822eaa8cad09a5a358d35119d9d2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -369,7 +369,8 @@ public class ConversationFragment extends XmppFragment
                         if (firstVisibleItem < 5
                                 && conversation != null
                                 && conversation.messagesLoaded.compareAndSet(true, false)
-                                && messageList.size() > 0) {
+                                && messageList.size() > 0
+                                && activity != null) {
                             long timestamp = conversation.loadMoreTimestamp();
                             activity.xmppConnectionService.loadMoreMessages(
                                     conversation,