diff options
| author | lookshe <github@lookshe.org> | 2016-03-25 20:13:51 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-25 20:13:51 +0100 |
| commit | 711ab9f2b1b625373a7046774c7b78e59f826589 (patch) | |
| tree | adbfec9c7f9cac33351b1b09c4f5057c6ef674b5 /src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java | |
| parent | d25ab854dae2be0d5286d46b5038494d503dd367 (diff) | |
| parent | 27c16b4b9acaad33b36145d63f6bfd7e04a3b3f1 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java index a18fd848..3ca9fce7 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java @@ -457,7 +457,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd private void onOmemoKeyClicked(Account account, String fingerprint) { final XmppAxolotlSession.Trust trust = account.getAxolotlService().getFingerprintTrust(fingerprint); - if (trust != null && trust == XmppAxolotlSession.Trust.TRUSTED_X509) { + if (Config.X509_VERIFICATION && trust != null && trust == XmppAxolotlSession.Trust.TRUSTED_X509) { X509Certificate x509Certificate = account.getAxolotlService().getFingerprintCertificate(fingerprint); if (x509Certificate != null) { showCertificateInformationDialog(CryptoHelper.extractCertificateInformation(x509Certificate)); |