Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 06:38:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplification

Browse Source
This commit is contained in:
M66B
2019-10-30 15:15:24 +01:00
parent c23d96e630
commit 6a67913078
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/ImageHelper.java
View File

@@ -353,10 +353,10 @@ class ImageHelper {
Bitmap bm;
HttpURLConnection urlConnection = null;
try {
String url = a.source;
int redirects = 0;
URL url = new URL(a.source);
while (true) {
urlConnection = (HttpURLConnection) new URL(url).openConnection();
urlConnection = (HttpURLConnection) url.openConnection();
urlConnection.setRequestMethod("GET");
urlConnection.setDoOutput(false);
urlConnection.setInstanceFollowRedirects(true);
@@ -366,14 +366,13 @@ class ImageHelper {
if (status == HttpURLConnection.HTTP_MOVED_PERM ||
status == HttpURLConnection.HTTP_MOVED_TEMP) {
redirects++;
if (redirects > MAX_REDIRECTS)
if (++redirects > MAX_REDIRECTS)
throw new IOException("Too many redirects");
String location = URLDecoder.decode(
urlConnection.getHeaderField("Location"),
StandardCharsets.UTF_8.name());
url = new URL(new URL(url), location).toExternalForm();
url = new URL(url, location);
Log.i("Redirect #" + redirects + " to " + url);
urlConnection.disconnect();
@@ -381,7 +380,7 @@ class ImageHelper {
}
if (status != HttpURLConnection.HTTP_OK)
throw new IOException("http " + status);
throw new IOException("HTTP status=" + status);
break;
}