From 76286afd0a53472a5f60be41b2689f41bcd30f36 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Wed, 27 Mar 2024 09:11:36 -0500
Subject: [PATCH] Fix NPE

---
 .../java/eu/siacs/conversations/ui/ConversationFragment.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 28a59624f6642ed85fc8d0c9699b34ed8491e840..628734dc26638d0ac14fc8cad7b763766dd60f9b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3643,8 +3643,8 @@ public class ConversationFragment extends XmppFragment
                         || conversation.getMucOptions().participating();
         if (this.conversation.getStatus() != Conversation.STATUS_ARCHIVED
                 && participating
-                && this.conversation.setNextMessage(msg)) {
-            this.activity.xmppConnectionService.updateConversation(this.conversation);
+                && this.conversation.setNextMessage(msg) && activity != null) {
+            activity.xmppConnectionService.updateConversation(this.conversation);
             return true;
         }
         return false;