Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/iNPUTmice/Conversations.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2018-02-19 19:26:38 +0300
committerDaniel Gultsch <daniel@gultsch.de>2018-02-19 19:26:38 +0300
commitc35ac11a421d99315d708a9cbb7c05cb96d9f90c (patch)
tree32c3c5ab8b00077b07d6bc2727de4bfb61de1798
parent742727504f5bee3472825fe207dd1fdf7bb7f8ea (diff)
check if axolotl service is initialized before displaying keys
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 48107a4ab..0e517cf1b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -468,10 +468,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()) {