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

am 3a56fec8: am 37aa2744: am 85d718cb: MessageCompose: quote plain-text body if available, otherwise quote HTML body.

Browse Source 
Merge commit '3a56fec872c7f65c0491402d9c6697859aec1d9f'

* commit '3a56fec872c7f65c0491402d9c6697859aec1d9f':
  MessageCompose: quote plain-text body if available, otherwise quote HTML body.
This commit is contained in:
Mihai Preda 2009-10-12 11:45:49 -07:00 committed by Android Git Automerger
commit 562912b4b6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/email/activity/MessageCompose.java
View File

@ -1235,7 +1235,11 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
// used by processSourceMessage()
private void displayQuotedText(String textBody, String htmlBody) {
boolean plainTextFlag = htmlBody == null;
/* Use plain-text body if available, otherwise use HTML body.
* This matches the desired behavior for IMAP/POP where we only send plain-text,
* and for EAS which sends HTML and has no plain-text body.
*/
boolean plainTextFlag = textBody != null;
String text = plainTextFlag ? textBody : htmlBody;
if (text != null) {
text = plainTextFlag ? EmailHtmlUtil.escapeCharacterToDisplay(text) : text;