merged from develop

1 files changed, 80 insertions, 0 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index 012678cd0..9aff7489b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -1,14 +1,23 @@
 package de.danoeh.antennapod.core.service.download;
 
 import android.support.annotation.NonNull;
+import android.os.Build;
 import android.util.Log;
 
 import com.squareup.okhttp.OkHttpClient;
 
+import java.io.IOException;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.security.GeneralSecurityException;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
 import de.danoeh.antennapod.core.BuildConfig;
 
 /**
@@ -64,6 +73,10 @@ public class AntennapodHttpClient {
         // configure redirects
         client.setFollowRedirects(true);
         client.setFollowSslRedirects(true);
+
+        if(16 <= Build.VERSION.SDK_INT && Build.VERSION.SDK_INT < 21) {
+            client.setSslSocketFactory(new CustomSslSocketFactory());
+        }
         return client;
     }
 
@@ -76,4 +89,71 @@ public class AntennapodHttpClient {
             // does nothing at the moment
         }
     }
+
+    private static class CustomSslSocketFactory extends SSLSocketFactory {
+
+        private SSLSocketFactory factory;
+
+        public CustomSslSocketFactory() {
+            try {
+                SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
+                sslContext.init(null, null, null);
+                factory= sslContext.getSocketFactory();
+            } catch(GeneralSecurityException e) {
+                e.printStackTrace();
+            }
+        }
+
+        @Override
+        public String[] getDefaultCipherSuites() {
+            return factory.getDefaultCipherSuites();
+        }
+
+        @Override
+        public String[] getSupportedCipherSuites() {
+            return factory.getSupportedCipherSuites();
+        }
+
+        public Socket createSocket() throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket();
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(String var1, int var2) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2);
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2, var3, var4);
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(InetAddress var1, int var2) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2);
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2, var3, var4);
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2, var3, var4);
+            configureSocket(result);
+            return result;
+        }
+
+        private void configureSocket(SSLSocket s) {
+            s.setEnabledProtocols(new String[] { "TLSv1.2", "TLSv1.1" } );
+        }
+
+    }
+
 }