From e43744eb88a1c5db0242dac032d31a2b4b070efe Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 14 Oct 2021 07:14:19 +0200
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/Bimi.java | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Bimi.java b/app/src/main/java/eu/faircode/email/Bimi.java
index 1d32f29623..43ea75cb56 100644
--- a/app/src/main/java/eu/faircode/email/Bimi.java
+++ b/app/src/main/java/eu/faircode/email/Bimi.java
@@ -123,28 +123,30 @@ public class Bimi {
                     if (TextUtils.isEmpty(l))
                         continue;
 
-                    Uri ul = Uri.parse(l);
-                    if (!"https".equals(ul.getScheme())) {
-                        Log.e("BIMI insecure img=" + l);
-                        continue;
-                    }
-
-                    URL url = new URL(l);
-                    Log.i("BIMI favicon " + url);
-
-                    HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
-                    connection.setRequestMethod("GET");
-                    connection.setReadTimeout(READ_TIMEOUT);
-                    connection.setConnectTimeout(CONNECT_TIMEOUT);
-                    connection.setInstanceFollowRedirects(true);
-                    connection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
-                    connection.connect();
-
                     try {
-                        bitmap = ImageHelper.renderSvg(connection.getInputStream(),
-                                Color.WHITE, scaleToPixels);
-                    } finally {
-                        connection.disconnect();
+                        Uri ul = Uri.parse(l);
+                        if ("https".equals(ul.getScheme()))
+                            throw new MalformedURLException(l);
+
+                        URL url = new URL(l);
+                        Log.i("BIMI favicon " + url);
+
+                        HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
+                        connection.setRequestMethod("GET");
+                        connection.setReadTimeout(READ_TIMEOUT);
+                        connection.setConnectTimeout(CONNECT_TIMEOUT);
+                        connection.setInstanceFollowRedirects(true);
+                        connection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
+                        connection.connect();
+
+                        try {
+                            bitmap = ImageHelper.renderSvg(connection.getInputStream(),
+                                    Color.WHITE, scaleToPixels);
+                        } finally {
+                            connection.disconnect();
+                        }
+                    } catch (MalformedURLException ex) {
+                        Log.i(ex);
                     }
 
                     break;
@@ -159,13 +161,11 @@ public class Bimi {
                     if (TextUtils.isEmpty(a))
                         continue;
 
-                    Uri ua = Uri.parse(a);
-                    if (!"https".equals(ua.getScheme())) {
-                        Log.e("BIMI insecure pem=" + a);
-                        continue;
-                    }
-
                     try {
+                        Uri ua = Uri.parse(a);
+                        if (!"https".equals(ua.getScheme()))
+                            throw new MalformedURLException(a);
+
                         URL url = new URL(a);
                         Log.i("BIMI PEM " + url);