mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace email address

This commit is contained in:
M66B 2022-02-23 20:01:35 +01:00
parent c3df732a26
commit 8bc3eaa91e
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java
View File

@ -58,6 +58,7 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
private boolean dark;
private int colorAccent;
private ContextThemeWrapper ctx;
private Tokenizer tokenizer;
public EditTextMultiAutoComplete(@NonNull Context context) {
super(context);
@ -77,6 +78,9 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
private void init(Context context) {
Helper.setKeyboardIncognitoMode(this, context);
tokenizer = new CommaTokenizer();
setTokenizer(tokenizer);
prefs = PreferenceManager.getDefaultSharedPreferences(context);
dark = Helper.isDarkTheme(context);
colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
@ -182,6 +186,25 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
return super.onTouchEvent(event);
}
@Override
protected void replaceText(CharSequence text) {
clearComposingText();
Editable edit = getText();
int _end = getSelectionEnd();
int start = tokenizer.findTokenStart(edit, _end);
int end = tokenizer.findTokenEnd(edit, _end);
if (end < edit.length() && edit.charAt(end) == ',') {
end++;
while (end < edit.length() && edit.charAt(end) == ' ')
end++;
}
edit.replace(start, end, tokenizer.terminateToken(text));
setSelection(edit.length());
}
private final Runnable update = new Runnable() {
@Override
public void run() {

3
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -1186,9 +1186,6 @@ public class FragmentCompose extends FragmentBase {
etCc.setAdapter(cadapter);
etBcc.setAdapter(cadapter);
etTo.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer());
etCc.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer());
etBcc.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer());
grpAddresses.setVisibility(cc_bcc ? View.VISIBLE : View.GONE);
rvAttachment.setHasFixedSize(false);