Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Mariotaku Lee 2017-11-15 14:29:30 +08:00
parent f99e08571b cc6eafd8a3
commit 1f066782dc
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
View File

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