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

Merge change 26015 into eclair

Browse Source 
* changes:
  Handle issues in SmartReply/SmartForward
This commit is contained in:
Android (Google) Code Review 2009-09-21 01:04:51 -04:00
commit c190de8369
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/email/mail/transport/Rfc822Output.java
View File

@ -65,9 +65,22 @@ public class Rfc822Output {
if (body == null) { if (body == null) {
return null; return null;
} }
String text = body.mTextContent; String text = body.mTextContent;
String fromAsString = Address.unpackToString(message.mFrom);
int flags = message.mFlags;
if (!appendQuotedText) { if (!appendQuotedText) {
// appendQuotedText is set to false for use by SmartReply/SmartForward in EAS.
// SmartReply doesn't appear to work properly, so we will still add the header into
// to the original message.
// SmartForward doesn't put any kind of break between the original and the new text,
// so we add a CRLF
if ((flags & Message.FLAG_TYPE_REPLY) != 0) {
text += context.getString(R.string.message_compose_reply_header_fmt, fromAsString);
} else {
text += "\r\n";
}
return text; return text;
} }
@ -77,8 +90,6 @@ public class Rfc822Output {
Matcher matcher = PATTERN_ENDLINE_CRLF.matcher(quotedText); Matcher matcher = PATTERN_ENDLINE_CRLF.matcher(quotedText);
quotedText = matcher.replaceAll("\n"); quotedText = matcher.replaceAll("\n");
} }
String fromAsString = Address.unpackToString(message.mFrom);
int flags = message.mFlags;
if ((flags & Message.FLAG_TYPE_REPLY) != 0) { if ((flags & Message.FLAG_TYPE_REPLY) != 0) {
text += context.getString(R.string.message_compose_reply_header_fmt, fromAsString); text += context.getString(R.string.message_compose_reply_header_fmt, fromAsString);
if (quotedText != null) { if (quotedText != null) {