mirror/etesync-android
0
0
Fork 0
mirror of https://github.com/etesync/android.git synced 2024-09-20 13:08:51 +02:00
Code

Merge pull request #210 from bubak4/patch-1

Browse Source 
Fix #207 (regression: http not supported). Thanks @bubak4
This commit is contained in:
rfc2822 2014-03-25 13:51:42 +01:00
commit c5905b44ed
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/at/bitfire/davdroid/webdav/DavHttpClient.java
View File

@ -15,6 +15,7 @@ import ch.boye.httpclientandroidlib.client.config.RequestConfig;
import ch.boye.httpclientandroidlib.config.Registry;
import ch.boye.httpclientandroidlib.config.RegistryBuilder;
import ch.boye.httpclientandroidlib.conn.socket.ConnectionSocketFactory;
import ch.boye.httpclientandroidlib.conn.socket.PlainConnectionSocketFactory;
import ch.boye.httpclientandroidlib.impl.client.CloseableHttpClient;
import ch.boye.httpclientandroidlib.impl.client.HttpClients;
import ch.boye.httpclientandroidlib.impl.conn.ManagedHttpClientConnectionFactory;
@ -28,6 +29,7 @@ public class DavHttpClient {
static {
socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory> create()
.register("https", TlsSniSocketFactory.INSTANCE)
.register("http", PlainConnectionSocketFactory.getSocketFactory())
.build();
// use request defaults from AndroidHttpClient