From 212d1a8c91d5b83d1132d3a02664607ce37f8ecf Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 12 Oct 2015 13:18:20 +0200
Subject: add config variable to enable x509 verification

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

(limited to 'src/main/java/eu/siacs/conversations/crypto/axolotl')

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 fe801755e..58e5a0957 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -504,10 +504,10 @@ public class AxolotlService {
 
 
 					if (changed) {
-						if (account.getPrivateKeyAlias() == null) {
-							publishDeviceBundle(signedPreKeyRecord, preKeyRecords, announce, wipe);
-						} else {
+						if (account.getPrivateKeyAlias() != null && Config.X509_VERIFICATION) {
 							publishDeviceVerificationAndBundle(signedPreKeyRecord, preKeyRecords, announce, wipe);
+						} else {
+							publishDeviceBundle(signedPreKeyRecord, preKeyRecords, announce, wipe);
 						}
 					} else {
 						Log.d(Config.LOGTAG, getLogprefix(account) + "Bundle " + getOwnDeviceId() + " in PEP was current");
-- 
cgit v1.2.3