From 36a42bb98974b701652e431f10ff13971cb7dd86 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 25 Jan 2019 18:21:58 +0000
Subject: [PATCH] Ask send via

---
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 7 ++++++-
 app/src/main/res/values/strings.xml                      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 05c844adbb..06c1b8d5b5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -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)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f9b91fbaaa..6f575d483b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>