moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

doc & comment updates from achen.code

This commit is contained in:
Jesse Vincent 2010-12-25 00:27:09 +00:00
parent c361c0e63c
commit f14c7ecd9b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -319,7 +319,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
* Discard will delete the message from the given folder. * Discard will delete the message from the given folder.
* @param context * @param context
* @param account * @param account
* @param folder
* @param message * @param message
*/ */
public static void actionEditDraft(Context context, Account account, Message message) public static void actionEditDraft(Context context, Account account, Message message)
@ -449,7 +448,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
if (savedInstanceState != null) if (savedInstanceState != null)
{ {
/* /*
* This data gets used in onCreate, so grab it here instead of onRestoreIntstanceState * This data gets used in onCreate, so grab it here instead of onRestoreInstanceState
*/ */
mSourceMessageProcessed = savedInstanceState.getBoolean(STATE_KEY_SOURCE_MESSAGE_PROCED, false); mSourceMessageProcessed = savedInstanceState.getBoolean(STATE_KEY_SOURCE_MESSAGE_PROCED, false);
} }

7
src/com/fsck/k9/activity/MessageView.java
View File

@ -2018,12 +2018,12 @@ public class MessageView extends K9Activity implements OnClickListener
return super.onPrepareOptionsMenu(menu); return super.onPrepareOptionsMenu(menu);
} }
// XXX when switching to API version 8, override onCreateDialog(int, Bundle) // TODO: when switching to API version 8, override onCreateDialog(int, Bundle)
/** /**
* @param id * @param id
* The id of the dialog. * The id of the dialog.
* @return The dialog. If you return null, the dialog will not be created. * @return The dialog. If you return null, the dialog will not be created.
* @see android.app.Activity#onCreateDialog(int, Bundle) * @see android.app.Activity#onCreateDialog(int)
*/ */
@Override @Override
protected Dialog onCreateDialog(final int id) protected Dialog onCreateDialog(final int id)
@ -2291,9 +2291,11 @@ public class MessageView extends K9Activity implements OnClickListener
} }
else else
{ {
// First try and fetch an HTML part.
Part part = MimeUtility.findFirstPartByMimeType(mMessage, "text/html"); Part part = MimeUtility.findFirstPartByMimeType(mMessage, "text/html");
if (part == null) if (part == null)
{ {
// If that fails, try and get a text part.
part = MimeUtility.findFirstPartByMimeType(mMessage, "text/plain"); part = MimeUtility.findFirstPartByMimeType(mMessage, "text/plain");
if (part == null) if (part == null)
{ {
@ -2314,6 +2316,7 @@ public class MessageView extends K9Activity implements OnClickListener
} }
else else
{ {
// We successfully found an HTML part; do the necessary character set decoding.
text = MimeUtility.getTextFromPart(part); text = MimeUtility.getTextFromPart(part);
} }
} }

2
src/com/fsck/k9/mail/internet/MimeUtility.java
View File

@ -1006,7 +1006,7 @@ public class MimeUtility
/** /**
* Reads the Part's body and returns a String based on any charset conversion that needed * Reads the Part's body and returns a String based on any charset conversion that needed
* to be done. * to be done. Note, this <b>does not</b> return a text representation of HTML.
* @param part The part containing a body * @param part The part containing a body
* @return a String containing the converted text in the body, or null if there was no text * @return a String containing the converted text in the body, or null if there was no text
* or an error during conversion. * or an error during conversion.