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

Process identities per account

Browse Source
This commit is contained in:
M66B
2019-10-02 13:10:39 +02:00
parent fa47d2e23a
commit c380f7f683
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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