Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use real Outlook ContentId Attribute to resolve CID Attachments #19

Merged
merged 2 commits into from
Dec 18, 2019
Merged

Use real Outlook ContentId Attribute to resolve CID Attachments #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39c1c7f
Fix cid handling to use real outlook ContentId Attribute
Dec 17, 2019
9fcef2e
Add fallback handling
Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookFileAttachment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ public class OutlookFileAttachment implements OutlookAttachment {
* Mime type of the attachment
*/
private String mimeTag;
/**
* CID of the attachment
*/
private String contentId;
/**
* The extension of the attachment (may not be set).
*/
Expand Down Expand Up @@ -58,6 +62,9 @@ public void setProperty(final OutlookMessageProperty msgProp) {
case "3703":
setExtension((String) value);
break;
case "3712":
setContentId((String) value);
break;
default:
// property to ignore, for full list see properties-list.txt
}
Expand Down Expand Up @@ -89,6 +96,21 @@ public String toString() {
return (longFilename != null) ? longFilename : filename;
}

/**
* Bean getter for {@link #contentId}.
*/
@SuppressWarnings("ElementOnlyUsedFromTestCode")
public String getContentId() {
return contentId;
}

/**
* Bean setter for {@link #contentId}.
*/
void setContentId(final String contentId) {
this.contentId = contentId;
}

/**
* Bean getter for {@link #extension}.
*/
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,10 @@ public Map<String, OutlookFileAttachment> fetchCIDMap() {
for (final OutlookAttachment attachment : getOutlookAttachments()) {
if (attachment instanceof OutlookFileAttachment) {
final OutlookFileAttachment fileAttachment = (OutlookFileAttachment) attachment;
if (!tryAddCid(cidMap, html, fileAttachment, fileAttachment.getFilename())) {
tryAddCid(cidMap, html, fileAttachment, fileAttachment.getLongFilename());
if (!tryAddCid(cidMap, html, fileAttachment, fileAttachment.getContentId())) {
if (!tryAddCid(cidMap, html, fileAttachment, fileAttachment.getFilename())) {
tryAddCid(cidMap, html, fileAttachment, fileAttachment.getLongFilename());
}
}
}
}
Expand Down