From 6b0f371ba4a265fba4e9cb61b9d19b5c23a23fd3 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Sat, 19 Aug 2023 19:19:55 -0500
Subject: [PATCH] Fix NPE

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

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 691061ae4b32b80763e06604455970ea4fccc045..377898f17ab43a8c9810a4adf7686fc3159fb306 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2503,6 +2503,7 @@ public class ConversationFragment extends XmppFragment
                 newThread();
             } else {
                 if (conversation.getMode() == Conversation.MODE_MULTI) {
+                    if (activity == null || activity.xmppConnectionService == null) return;
                     if (!activity.xmppConnectionService.getBooleanPreference("follow_thread_in_channel", R.bool.follow_thread_in_channel)) return;
                 }