aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-02-19 21:07:33 +0100
committerChristian Schneppe <christian@pix-art.de>2018-02-19 21:07:33 +0100
commitb63525da9f3e2a699665fb4310377b83d2159dd6 (patch)
tree4971cfbf0628c3ce3a95b4f0585c9608c0999457 /src/main/java/de/pixart
parent57176b4a99ebf1342a014473e4d7fcd2f0ce7b43 (diff)
check if axolotl service is initialized before displaying keys
Diffstat (limited to 'src/main/java/de/pixart')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java5
1 files changed, 3 insertions, 2 deletions
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()) {