aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
diff options
context:
space:
mode:
authorBrianBlade <n.gelbertz@gmail.com>2015-04-02 13:35:42 +0200
committerBrianBlade <n.gelbertz@gmail.com>2015-04-11 15:13:42 +0200
commit878066ca99c1170479fb217d68ecdb9cf5498975 (patch)
treec866ad43ba2b8529801c5bd2c0b4ecdf507faec3 /src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
parent7eabdfd80f50634282307f45c5f99ab46181805d (diff)
Add option to use MTM without default TrustManager
Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked.
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/SettingsActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/SettingsActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 39e215f2..1bc59b13 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -79,7 +79,8 @@ public class SettingsActivity extends XmppActivity implements
}
}
}
+ } else if (name.equals("dont_trust_system_cas")) {
+ xmppConnectionService.updateMemorizingTrustmanager();
}
}
-
}