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

Revert "Fixed reply to self"

Browse Source 
This reverts commit 98a058775b.
This commit is contained in:
M66B
2020-07-22 07:24:06 +02:00
parent cb147b960e
commit 0fbdc56769
3 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,36 +208,24 @@ public class EntityMessage implements Serializable {
return "<" + UUID.randomUUID() + "@" + domain + '>';
}
List<Address> replyOthers(List<TupleIdentityEx> identities, long account) {
List<Address> others = new ArrayList<>();
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) {
boolean self = false;
for (Address sender : senders)
for (TupleIdentityEx identity : identities)
if (identity.account == account &&
identity.self &&
identity.similarAddress(sender)) {
self = true;
break;
}
if (!self)
others.add(sender);
}
identity.similarAddress(sender))
return true;
return others;
return false;
}
Address[] getAllRecipients(List<TupleIdentityEx> identities, long account) {
List<Address> addresses = new ArrayList<>();
List<Address> others = replyOthers(identities, account);
if (others.size() > 0)
addresses.addAll(others);
else {
if (to != null)
addresses.addAll(Arrays.asList(to));
}
if (to != null && !replySelf(identities, account))
addresses.addAll(Arrays.asList(to));
if (cc != null)
addresses.addAll(Arrays.asList(cc));