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

Merge addresses

This commit is contained in:
M66B 2024-05-12 08:56:59 +02:00
parent 3a0083ad44
commit f2882193d7
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8784,20 +8784,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
addExtra(message.from, message.extra); addExtra(message.from, message.extra);
if (threading) { if (threading) {
List<Address> senders = new ArrayList<>(); message.senders = merge(message.from, message.senders);
if (message.from != null) message.recipients = merge(message.to, message.recipients);
senders.addAll(Arrays.asList(message.from));
if (message.senders != null)
senders.addAll(Arrays.asList(message.senders));
message.senders = senders.toArray(new Address[0]);
List<Address> recipients = new ArrayList<>();
if (message.to != null)
recipients.addAll(Arrays.asList(message.to));
if (message.recipients != null)
recipients.addAll(Arrays.asList(message.recipients));
message.recipients = recipients.toArray(new Address[0]);
addExtra(message.senders, message.extra); addExtra(message.senders, message.extra);
} else { } else {
message.senders = message.from; message.senders = message.from;
@ -8825,6 +8813,28 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}); });
} }
static Address[] merge(Address[] base, Address[] addresses) {
if (base == null || base.length == 0)
return (addresses == null ? new Address[0] : addresses);
if (addresses == null)
return base;
List<Address> result = new ArrayList<>();
result.addAll(Arrays.asList(base));
for (Address a : addresses)
for (Address b : base) {
if (a.equals(b)) {
if (a instanceof InternetAddress && b instanceof InternetAddress) {
if (Objects.equals(((InternetAddress) a).getPersonal(), ((InternetAddress) b).getPersonal()))
continue;
} else
continue;
}
result.add(a);
}
return result.toArray(new Address[0]);
}
static void addExtra(Address[] addresses, String extra) { static void addExtra(Address[] addresses, String extra) {
if (addresses == null || addresses.length == 0) if (addresses == null || addresses.length == 0)
return; return;