chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

fix bug where sending toot is not possible despite it being below character limit

Browse source
This commit is contained in:
Conny Duck 2018-07-10 19:39:52 +02:00
commit e56386ea84
2 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View file

@ -772,7 +772,7 @@ public final class ComposeActivity
setStatusVisibility(visibility);
}
int calculateRemainingCharacters() {
int calculateTextLength() {
int offset = 0;
URLSpan[] urlSpans = textEditor.getUrls();
if (urlSpans != null) {
@ -780,15 +780,15 @@ public final class ComposeActivity
offset += Math.max(0, span.getURL().length() - MAXIMUM_URL_LENGTH);
}
}
int remaining = maximumTootCharacters - textEditor.length() + offset;
int length = textEditor.length() - offset;
if (statusHideText) {
remaining -= contentWarningEditor.length();
length += contentWarningEditor.length();
}
return remaining;
return length;
}
private void updateVisibleCharactersLeft() {
this.charactersLeft.setText(String.format(Locale.getDefault(), "%d", calculateRemainingCharacters()));
this.charactersLeft.setText(String.format(Locale.getDefault(), "%d", maximumTootCharacters - calculateTextLength()));
}
private void onContentWarningChanged() {
@ -925,15 +925,13 @@ public final class ComposeActivity
}
private void onReadySuccess(Status.Visibility visibility, boolean sensitive) {
/* Validate the status meets the character limit. This has to be delayed until after all
* uploads finish because their links are added when the upload succeeds and that affects
* whether the limit is met or not. */
/* Validate the status meets the character limit. */
String contentText = textEditor.getText().toString();
String spoilerText = "";
if (statusHideText) {
spoilerText = contentWarningEditor.getText().toString();
}
int characterCount = contentText.length() + spoilerText.length();
int characterCount = calculateTextLength();
if (characterCount <= 0 && mediaQueued.size()==0) {
textEditor.setError(getString(R.string.error_empty));
enableButtons();