moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-24 02:12:15 -05:00
Code Issues Releases Wiki Activity

Simplify getTextForDisplay() and fix a potential ClassCastException

Browse Source
This commit is contained in:
Jan Berkel 2011-02-19 16:35:11 +01:00 committed by Jesse Vincent
parent 685df0ff67
commit a7a690e6ff
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2928,24 +2928,17 @@ public class LocalStore extends Store implements Serializable {
/** /**
* Fetch the message text for display. This always returns an HTML-ified version of the * Fetch the message text for display. This always returns an HTML-ified version of the
* message, even if it was originally a text-only message. * message, even if it was originally a text-only message.
* @return HTML version of message for display purposes. * @return HTML version of message for display purposes or null.
* @throws MessagingException * @throws MessagingException
*/ */
public String getTextForDisplay() throws MessagingException { public String getTextForDisplay() throws MessagingException {
String text; // First try and fetch an HTML part. String text = null; // First try and fetch an HTML part.
Part part = MimeUtility.findFirstPartByMimeType(this, "text/html"); Part part = MimeUtility.findFirstPartByMimeType(this, "text/html");
if (part == null) { if (part == null) {
// If that fails, try and get a text part. // If that fails, try and get a text part.
part = MimeUtility.findFirstPartByMimeType(this, "text/plain"); part = MimeUtility.findFirstPartByMimeType(this, "text/plain");
if (part == null) { if (part != null && part.getBody() instanceof LocalStore.LocalTextBody) {
text = null; text = ((LocalStore.LocalTextBody) part.getBody()).getBodyForDisplay();
} else {
LocalStore.LocalTextBody body = (LocalStore.LocalTextBody) part.getBody();
if (body == null) {
text = null;
} else {
text = body.getBodyForDisplay();
}
} }
} else { } else {
// We successfully found an HTML part; do the necessary character set decoding. // We successfully found an HTML part; do the necessary character set decoding.