introduced custom tls socket factory to make tls1.2 work for http connections

1 files changed, 2 insertions, 15 deletions

diff --git a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java
index a03e36991..c6f1d02ec 100644
--- a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java
+++ b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java
@@ -13,15 +13,13 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
 
 import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.services.AbstractConnectionManager;
 import de.pixart.messenger.services.XmppConnectionService;
-import de.pixart.messenger.utils.CryptoHelper;
-import de.pixart.messenger.utils.SSLSocketHelper;
+import de.pixart.messenger.utils.TLSSocketFactory;
 
 public class HttpConnectionManager extends AbstractConnectionManager {
 
@@ -75,18 +73,7 @@ public class HttpConnectionManager extends AbstractConnectionManager {
                             new StrictHostnameVerifier());
         }
         try {
-            final SSLContext sc = SSLSocketHelper.getSSLContext();
-            sc.init(null, new X509TrustManager[]{trustManager},
-                    mXmppConnectionService.getRNG());
-
-            final SSLSocketFactory sf = sc.getSocketFactory();
-            final String[] cipherSuites = CryptoHelper.getOrderedCipherSuites(
-                    sf.getSupportedCipherSuites());
-            if (cipherSuites.length > 0) {
-                sc.getDefaultSSLParameters().setCipherSuites(cipherSuites);
-
-            }
-
+            final SSLSocketFactory sf = new TLSSocketFactory(new X509TrustManager[]{trustManager}, mXmppConnectionService.getRNG());
             connection.setSSLSocketFactory(sf);
             connection.setHostnameVerifier(hostnameVerifier);
         } catch (final KeyManagementException | NoSuchAlgorithmException ignored) {