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

Merge "Check for ArrayIndexOutOfBoundsException" into jb-ub-mail-ur10

This commit is contained in:
Yu Ping Hu 2013-11-13 17:32:14 +00:00 committed by Android (Google) Code Review
parent fabb15fafe cde694c5e1
commit 8fde9e27f8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
View File

@ -94,11 +94,16 @@ public class Rfc822Output {
return new String[2];
}
String[] messageBody = new String[] { body.mTextContent, body.mHtmlContent };
if (useSmartReply && body.mQuotedTextStartPos > 0) {
final int pos = body.mQuotedTextStartPos;
if (useSmartReply && pos > 0) {
if (messageBody[0] != null) {
messageBody[0] = messageBody[0].substring(0, body.mQuotedTextStartPos);
if (pos < messageBody[0].length()) {
messageBody[0] = messageBody[0].substring(0, pos);
}
} else if (messageBody[1] != null) {
messageBody[1] = messageBody[1].substring(0, body.mQuotedTextStartPos);
if (pos < messageBody[1].length()) {
messageBody[1] = messageBody[1].substring(0, pos);
}
}
}
return messageBody;