diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2022-04-08 16:55:16 +0300 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2022-04-08 16:55:16 +0300 |
commit | eb9f6653ad56ee1bb35e0dc3c613f8df9c227035 (patch) | |
tree | dadef831298e5e6fcaf439edc1679bafef966427 | |
parent | bf8afe0396adb5b67f0f1df7e05beff356c6e5a2 (diff) |
null check axolotl service when getting trust
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index aa197aa44..fa1819124 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/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(); } |