From 02e694f55b0373de830100f2e4e450263ed21a4a Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 15 Mar 2021 18:53:07 +0100 Subject: [PATCH] Use name/email address option in send dialog --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 5 +++-- 1 file changed, 3 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 9ee956ed24..d5644e0317 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -5718,6 +5718,7 @@ public class FragmentCompose extends FragmentBase { final int send_delayed = prefs.getInt("send_delayed", 0); final boolean send_dialog = prefs.getBoolean("send_dialog", true); final boolean send_archive = prefs.getBoolean("send_archive", false); + final boolean name_email = prefs.getBoolean("name_email", false); final int[] encryptValues = getResources().getIntArray(R.array.encryptValues); final int[] sendDelayedValues = getResources().getIntArray(R.array.sendDelayedValues); @@ -6024,10 +6025,10 @@ public class FragmentCompose extends FragmentBase { Address[] tos = t.toArray(new Address[0]); if (extra == 0) - tvTo.setText(MessageHelper.formatAddressesShort(tos)); + tvTo.setText(MessageHelper.formatAddresses(tos, name_email, false)); else tvTo.setText(getString(R.string.title_name_plus, - MessageHelper.formatAddressesShort(tos), extra)); + MessageHelper.formatAddresses(tos, name_email, false), extra)); tvTo.setTextColor(Helper.resolveColor(context, to + extra > RECIPIENTS_WARNING ? R.attr.colorWarning : android.R.attr.textColorPrimary)); tvVia.setText(draft.identityEmail);