From 340c2ab2ad543d3aa07b4178e8a8239140d4a970 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 29 May 2021 19:58:41 +0200 Subject: [PATCH] Simplification --- .../java/eu/faircode/email/MessageHelper.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 939c593381..8af763873c 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -222,19 +222,18 @@ public class MessageHelper { String email = ((InternetAddress) message.from[0]).getAddress(); String name = ((InternetAddress) message.from[0]).getPersonal(); if (identity != null && identity.sender_extra && - identity.email.contains("@") && - email != null && - email.contains("@") && - message.extra != null && - !message.extra.equals(identity.email.split("@")[0])) { + email != null && message.extra != null) { int at = email.indexOf('@'); - if (message.extra.length() > 1 && message.extra.startsWith("+")) - email = email.substring(0, at) + message.extra + email.substring(at); - else - email = message.extra + email.substring(at); - if (!identity.sender_extra_name) - name = null; - Log.i("extra=" + email); + String username = identity.email.split("@")[0]; + if (at > 0 && !message.extra.equals(username)) { + if (message.extra.length() > 1 && message.extra.startsWith("+")) + email = email.substring(0, at) + message.extra + email.substring(at); + else + email = message.extra + email.substring(at); + if (!identity.sender_extra_name) + name = null; + Log.i("extra=" + email); + } } imessage.setFrom(new InternetAddress(email, name, StandardCharsets.UTF_8.name())); }