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

Check self/cc using all identities

Browse Source
This commit is contained in:
M66B
2019-09-23 13:04:34 +02:00
parent cc15eda190
commit 1790a15fdf
3 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/eu/faircode/email/EntityMessage.java
View File

@@ -162,33 +162,34 @@ public class EntityMessage implements Serializable {
return "<" + UUID.randomUUID() + "@localhost" + '>';
}
boolean replySelf(EntityIdentity identity) {
if (identity == null)
return false;
Address[] senders = (reply == null || reply.length == 0 ? from : reply);
if (senders != null)
for (Address sender : senders)
if (identity.similarAddress(sender))
return true;
boolean replySelf(List<TupleIdentityEx> identities) {
if (identities != null) {
Address[] senders = (reply == null || reply.length == 0 ? from : reply);
if (senders != null)
for (Address sender : senders)
for (TupleIdentityEx identity : identities)
if (identity.similarAddress(sender))
return true;
}
return false;
}
Address[] getAllRecipients(EntityIdentity identity) {
Address[] getAllRecipients(List<TupleIdentityEx> identities) {
List<Address> addresses = new ArrayList<>();
if (to != null && !replySelf(identity))
if (to != null && !replySelf(identities))
addresses.addAll(Arrays.asList(to));
if (cc != null)
addresses.addAll(Arrays.asList(cc));
// Filter self
if (identity != null)
if (identities != null)
for (Address address : new ArrayList<>(addresses))
if (identity.similarAddress(address))
addresses.remove(address);
for (TupleIdentityEx identity : identities)
if (identity.similarAddress(address))
addresses.remove(address);
return addresses.toArray(new Address[0]);
}