Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-07 17:43:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show extra in outbox

Browse Source
This commit is contained in:
M66B
2021-11-25 13:32:57 +01:00
parent aa166b20bd
commit 48c79c5a23
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -6590,6 +6590,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (message != null) {
keyPosition.put(message.id, i);
positionKey.put(i, message.id);
addExtra(message.from, message.extra);
addExtra(message.senders, message.extra);
message.resolveLabelColors(context);
message.resolveKeywordColors(context);
}
@@ -6611,6 +6613,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
});
}
static void addExtra(Address[] addresses, String extra) {
if (addresses == null || addresses.length == 0)
return;
if (extra == null)
return;
String email = ((InternetAddress) addresses[0]).getAddress();
if (email == null)
return;
email = MessageHelper.addExtra(email, extra);
((InternetAddress) addresses[0]).setAddress(email);
}
PagedList<TupleMessageEx> getCurrentList() {
return differ.getCurrentList();
}

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

@@ -566,15 +566,9 @@ public class MessageHelper {
if (identity != null && identity.sender_extra &&
email != null && message.extra != null) {
int at = email.indexOf('@');
String username = UriHelper.getEmailUser(identity.email);
if (at > 0 && !message.extra.equals(username)) {
if (message.extra.length() > 1 && message.extra.startsWith("+"))
email = email.substring(0, at) + message.extra + email.substring(at);
else if (message.extra.length() > 1 && message.extra.startsWith("@"))
email = email.substring(0, at) + message.extra + '.' + email.substring(at + 1);
else
email = message.extra + email.substring(at);
if (!message.extra.equals(username)) {
email = addExtra(email, message.extra);
if (!identity.sender_extra_name)
name = null;
@@ -589,6 +583,21 @@ public class MessageHelper {
return new InternetAddress(email, name, StandardCharsets.UTF_8.name());
}
static String addExtra(String email, String extra) {
int at = email.indexOf('@');
if (at < 0)
return email;
if (extra.length() > 1 && extra.startsWith("+"))
email = email.substring(0, at) + extra + email.substring(at);
else if (extra.length() > 1 && extra.startsWith("@"))
email = email.substring(0, at) + extra + '.' + email.substring(at + 1);
else
email = extra + email.substring(at);
return email;
}
private static void addAddress(String email, Message.RecipientType type, MimeMessage imessage, EntityIdentity identity) throws MessagingException {
List<Address> result = new ArrayList<>();