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

Ask send via

This commit is contained in:
M66B 2019-01-25 18:21:58 +00:00
parent e8e4e13878
commit 36a42bb989
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -804,6 +804,10 @@ public class FragmentCompose extends FragmentBase {
}
try {
EntityIdentity ident = (EntityIdentity) spIdentity.getSelectedItem();
if (ident == null)
throw new IllegalArgumentException(getString(R.string.title_from_missing));
String to = etTo.getText().toString();
InternetAddress ato[] = (TextUtils.isEmpty(to) ? new InternetAddress[0] : InternetAddress.parse(to));
if (ato.length == 0)
@ -813,7 +817,8 @@ public class FragmentCompose extends FragmentBase {
final TextView tvMessage = dview.findViewById(R.id.tvMessage);
final CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
tvMessage.setText(getString(R.string.title_ask_send, MessageHelper.formatAddressesShort(ato)));
tvMessage.setText(getString(R.string.title_ask_send_via,
MessageHelper.formatAddressesShort(ato), ident.email));
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setView(dview)

2
app/src/main/res/values/strings.xml
View File

@ -353,7 +353,7 @@
<string name="title_attachments_missing">Not all attachments are downloaded</string>
<string name="title_draft_deleted">Draft discarded</string>
<string name="title_draft_saved">Draft saved</string>
<string name="title_ask_send">Send message to %1$s?</string>
<string name="title_ask_send_via">Send message to %1$s via %2$s?</string>
<string name="title_queued">Sending message</string>
<string name="title_encrypt">Encrypt</string>