Merge branch 'stable-v0.99' into 'stable-v0.99'

re-add SNI support to guardianproject.info repo

Apparently, it uses SNI, but does not always fail without SNI support.

See merge request !230
This commit is contained in:
Daniel Martí 2016-03-21 11:33:39 +00:00
commit 1870256803

View File

@ -113,8 +113,7 @@ public class HttpDownloader extends Downloader {
// workaround until NetCipher supports HTTPS SNI // workaround until NetCipher supports HTTPS SNI
// https://gitlab.com/fdroid/fdroidclient/issues/431 // https://gitlab.com/fdroid/fdroidclient/issues/431
if (connection instanceof HttpsURLConnection if (connection instanceof HttpsURLConnection
&& !TextUtils.equals(sourceUrl.getHost(), "f-droid.org") && !TextUtils.equals(sourceUrl.getHost(), "f-droid.org")) {
&& !TextUtils.equals(sourceUrl.getHost(), "guardianproject.info")) {
((HttpsURLConnection) connection).setSSLSocketFactory(HttpsURLConnection.getDefaultSSLSocketFactory()); ((HttpsURLConnection) connection).setSSLSocketFactory(HttpsURLConnection.getDefaultSSLSocketFactory());
} }