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
このコミットが含まれているのは:
Thomas 2021-03-25 19:39:09 +00:00
コミット 0b08d05397
1個のファイルの変更2行の追加2行の削除

ファイルの表示

@ -303,9 +303,9 @@ public class HttpsConnection {
URL url = new URL(urlConnection);
if (proxy != null)
httpURLConnection = (HttpsURLConnection) url.openConnection(proxy);
httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
else
httpURLConnection = (HttpsURLConnection) url.openConnection();
httpURLConnection = (HttpURLConnection) url.openConnection();
httpURLConnection.setConnectTimeout(30 * 1000);
httpURLConnection.setRequestProperty("http.keepAlive", "false");
httpURLConnection.setRequestProperty("Content-Type", "application/json");