Merge branch 'master' into develop

This commit is contained in:
Mariotaku Lee 2017-11-15 14:29:30 +08:00
commit 1f066782dc
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
1 changed files with 1 additions and 1 deletions

View File

@ -1544,7 +1544,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
val (replyStartIndex, replyText, _, excludedMentions, replyToOriginalUser) =
replyTextAndMentions
if (replyText.isEmpty() && media.isEmpty()) throw NoContentException()
val totalLength = StatusTextValidator.calculateLength(accounts, summary, text)
val totalLength = StatusTextValidator.calculateLength(accounts, summary, replyText)
if (checkLength && !statusShortenerUsed && maxLength > 0 && totalLength > maxLength) {
val summaryLength = StatusTextValidator.calculateSummaryLength(accounts, summary)
if (summary != null && summaryLength > maxLength) {