null check axolotl service when getting trust

Daniel Gultsch created 3 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Message.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -20,6 +20,7 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import eu.siacs.conversations.Config;
+import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
 import eu.siacs.conversations.http.URL;
 import eu.siacs.conversations.services.AvatarService;
@@ -917,7 +918,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public boolean isTrusted() {
-        FingerprintStatus s = conversation.getAccount().getAxolotlService().getFingerprintTrust(axolotlFingerprint);
+        final AxolotlService axolotlService = conversation.getAccount().getAxolotlService();
+        final FingerprintStatus s = axolotlService != null ? axolotlService.getFingerprintTrust(axolotlFingerprint) : null;
         return s != null && s.isTrusted();
     }