From 439b0fc8798618c01770640773ca8b01ccb99132 Mon Sep 17 00:00:00 2001 From: Stavros Anastasiadis Date: Thu, 18 Apr 2024 21:43:48 +0200 Subject: [PATCH] #77 exclude creator/modifier from setFromEmail 1. the property 0x3ffa refers to the creator/last modifier of the message object and it may be unrelated to the sender of the message. 2. the setFromEmail must allow X500 data if the variable is null (and removed unnecessary/duplicated check for "@") --- .../outlookmessageparser/model/OutlookMessage.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java b/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java index 9b10364..bc0bf28 100644 --- a/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java +++ b/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java @@ -201,9 +201,10 @@ public void setProperty(final OutlookMessageProperty msgProp, RTF2HTMLConverter break; case 0xc1f: //SENDER EMAIL ADDRESS case 0x65: //SENT REPRESENTING EMAIL ADDRESS - case 0x3ffa: //LAST MODIFIER NAME setFromEmail(stringValue); break; + case 0x3ffa: //LAST MODIFIER NAME + break; case 0x42: //SENT REPRESENTING NAME setFromName(stringValue); break; @@ -527,7 +528,7 @@ private void setFromEmail(final String fromEmail) { * @param force forces overwriting of the field if already set */ private void setFromEmail(final String fromEmail, final boolean force) { - if ((force || this.fromEmail == null) && fromEmail != null && fromEmail.contains("@")) { + if (force || this.fromEmail == null) { this.fromEmail = fromEmail; } } @@ -1048,4 +1049,4 @@ public void setSmime(OutlookSmime smime) { public OutlookSmime getSmime() { return smime; } -} \ No newline at end of file +}