diff options
| author | Christian S <christian@pix-art.de> | 2016-02-04 18:02:03 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-04 18:02:03 +0100 |
| commit | 14b688e0fbe62a0fef0fadcc20763faa21801d7a (patch) | |
| tree | 37fc7b87aa21326b0ca7ba97fee84aaf0ea6d3c2 /src/main/java/eu/siacs/conversations/http | |
| parent | 9e96d80e31c5d0455c4b15984eef5709cf1071fc (diff) | |
| parent | 91ec4839acef3e395e83815f211dd9771af1287e (diff) | |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/http')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java index 910c43f31..a8b31a7a9 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java @@ -23,6 +23,7 @@ import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.services.AbstractConnectionManager; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.SSLSocketHelper; public class HttpConnectionManager extends AbstractConnectionManager { @@ -76,7 +77,7 @@ public class HttpConnectionManager extends AbstractConnectionManager { new StrictHostnameVerifier()); } try { - final SSLContext sc = SSLContext.getInstance("TLS"); + final SSLContext sc = SSLSocketHelper.getSSLContext(); sc.init(null, new X509TrustManager[]{trustManager}, mXmppConnectionService.getRNG()); |