From 4064264a8dbe55dbdfc5e9cdde3fb10459981f0c Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 24 Sep 2019 15:02:33 +0200 Subject: [PATCH] Simplification --- .../java/eu/faircode/email/HtmlHelper.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index fcc8e8514f..e1ab4c44f4 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -162,19 +162,17 @@ public class HtmlHelper { switch (kv[0].trim().toLowerCase(Locale.ROOT)) { case "color": String c = kv[1].trim().toLowerCase(Locale.ROOT); + Integer color = null; - if (!c.startsWith("#")) - try { - color = Color.parseColor(c); - } catch (IllegalArgumentException ex) { - Log.e("Color=" + c); - } - if (color == null) - try { + try { + if (c.startsWith("#")) color = Integer.decode(c) | 0xFF000000; - } catch (NumberFormatException ex) { - Log.e("Color=" + c); - } + else + color = Color.parseColor(c); + } catch (Throwable ex) { + Log.e("Color=" + c); + } + if (color != null) { double lum = ColorUtils.calculateLuminance(color); if (dark