am 8fde9e27: Merge "Check for ArrayIndexOutOfBoundsException" into jb-ub-mail-ur10

* commit '8fde9e27f86ec00e52dcecdd76ee276a4244a2f4':
  Check for ArrayIndexOutOfBoundsException
This commit is contained in:
Yu Ping Hu 2013-11-13 09:35:48 -08:00 committed by Android Git Automerger
commit 2d19b5d08f

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;