diff options
| author | Christian S <kriztan@users.noreply.github.com> | 2016-03-20 18:52:46 +0100 |
|---|---|---|
| committer | Christian S <kriztan@users.noreply.github.com> | 2016-03-20 18:52:46 +0100 |
| commit | a72d94c40584e7ca7a0a3ffacca8424ac0ad600f (patch) | |
| tree | 76a4707750256450c8c203cd38f101b73434c821 /src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java | |
| parent | bfa1b020f874c5e45833ba004e59c81743d32c2d (diff) | |
| parent | 135c8567a566e2c12f98a578dcd606dfdf2b06bb (diff) | |
Merge pull request #80 from siacs/master
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index b2d9e1d83..a43709ae5 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -456,7 +456,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)); |