Anything, even newline, can end an emoji search

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 3 
1 file changed, 2 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -1407,6 +1407,7 @@ public class ConversationFragment extends XmppFragment
         setupEmojiSearch();
         emojiPopup = new PopupWindow(emojiSearchBinding.getRoot(), WindowManager.LayoutParams.MATCH_PARENT, (int) (activity.getResources().getDisplayMetrics().density * 150));
         Handler emojiDebounce = new Handler(Looper.getMainLooper());
+        final Pattern notEmojiSearch = Pattern.compile("[^\\w\\(\\)\\+'\\-]");
         binding.textinput.addTextChangedListener(new TextWatcher() {
             @Override
             public void afterTextChanged(Editable s) {
@@ -1418,7 +1419,7 @@ public class ConversationFragment extends XmppFragment
                         return;
                     }
                     final String q = s.toString().substring(lastColon + 1);
-                    if (q.matches(".*[^\\w\\(\\)\\+'\\-].*")) {
+                    if (notEmojiSearch.matcher(q).find()) {
                         emojiPopup.dismiss();
                     } else {
                         EmojiSearch.EmojiSearchAdapter adapter = ((EmojiSearch.EmojiSearchAdapter) emojiSearchBinding.emoji.getAdapter());