gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-15 08:45:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #159

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-03-05 21:49:53 +01:00
parent b35a1c0758
commit ccce05e164
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -370,7 +370,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { public void onTextChanged(CharSequence s, int start, int before, int count) {
if (s.length() == 1000) { if (s.length() == 1000) {
messageInput.setError(getResources().getString(R.string.nc_limit_hit)); messageInput.setError(Objects.requireNonNull(getResources()).getString(R.string.nc_limit_hit));
} else { } else {
messageInput.setError(null); messageInput.setError(null);
} }
@ -381,7 +381,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
for (int i = 0; i < mentionSpans.length; i++) { for (int i = 0; i < mentionSpans.length; i++) {
mentionSpan = mentionSpans[i]; mentionSpan = mentionSpans[i];
if (start >= editable.getSpanStart(mentionSpan) && start < editable.getSpanEnd(mentionSpan)) { if (start >= editable.getSpanStart(mentionSpan) && start < editable.getSpanEnd(mentionSpan)) {
editable.removeSpan(mentionSpan); if (!editable.subSequence(editable.getSpanStart(mentionSpan),
editable.getSpanEnd(mentionSpan)).toString().trim().equals(mentionSpan.getLabel())) {
editable.removeSpan(mentionSpan);
}
} }
} }
} }