From 55ba8e036e6236c8d2a29b1e7229d7e4aaa68304 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 11 Nov 2019 20:15:48 +0100 Subject: [PATCH] Prevent NPE --- app/src/main/java/eu/faircode/email/ImageHelper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ImageHelper.java b/app/src/main/java/eu/faircode/email/ImageHelper.java index ff5707ce1c..5b72d04121 100644 --- a/app/src/main/java/eu/faircode/email/ImageHelper.java +++ b/app/src/main/java/eu/faircode/email/ImageHelper.java @@ -372,9 +372,11 @@ class ImageHelper { if (++redirects > MAX_REDIRECTS) throw new IOException("Too many redirects"); - String location = URLDecoder.decode( - urlConnection.getHeaderField("Location"), - StandardCharsets.UTF_8.name()); + String header = urlConnection.getHeaderField("Location"); + if (header == null) + throw new IOException("Location header missing"); + + String location = URLDecoder.decode(header, StandardCharsets.UTF_8.name()); url = new URL(url, location); Log.i("Redirect #" + redirects + " to " + url);