thunderbird · wmontwe · Apr 3, 2025 · Mar 26, 2025
@@ -5,6 +5,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 import android.annotation.SuppressLint;
@@ -167,21 +168,33 @@ private void bindObjectView(Recipient recipient, View view) {
         holder.showCryptoState(isAvailable, showCryptoEnabled);
     }
 
-    @Override
-    protected Recipient defaultObject(String completionText) {
+    private List<Recipient> parseRecipients(String text) {
         try {
-            List<Address> parsedAddresses = emailAddressParser.parse(completionText);
+            List<Address> parsedAddresses = emailAddressParser.parse(text);
 
             if (parsedAddresses.isEmpty()) {
                 setError(getContext().getString(R.string.recipient_error_parse_failed));
-                return null;
+                return List.of();
             }
 
-            return new Recipient(parsedAddresses.get(0));
+            List<Recipient> recipients = new ArrayList<>();
+            for (Address a : parsedAddresses) {
+                recipients.add(new Recipient(a));
+            }
+            return recipients;
         } catch (NonAsciiEmailAddressException e) {
             setError(getContext().getString(R.string.recipient_error_non_ascii));
-            return null;
+            return List.of();
+        }
+    }
+
+    @Override
+    protected Recipient defaultObject(String completionText) {
+        List<Recipient> recipients = parseRecipients(completionText);
+        if (!recipients.isEmpty()) {
+            return recipients.get(0);
         }
+        return null;
     }
 
     public void setLoaderManager(@Nullable LoaderManager loaderManager) {
@@ -245,9 +258,12 @@ public void showDropDown() {
     @Override
     public void performCompletion() {
         if (getListSelection() == ListView.INVALID_POSITION && enoughToFilter()) {
-            Object recipientText = defaultObject(currentCompletionText());
-            if (recipientText != null) {
-                replaceText(convertSelectionToString(recipientText));
+            List<Recipient> recipients = parseRecipients(currentCompletionText());
+            if (!recipients.isEmpty()) {
+                clearCompletionText();
+                for (Recipient r : recipients) {
+                    addObjectSync(r);
+                }
             }
         } else {
             super.performCompletion();

@@ -145,7 +145,8 @@ public CharSequence filter(CharSequence source, int start, int end,
                 }
 
                 //Detect split characters, remove them and complete the current token instead
-                if (tokenizer.containsTokenTerminator(source)) {
+                // We only want to handle the case where the user inputs a single split character here
+                if (source.length() == 1 && tokenizer.containsTokenTerminator(source)) {
                     performCompletion();
                     return "";
                 }
@@ -392,16 +393,10 @@ private Range getCurrentCandidateTokenRange() {
                 candidateStringEnd = spanStart;
             }
         }
-
-        List<Range> tokenRanges = tokenizer.findTokenRanges(editable, candidateStringStart, candidateStringEnd);
-
-        for (Range range: tokenRanges) {
-            if (range.start <= cursorEndPosition && cursorEndPosition <= range.end) {
-                return range;
-            }
+        if (candidateStringEnd < candidateStringStart) {
+            return new Range(cursorEndPosition, cursorEndPosition);
         }
-
-        return new Range(cursorEndPosition, cursorEndPosition);
+        return new Range(candidateStringStart, candidateStringEnd);
     }
 
     /**