Skip to content

Part is attachment when disposition is null and Content-ID is unique. #34

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

Merged
merged 6 commits into from
May 7, 2016
Merged

Part is attachment when disposition is null and Content-ID is unique. #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9280e58
[bug fix] Part is attachment when disposition is null and Content-ID
Apr 28, 2016
f9495ca
Merge branch 'master' of https://github.com/bbottema/simple-java-mail
Apr 28, 2016
51e72ed
[bug fix]cid is not name
Apr 28, 2016
d832cc4
[bug fix]resolve cid read
Apr 28, 2016
dee4a9c
[bug fix]reuse <> to wrap contentId
Apr 28, 2016
93af846
beautify name
Apr 29, 2016
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
8 changes: 5 additions & 3 deletions src/main/java/org/codemonkey/simplejavamail/Mailer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,12 @@ private static BodyPart getBodyPartFromDatasource(final AttachmentResource resou
final BodyPart attachmentPart = new MimeBodyPart();
final DataSource ds = resource.getDataSource();
// setting headers isn't working nicely using the javax mail API, so let's do that manually
String contentId= resource.getName();
String fileName = ds.getName() != null ? ds.getName() : contentId;
attachmentPart.setDataHandler(new DataHandler(resource.getDataSource()));
attachmentPart.setFileName(resource.getName());
attachmentPart.setHeader("Content-Type", ds.getContentType() + "; filename=" + ds.getName() + "; name=" + ds.getName());
attachmentPart.setHeader("Content-ID", String.format("<%s>", ds.getName()));
attachmentPart.setFileName(fileName);
attachmentPart.setHeader("Content-Type", ds.getContentType() + "; filename=" + fileName + "; name=" + fileName);
attachmentPart.setHeader("Content-ID", String.format("<%s>", contentId));
attachmentPart.setDisposition(dispositionType + "; size=0");
return attachmentPart;
}
Expand Down
15 changes: 13 additions & 2 deletions src/main/java/org/codemonkey/simplejavamail/email/Email.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,10 +574,21 @@ private void fillEmailFromMimeMessage(MimeMessageParser parser) throws Messaging
this.setText(parser.getPlainContent());
this.setTextHTML(parser.getHtmlContent());
for (Map.Entry<String, DataSource> cid : parser.getCidMap().entrySet()) {
this.addEmbeddedImage(cid.getKey(), cid.getValue());
this.addEmbeddedImage(beautifyCID(cid.getKey()), cid.getValue());
}
for (Map.Entry<String, DataSource> attachment : parser.getAttachmentList().entrySet()) {
this.addAttachment(attachment.getKey(), attachment.getValue());
this.addAttachment(beautifyCID(attachment.getKey()), attachment.getValue());
}
}

private String beautifyCID(String cid){
int len1 = 0;
if(cid == null || (len1 = cid.length() - 1) < 0){
return cid;
}
if(cid.charAt(0) == '<' && cid.charAt(len1) == '>' ){
return cid.substring(1, len1);
}
return cid;
}
}
7 changes: 4 additions & 3 deletions src/main/java/org/codemonkey/simplejavamail/util/MimeMessageParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,11 @@ protected void parse(final MimePart part)
}
} else {
final DataSource ds = createDataSource(part);
if (Part.ATTACHMENT.equalsIgnoreCase(part.getDisposition())) {
this.attachmentList.put(part.getFileName(), ds);
// If the diposition is not provided, the part should be treat as attachment
if (part.getDisposition() == null || Part.ATTACHMENT.equalsIgnoreCase(part.getDisposition())) {
this.attachmentList.put(part.getContentID(), ds);
} else if (Part.INLINE.equalsIgnoreCase(part.getDisposition())) {
this.cidMap.put(part.getFileName(), ds);
this.cidMap.put(part.getContentID(), ds);
} else {
throw new IllegalStateException("invalid attachment type");
}
Expand Down