From 3a7f3bce0121b860ba0fce7c0be2a08fd350b412 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 10 Feb 2020 10:45:28 +0100 Subject: [PATCH] Fixed received from IP --- .../java/eu/faircode/email/MessageHelper.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index e868f35f57..87ca9b39eb 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -849,9 +849,18 @@ public class MessageHelper { if (received == null || received.length == 0) return null; - String[] h = MimeUtility.unfold(received[received.length - 1]).split("\\s+"); - if (h.length > 1 && h[0].equalsIgnoreCase("from")) - return h[1]; + String origin = MimeUtility.unfold(received[received.length - 1]); + + String[] h = origin.split("\\s+"); + if (h.length > 1 && h[0].equalsIgnoreCase("from")) { + String host = h[1]; + if (host.startsWith("[")) + host = host.substring(1); + if (host.endsWith("]")) + host = host.substring(0, host.length() - 1); + if (!TextUtils.isEmpty(host)) + return host; + } return null; }