msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Simplification

Browse Source
pull/164/head
M66B 6 years ago
parent c23d96e630
commit 6a67913078
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File

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

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

Write Preview
Loading…
Cancel
Save