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

Fixed reply to self

This commit is contained in:
M66B 2020-07-21 22:31:37 +02:00
parent 2270dd78fa
commit 98a058775b
3 changed files with 30 additions and 24 deletions
Show Stats 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,24 +208,36 @@ public class EntityMessage implements Serializable {
return "<" + UUID.randomUUID() + "@" + domain + '>'; return "<" + UUID.randomUUID() + "@" + domain + '>';
} }
boolean replySelf(List<TupleIdentityEx> identities, long account) { List<Address> replyOthers(List<TupleIdentityEx> identities, long account) {
List<Address> others = new ArrayList<>();
Address[] senders = (reply == null || reply.length == 0 ? from : reply); Address[] senders = (reply == null || reply.length == 0 ? from : reply);
if (identities != null && senders != null) if (identities != null && senders != null)
for (Address sender : senders) for (Address sender : senders) {
boolean self = false;
for (TupleIdentityEx identity : identities) for (TupleIdentityEx identity : identities)
if (identity.account == account && if (identity.account == account &&
identity.self && identity.self &&
identity.similarAddress(sender)) identity.similarAddress(sender)) {
return true; self = true;
break;
}
if (!self)
others.add(sender);
}
return false; return others;
} }
Address[] getAllRecipients(List<TupleIdentityEx> identities, long account) { Address[] getAllRecipients(List<TupleIdentityEx> identities, long account) {
List<Address> addresses = new ArrayList<>(); List<Address> addresses = new ArrayList<>();
if (to != null && !replySelf(identities, account)) List<Address> others = replyOthers(identities, account);
addresses.addAll(Arrays.asList(to)); if (others.size() > 0)
addresses.addAll(others);
else {
if (to != null)
addresses.addAll(Arrays.asList(to));
}
if (cc != null) if (cc != null)
addresses.addAll(Arrays.asList(cc)); addresses.addAll(Arrays.asList(cc));

22
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -3151,8 +3151,11 @@ public class FragmentCompose extends FragmentBase {
break; break;
} }
Address[] refto = (ref == null ? null Address[] refto = null;
: ref.replySelf(data.identities, ref.account) ? ref.from : ref.to); if (ref != null) {
List<Address> others = ref.replyOthers(data.identities, ref.account);
refto = (others.size() == 0 ? ref.to : others.toArray(new Address[0]));
}
if (refto != null && refto.length > 0) { if (refto != null && refto.length > 0) {
if (selected == null) if (selected == null)
for (Address sender : refto) for (Address sender : refto)
@ -3316,20 +3319,13 @@ public class FragmentCompose extends FragmentBase {
data.draft.to = ref.receipt_to; data.draft.to = ref.receipt_to;
else { else {
// Prevent replying to self // Prevent replying to self
if (ref.replySelf(data.identities, ref.account)) { List<Address> others = ref.replyOthers(data.identities, ref.account);
if (others.size() == 0) {
data.draft.from = ref.from; data.draft.from = ref.from;
List<Address> tos = new ArrayList<>(); data.draft.to = ref.to;
if (ref.to != null)
for (Address to : ref.to)
for (EntityIdentity identity : data.identities)
if (!Objects.equals(identity.account, ref.account) ||
!identity.self ||
!identity.similarAddress(to))
tos.add(to);
data.draft.to = (tos.size() == 0 ? null : tos.toArray(new Address[0]));
} else { } else {
data.draft.from = ref.to; data.draft.from = ref.to;
data.draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply); data.draft.to = others.toArray(new Address[0]);
} }
if (data.draft.from != null && data.draft.from.length > 0) { if (data.draft.from != null && data.draft.from.length > 0) {

6
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -2193,10 +2193,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (data.identities == null) if (data.identities == null)
data.identities = new ArrayList<>(); data.identities = new ArrayList<>();
final Address[] to = List<Address> others = message.replyOthers(data.identities, message.account);
message.replySelf(data.identities, message.account) final Address[] to = (others.size() == 0 ? message.to : others.toArray(new Address[0]));
? message.to
: (message.reply == null || message.reply.length == 0 ? message.from : message.reply);
Address[] recipients = message.getAllRecipients(data.identities, message.account); Address[] recipients = message.getAllRecipients(data.identities, message.account);