mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-04 06:20:26 +00:00
Code Issues Releases Wiki Activity

Insert linked email addresses

Browse source
This commit is contained in:
M66B 2022-06-02 09:08:18 +02:00
parent f3f0a8c08c
commit 4fe9f7e082
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java
View file

@ -248,9 +248,13 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
if (s < e) { if (s < e) {
start = s; start = s;
end = e; end = e;
Uri u = Uri.parse(edit.subSequence(start, end).toString()); String link = edit.subSequence(start, end).toString();
if (u.getScheme() != null) if (Helper.EMAIL_ADDRESS.matcher(link).matches())
uri = u; uri = Uri.parse("mailto:" + link);
else
uri = Uri.parse(link);
if (uri.getScheme() == null)
uri = null;
} }
} }
@ -260,9 +264,12 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
start = edit.getSpanStart(spans[0]); start = edit.getSpanStart(spans[0]);
end = edit.getSpanEnd(spans[0]); end = edit.getSpanEnd(spans[0]);
String url = spans[0].getURL(); String link = spans[0].getURL();
if (url != null) { if (link != null) {
uri = Uri.parse(url); if (Helper.EMAIL_ADDRESS.matcher(link).matches())
uri = Uri.parse("mailto:" + link);
else
uri = Uri.parse(link);
if (uri.getScheme() == null) if (uri.getScheme() == null)
uri = null; uri = null;
} }
@ -274,7 +281,10 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
ClipboardManager cbm = Helper.getSystemService(etBody.getContext(), ClipboardManager.class); ClipboardManager cbm = Helper.getSystemService(etBody.getContext(), ClipboardManager.class);
if (cbm != null && cbm.hasPrimaryClip()) { if (cbm != null && cbm.hasPrimaryClip()) {
String link = cbm.getPrimaryClip().getItemAt(0).coerceToText(etBody.getContext()).toString(); String link = cbm.getPrimaryClip().getItemAt(0).coerceToText(etBody.getContext()).toString();
uri = Uri.parse(link); if (Helper.EMAIL_ADDRESS.matcher(link).matches())
uri = Uri.parse("mailto:" + link);
else
uri = Uri.parse(link);
if (uri.getScheme() == null) if (uri.getScheme() == null)
uri = null; uri = null;
} }