diff options
author | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:06 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:06 +0200 |
commit | defb127d6e3a1d29f60553a8e9b3f992f2127b70 (patch) | |
tree | b220ef33d771667032a1cc2c62b0587a09a27ff9 /src/main/java/eu/siacs/conversations/ui | |
parent | 261b505f066b90ef346c529afea50f8285ddfd7d (diff) | |
parent | 878066ca99c1170479fb217d68ecdb9cf5498975 (diff) |
Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference
Conflicts:
src/main/res/values-de/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | 3 |
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 e3cb2ee7..d24cb52b 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -85,7 +85,8 @@ public class SettingsActivity extends XmppActivity implements } } } + } else if (name.equals("dont_trust_system_cas")) { + xmppConnectionService.updateMemorizingTrustmanager(); } } - } |