From b63525da9f3e2a699665fb4310377b83d2159dd6 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 19 Feb 2018 21:07:33 +0100
Subject: check if axolotl service is initialized before displaying keys

---
 src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
index 38a7689bf..ca435d6a5 100644
--- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
@@ -586,10 +586,11 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                 });
             }
         }
-        if (Config.supportOmemo()) {
+        final AxolotlService axolotlService = contact.getAccount().getAxolotlService();
+        if (Config.supportOmemo() && axolotlService != null) {
             boolean skippedInactive = false;
             boolean showsInactive = false;
-            for (final XmppAxolotlSession session : contact.getAccount().getAxolotlService().findSessionsForContact(contact)) {
+            for (final XmppAxolotlSession session : axolotlService.findSessionsForContact(contact)) {
                 final FingerprintStatus trust = session.getTrust();
                 hasKeys |= !trust.isCompromised();
                 if (!trust.isActive()) {
-- 
cgit v1.2.3