From b8907789427301d681f5b264008a34b04f06eb89 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Fri, 4 Oct 2024 21:12:31 -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 4cfa2ff6241d2e8fa7da53f8a6f72f8d28ad58b5..41fd92d0787dccc8535dc070b37b6fa620ba9a28 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1074,6 +1074,7 @@ public class ConversationFragment extends XmppFragment
 
     protected boolean trustKeysIfNeeded(int requestCode) {
         AxolotlService axolotlService = conversation.getAccount().getAxolotlService();
+        if (axolotlService == null) return false;
         final List<Jid> targets = axolotlService.getCryptoTargets(conversation);
         boolean hasUnaccepted = !conversation.getAcceptedCryptoTargets().containsAll(targets);
         boolean hasUndecidedOwn =