Merge branch 'fix-crash-on-http-images' into 'develop'
Fix crash happening when trying to fetch images from HTTP connexions See merge request tom79/fedilab!1035
This commit is contained in:
commit
0b08d05397
|
@ -303,9 +303,9 @@ public class HttpsConnection {
|
||||||
|
|
||||||
URL url = new URL(urlConnection);
|
URL url = new URL(urlConnection);
|
||||||
if (proxy != null)
|
if (proxy != null)
|
||||||
httpURLConnection = (HttpsURLConnection) url.openConnection(proxy);
|
httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
|
||||||
else
|
else
|
||||||
httpURLConnection = (HttpsURLConnection) url.openConnection();
|
httpURLConnection = (HttpURLConnection) url.openConnection();
|
||||||
httpURLConnection.setConnectTimeout(30 * 1000);
|
httpURLConnection.setConnectTimeout(30 * 1000);
|
||||||
httpURLConnection.setRequestProperty("http.keepAlive", "false");
|
httpURLConnection.setRequestProperty("http.keepAlive", "false");
|
||||||
httpURLConnection.setRequestProperty("Content-Type", "application/json");
|
httpURLConnection.setRequestProperty("Content-Type", "application/json");
|
||||||
|
|
Loading…
Reference in New Issue