From 5137837f6d99ea5c9cc2b1b50515f545da0f7b0f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 25 May 2016 21:55:01 +0200
Subject: only publish keys if omemo is enabled

---
 .../java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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 aac81443..9e54c0c7 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -75,7 +75,9 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 
 	@Override
 	public void onAdvancedStreamFeaturesAvailable(Account account) {
-		if (account.getXmppConnection() != null && account.getXmppConnection().getFeatures().pep()) {
+		if (Config.supportOmemo()
+				&& account.getXmppConnection() != null
+				&& account.getXmppConnection().getFeatures().pep()) {
 			publishBundlesIfNeeded(true, false);
 		} else {
 			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": skipping OMEMO initialization");
-- 
cgit v1.2.3