summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2014-05-19 15:05:07 -0700
committerTony Mantler <nicoya@google.com>2014-05-19 15:05:07 -0700
commit8b808216457189f7c74200eff0a3c84568608539 (patch)
tree2525134a6d724c31e4fbaed5b0c9ecb99696cff6 /src
parent81ff6fae02dde790910199af95b2f0fd35526726 (diff)
downloadandroid_packages_apps_Email-8b808216457189f7c74200eff0a3c84568608539.tar.gz
android_packages_apps_Email-8b808216457189f7c74200eff0a3c84568608539.tar.bz2
android_packages_apps_Email-8b808216457189f7c74200eff0a3c84568608539.zip
Add missing space in MIME header
Also skip adding the filename if none exists b/13138456 Change-Id: I2e3d82c2a560049cfc3fcd0130f4c6d8020757a2
Diffstat (limited to 'src')
-rw-r--r--src/com/android/email/LegacyConversions.java4
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);