diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-10 23:16:33 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-12 15:51:39 +0100 |
| commit | 52aaa72e43c57f9c9db3106bdd42dae314f316e3 (patch) | |
| tree | ccc4379b7c76350a37e446f78cb6331f23a36714 /src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java | |
| parent | ffe3d42a115e1d2a535c1ced1a65ee9aa975d84c (diff) | |
some more NPE checks
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java | 2 |
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 a3dc1357e..e22b05c00 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"); |