moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 21:22:26 -05:00
Code Issues Releases Wiki Activity

Fixes issue 305

Browse Source 
Support Content-Id header to show inline images.
This commit is contained in:
Koji Arai 2010-07-11 13:44:16 +00:00
parent df7cfdc3cf
commit 28d3967d0f
5 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/fsck/k9/mail/Part.java
View File

@ -18,6 +18,8 @@ public interface Part
public String getDisposition() throws MessagingException; public String getDisposition() throws MessagingException;
public String getContentId() throws MessagingException;
public String[] getHeader(String name) throws MessagingException; public String[] getHeader(String name) throws MessagingException;
public int getSize() throws MessagingException; public int getSize() throws MessagingException;

20
src/com/fsck/k9/mail/internet/MimeBodyPart.java
View File

@ -117,6 +117,26 @@ public class MimeBodyPart extends BodyPart
} }
} }
public String getContentId() throws MessagingException
{
String contentId = getFirstHeader(MimeHeader.HEADER_CONTENT_ID);
if (contentId == null)
{
return null;
}
else
{
int first = contentId.indexOf('<');
int last = contentId.lastIndexOf('>');
if (first != -1 && last != -1) {
return contentId.substring(first+1, last);
}
else {
return contentId;
}
}
}
public String getMimeType() throws MessagingException public String getMimeType() throws MessagingException
{ {
return MimeUtility.getHeaderParameter(getContentType(), null); return MimeUtility.getHeaderParameter(getContentType(), null);

1
src/com/fsck/k9/mail/internet/MimeHeader.java
View File

@ -25,6 +25,7 @@ public class MimeHeader
public static final String HEADER_CONTENT_TYPE = "Content-Type"; public static final String HEADER_CONTENT_TYPE = "Content-Type";
public static final String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding"; public static final String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
public static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition"; public static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition";
public static final String HEADER_CONTENT_ID = "Content-ID";
/** /**
* Fields that should be omitted when writing the header using writeTo() * Fields that should be omitted when writing the header using writeTo()

5
src/com/fsck/k9/mail/internet/MimeMessage.java
View File

@ -150,7 +150,10 @@ public class MimeMessage extends Message
return contentDisposition; return contentDisposition;
} }
} }
public String getContentId() throws MessagingException
{
return null;
}
public String getMimeType() throws MessagingException public String getMimeType() throws MessagingException
{ {
return MimeUtility.getHeaderParameter(getContentType(), null); return MimeUtility.getHeaderParameter(getContentType(), null);

38
src/com/fsck/k9/mail/store/LocalStore.java
View File

@ -2015,6 +2015,8 @@ public class LocalStore extends Store implements Serializable
MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA), ','); MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA), ',');
String name = MimeUtility.getHeaderParameter(attachment.getContentType(), "name"); String name = MimeUtility.getHeaderParameter(attachment.getContentType(), "name");
String contentId = MimeUtility.getHeaderParameter(attachment.getContentId(), null);
String contentDisposition = MimeUtility.unfoldAndDecode(attachment.getDisposition()); String contentDisposition = MimeUtility.unfoldAndDecode(attachment.getDisposition());
if (name == null && contentDisposition != null) if (name == null && contentDisposition != null)
{ {
@ -2044,7 +2046,7 @@ public class LocalStore extends Store implements Serializable
new String[] { Long.toString(attachmentId) }); new String[] { Long.toString(attachmentId) });
} }
if (tempAttachmentFile != null) if (attachmentId != -1 && tempAttachmentFile != null)
{ {
File attachmentFile = new File(mAttachmentsDir, Long.toString(attachmentId)); File attachmentFile = new File(mAttachmentsDir, Long.toString(attachmentId));
tempAttachmentFile.renameTo(attachmentFile); tempAttachmentFile.renameTo(attachmentFile);
@ -2061,7 +2063,30 @@ public class LocalStore extends Store implements Serializable
new String[] { Long.toString(attachmentId) }); new String[] { Long.toString(attachmentId) });
} }
if (attachment instanceof LocalAttachmentBodyPart) /* The message has attachment with Content-ID */
if (contentId != null && contentUri != null)
{
Cursor cursor = null;
cursor = mDb.query("messages", new String[] { "html_content" }, "id = ?", new String[] { Long.toString(messageId) }, null, null, null);
try {
if (cursor.moveToNext())
{
String new_html;
new_html = cursor.getString(0);
new_html = new_html.replaceAll("cid:" + contentId, contentUri.toString());
ContentValues cv = new ContentValues();
cv.put("html_content", new_html);
mDb.update("messages", cv, "id = ?", new String[] { Long.toString(messageId) });
}
}
finally {
if (cursor != null) { cursor.close(); }
}
}
if (attachmentId != -1 && attachment instanceof LocalAttachmentBodyPart)
{ {
((LocalAttachmentBodyPart) attachment).setAttachmentId(attachmentId); ((LocalAttachmentBodyPart) attachment).setAttachmentId(attachmentId);
} }
@ -2290,14 +2315,7 @@ public class LocalStore extends Store implements Serializable
html = htmlifyString(text); html = htmlifyString(text);
} }
if (html.indexOf("cid:") != -1) return html;
{
return html.replaceAll("cid:", "http://cid/");
}
else
{
return html;
}
} }
public String htmlifyString(String text) public String htmlifyString(String text)