Fix emoji completion over newlines bug.

signalapp · Aug 18, 2022 · 2740b5e · 2740b5e
1 parent a46faeb
commit 2740b5e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
@@ -426,7 +426,7 @@ private int findQueryStart(@NonNull CharSequence text, int inputCursorPosition,
     }
 
     int delimiterSearchIndex = inputCursorPosition - 1;
-    while (delimiterSearchIndex >= 0 && (text.charAt(delimiterSearchIndex) != starter && text.charAt(delimiterSearchIndex) != ' ')) {
+    while (delimiterSearchIndex >= 0 && (text.charAt(delimiterSearchIndex) != starter && !Character.isWhitespace(text.charAt(delimiterSearchIndex)))) {
       delimiterSearchIndex--;
     }
 

diff --git a/...g/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/...g/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
@@ -83,7 +83,6 @@ import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.ContextUtil
 import org.thoughtcrime.securesms.util.ExpirationUtil
 import org.thoughtcrime.securesms.util.FeatureFlags
-import org.thoughtcrime.securesms.util.IntentUtils
 import org.thoughtcrime.securesms.util.Material3OnScrollHelper
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate