diff options
author | Tony Mantler <nicoya@google.com> | 2014-05-19 22:10:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-19 22:10:18 +0000 |
commit | 2fbd8c269c9e0c74b120e9d2ec498b0620b67c84 (patch) | |
tree | 22578360f5ce2a4a5042bf6a89279001e126391b | |
parent | 6e7a92ad68a7beb2ecf3ea31d3ae74748f2635e7 (diff) | |
parent | 8b808216457189f7c74200eff0a3c84568608539 (diff) | |
download | android_packages_apps_Email-2fbd8c269c9e0c74b120e9d2ec498b0620b67c84.tar.gz android_packages_apps_Email-2fbd8c269c9e0c74b120e9d2ec498b0620b67c84.tar.bz2 android_packages_apps_Email-2fbd8c269c9e0c74b120e9d2ec498b0620b67c84.zip |
Merge "Add missing space in MIME header" into ub-mail-master
-rw-r--r-- | src/com/android/email/LegacyConversions.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/email/LegacyConversions.java b/src/com/android/email/LegacyConversions.java index 5736b9d1d..76f757634 100644 --- a/src/com/android/email/LegacyConversions.java +++ b/src/com/android/email/LegacyConversions.java @@ -475,8 +475,8 @@ public class LegacyConversions { final Base64Body body = new Base64Body(content); final MimeBodyPart bp = new MimeBodyPart(body, contentType); bp.setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64"); - bp.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, "attachment;\n" - + "filename=\"" + filename + "\";" + bp.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, "attachment;\n " + + (!TextUtils.isEmpty(filename) ? "filename=\"" + filename + "\";" : "") + "size=" + contentSize); if (contentId != null) { bp.setHeader(MimeHeader.HEADER_CONTENT_ID, contentId); |