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

Confirm send plus

This commit is contained in:
M66B 2019-03-08 09:49:44 +00:00
parent c4e6c3f27f
commit 43077578f2
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -989,7 +989,22 @@ public class FragmentCompose extends FragmentBase {
throw new IllegalArgumentException(getString(R.string.title_from_missing)); throw new IllegalArgumentException(getString(R.string.title_from_missing));
String to = etTo.getText().toString(); String to = etTo.getText().toString();
InternetAddress ato[] = (TextUtils.isEmpty(to) ? new InternetAddress[0] : InternetAddress.parse(to)); String cc = etCc.getText().toString();
String bcc = etBcc.getText().toString();
InternetAddress ato[] = new InternetAddress[0];
InternetAddress acc[] = new InternetAddress[0];
InternetAddress abcc[] = new InternetAddress[0];
if (!TextUtils.isEmpty(to))
ato = InternetAddress.parse(to);
if (!TextUtils.isEmpty(cc))
acc = InternetAddress.parse(cc);
if (!TextUtils.isEmpty(bcc))
abcc = InternetAddress.parse(bcc);
if (ato.length == 0) if (ato.length == 0)
throw new IllegalArgumentException(getString(R.string.title_to_missing)); throw new IllegalArgumentException(getString(R.string.title_to_missing));
@ -997,8 +1012,10 @@ public class FragmentCompose extends FragmentBase {
final TextView tvMessage = dview.findViewById(R.id.tvMessage); final TextView tvMessage = dview.findViewById(R.id.tvMessage);
final CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain); final CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
int plus = acc.length + abcc.length;
tvMessage.setText(getString(R.string.title_ask_send_via, tvMessage.setText(getString(R.string.title_ask_send_via,
MessageHelper.formatAddressesShort(ato), ident.email)); MessageHelper.formatAddressesShort(ato) + (plus > 0 ? " +" + plus : ""), ident.email));
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner()) new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setView(dview) .setView(dview)