aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-12-10 23:16:33 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-10 23:16:39 +0100
commit15f220747f33b351d10e2b1c736f1e26601c7eeb (patch)
tree7feeab0bad961eb9ab51a625c6afb63027b074b0 /src
parent55c1129a651b1191273bbf8e49783a4798580375 (diff)
some more NPE checks
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
index a3dc1357..e22b05c0 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -72,7 +72,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
@Override
public void onAdvancedStreamFeaturesAvailable(Account account) {
- if (account.getXmppConnection().getFeatures().pep()) {
+ if (account.getXmppConnection() != null && account.getXmppConnection().getFeatures().pep()) {
publishBundlesIfNeeded(true, false);
} else {
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": skipping OMEMO initialization");