ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Quit dropping inline attachments on the floor" into ub-mail-master

This commit is contained in:
Tony Mantler 2014-02-21 20:59:12 +00:00 committed by Android (Google) Code Review
parent c5685ba600 16fea4dfc0
commit da2582c9f4
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/email/LegacyConversions.java
View File

@ -21,6 +21,7 @@ import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.text.TextUtils;
import com.android.emailcommon.Logging;
import com.android.emailcommon.internet.MimeBodyPart;
@ -170,6 +171,18 @@ public class LegacyConversions {
}
}
public static void updateInlineAttachments(Context context, EmailContent.Message localMessage,
ArrayList<Part> inlineAttachments) throws MessagingException, IOException {
for (final Part inlinePart : inlineAttachments) {
final String disposition = MimeUtility.getHeaderParameter(
MimeUtility.unfoldAndDecode(inlinePart.getDisposition()), null);
if (!TextUtils.isEmpty(disposition)) {
// Treat inline parts as attachments
addOneAttachment(context, localMessage, inlinePart);
}
}
}
/**
* Add a single attachment part to the message
*

1
src/com/android/email/provider/Utilities.java
View File

@ -137,6 +137,7 @@ public class Utilities {
&& loadStatus != EmailContent.Message.FLAG_LOADED_UNKNOWN) {
// TODO(pwestbro): What should happen with unknown status?
LegacyConversions.updateAttachments(context, localMessage, attachments);
LegacyConversions.updateInlineAttachments(context, localMessage, viewables);
} else {
EmailContent.Attachment att = new EmailContent.Attachment();
// Since we haven't actually loaded the attachment, we're just putting