summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorTom Hennen <TomHennen@users.noreply.github.com>2015-11-16 18:30:35 -0500
committerTom Hennen <TomHennen@users.noreply.github.com>2015-11-16 18:30:35 -0500
commit4800cba021026bf108c39b3101e3fdb8c5eea6c2 (patch)
tree270451311d437b7d1cb5e50ae475caeec75a5ed4 /core/src
parent3768198a4b89738845ae50298611dd92ad0d722d (diff)
parentb970d4fb0e99f08012c5bc7d29684af361200943 (diff)
downloadAntennaPod-4800cba021026bf108c39b3101e3fdb8c5eea6c2.zip
Merge pull request #1383 from mfietz/issue/1374-1382-tlsv1
Allow TLSv1
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java6
1 files changed, 2 insertions, 4 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 9aff7489b..5deb5e501 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,7 +1,7 @@
package de.danoeh.antennapod.core.service.download;
-import android.support.annotation.NonNull;
import android.os.Build;
+import android.support.annotation.NonNull;
import android.util.Log;
import com.squareup.okhttp.OkHttpClient;
@@ -18,8 +18,6 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import de.danoeh.antennapod.core.BuildConfig;
-
/**
* Provides access to a HttpClient singleton.
*/
@@ -151,7 +149,7 @@ public class AntennapodHttpClient {
}
private void configureSocket(SSLSocket s) {
- s.setEnabledProtocols(new String[] { "TLSv1.2", "TLSv1.1" } );
+ s.setEnabledProtocols(new String[] { "TLSv1.2", "TLSv1.1", "TLSv1" } );
}
}