diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-10-12 13:18:20 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-10-12 13:18:20 +0200 |
| commit | 212d1a8c91d5b83d1132d3a02664607ce37f8ecf (patch) | |
| tree | 36cf3f3c387097075af0c404548f27dc59800867 /src/main/java/eu/siacs/conversations/crypto/axolotl | |
| parent | 933538a39da9fb80025e07fc173514f45033c261 (diff) | |
add config variable to enable x509 verification
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/axolotl')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java | 6 |
1 files changed, 3 insertions, 3 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 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"); |