Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-02-01 20:46:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow selecting to show email addresses only

Browse Source
This commit is contained in:
M66B
2021-06-06 12:10:43 +02:00
parent 8c6a656567
commit d3880b906c
8 changed files with 87 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -1499,6 +1499,20 @@ public class MessageHelper {
}
}
enum AddressFormat {NAME_ONLY, EMAIL_ONLY, NAME_EMAIL}
static AddressFormat getAddressFormat(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean name_email = prefs.getBoolean("name_email", false);
int email_format = prefs.getInt("email_format", name_email
? MessageHelper.AddressFormat.NAME_EMAIL.ordinal()
: MessageHelper.AddressFormat.NAME_ONLY.ordinal());
if (email_format < MessageHelper.AddressFormat.values().length)
return MessageHelper.AddressFormat.values()[email_format];
else
return MessageHelper.AddressFormat.NAME_ONLY;
}
static String formatAddresses(Address[] addresses) {
return formatAddresses(addresses, true, false);
}
@@ -1515,6 +1529,10 @@ public class MessageHelper {
}
static String formatAddresses(Address[] addresses, boolean full, boolean compose) {
return formatAddresses(addresses, full ? AddressFormat.NAME_EMAIL : AddressFormat.NAME_ONLY, compose);
}
static String formatAddresses(Address[] addresses, AddressFormat format, boolean compose) {
if (addresses == null || addresses.length == 0)
return "";
@@ -1534,7 +1552,7 @@ public class MessageHelper {
String email = address.getAddress();
String personal = address.getPersonal();
if (TextUtils.isEmpty(personal))
if (TextUtils.isEmpty(personal) || format == AddressFormat.EMAIL_ONLY)
formatted.add(email);
else {
if (compose) {
@@ -1550,7 +1568,7 @@ public class MessageHelper {
personal = "\"" + personal + "\"";
}
if (full)
if (format == AddressFormat.NAME_EMAIL)
formatted.add(personal + " <" + email + ">");
else
formatted.add(personal);