Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 21:58:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Chip address separators

Browse Source
This commit is contained in:
M66B
2022-02-23 15:03:24 +01:00
parent f8388e95f7
commit 778d661419
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/eu/faircode/email/EditTextMultiAutoComplete.java
View File

@@ -179,7 +179,6 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
try {
final Context context = getContext();
final Editable edit = getText();
final int len = edit.length();
final boolean send_chips = prefs.getBoolean("send_chips", !BuildConfig.PLAY_STORE_RELEASE);
final boolean focus = hasFocus();
@@ -188,13 +187,13 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
boolean added = false;
List<ClipImageSpan> tbd = new ArrayList<>();
tbd.addAll(Arrays.asList(edit.getSpans(0, len, ClipImageSpan.class)));
tbd.addAll(Arrays.asList(edit.getSpans(0, edit.length(), ClipImageSpan.class)));
if (send_chips) {
int start = 0;
boolean space = true;
boolean quote = false;
for (int i = 0; i < len; i++) {
for (int i = 0; i < edit.length(); i++) {
char kar = edit.charAt(i);
if (space && kar == ' ') {
@@ -205,7 +204,7 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
if (kar == '"')
quote = !quote;
else if (!quote && (kar == ',' || (!focus && i + 1 == len))) {
else if (!quote && (kar == ',' || (!focus && i + 1 == edit.length()))) {
boolean found = false;
for (ClipImageSpan span : new ArrayList<>(tbd)) {
int s = edit.getSpanStart(span);
@@ -232,7 +231,9 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
}
if (parsed != null && parsed.length == 1) {
if (kar != ',')
if (kar == ' ')
edit.insert(i++, ",");
else if (kar != ',')
edit.insert(++i, ",");
Drawable avatar = null;
@@ -259,7 +260,8 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
ClipImageSpan is = new ClipImageSpan(cd);
edit.setSpan(is, start, i + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (i + 1 == len || edit.charAt(i + 1) != ' ')
if (kar == ',' &&
(i + 1 == edit.length() || edit.charAt(i + 1) != ' '))
edit.insert(++i, " ");
added = true;
}