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/XmppActivity.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/XmppActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 74abc88b8..a9f95a5b3 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -740,14 +740,15 @@ public abstract class XmppActivity extends Activity { view.setOnLongClickListener(purge); key.setOnLongClickListener(purge); keyType.setOnLongClickListener(purge); - boolean x509 = trust == XmppAxolotlSession.Trust.TRUSTED_X509 || trust == XmppAxolotlSession.Trust.INACTIVE_TRUSTED_X509; + boolean x509 = Config.X509_VERIFICATION + && (trust == XmppAxolotlSession.Trust.TRUSTED_X509 || trust == XmppAxolotlSession.Trust.INACTIVE_TRUSTED_X509); switch (trust) { case UNTRUSTED: case TRUSTED: case TRUSTED_X509: trustToggle.setChecked(trust.trusted(), false); - trustToggle.setEnabled(trust != XmppAxolotlSession.Trust.TRUSTED_X509); - if (trust == XmppAxolotlSession.Trust.TRUSTED_X509) { + trustToggle.setEnabled(!Config.X509_VERIFICATION || trust != XmppAxolotlSession.Trust.TRUSTED_X509); + if (Config.X509_VERIFICATION && trust == XmppAxolotlSession.Trust.TRUSTED_X509) { trustToggle.setOnClickListener(null); } key.setTextColor(getPrimaryTextColor()); |