Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix extremely long emoji search crash.

Browse Source
This commit is contained in:
Cody Henthorne
2024-04-23 12:28:18 -04:00
parent 9b5387e221
commit d561a1385c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
View File

@@ -57,9 +57,9 @@ import static org.thoughtcrime.securesms.database.MentionUtil.MENTION_STARTER;
public class ComposeText extends EmojiEditText { public class ComposeText extends EmojiEditText {
private static final char EMOJI_STARTER = ':'; private static final char EMOJI_STARTER = ':';
private static final int MAX_QUERY_LENGTH = 64;
private static final Pattern TIME_PATTERN = Pattern.compile("^[0-9]{1,2}:[0-9]{1,2}$"); private static final Pattern TIME_PATTERN = Pattern.compile("^[0-9]{1,2}:[0-9]{1,2}$");
private CharSequence hint; private CharSequence hint;
private MentionRendererDelegate mentionRendererDelegate; private MentionRendererDelegate mentionRendererDelegate;
@@ -370,7 +370,7 @@ public class ComposeText extends EmojiEditText {
} }
private void doAfterCursorChange(@NonNull Editable text) { private void doAfterCursorChange(@NonNull Editable text) {
if (enoughToFilter(text)) { if (canFilter(text)) {
performFiltering(text); performFiltering(text);
} else { } else {
clearInlineQuery(); clearInlineQuery();
@@ -398,12 +398,14 @@ public class ComposeText extends EmojiEditText {
} }
} }
private boolean enoughToFilter(@NonNull Editable text) { private boolean canFilter(@NonNull Editable text) {
int end = getSelectionEnd(); int end = getSelectionEnd();
if (end < 0) { if (end < 0) {
return false; return false;
} }
return findQueryStart(text, end).index != -1;
QueryStart start = findQueryStart(text, end);
return start.index != -1 && ((end - start.index) <= MAX_QUERY_LENGTH);
} }
public void replaceTextWithMention(@NonNull String displayName, @NonNull RecipientId recipientId) { public void replaceTextWithMention(@NonNull String displayName, @NonNull RecipientId recipientId) {