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

Simplify reply self

This commit is contained in:
M66B 2020-07-22 07:36:17 +02:00
parent 0fbdc56769
commit 948d691892
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,8 +224,10 @@ public class EntityMessage implements Serializable {
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)) if (!replySelf(identities, account)) {
if (to != null)
addresses.addAll(Arrays.asList(to)); addresses.addAll(Arrays.asList(to));
}
if (cc != null) if (cc != null)
addresses.addAll(Arrays.asList(cc)); addresses.addAll(Arrays.asList(cc));

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

@ -3318,15 +3318,7 @@ public class FragmentCompose extends FragmentBase {
// Prevent replying to self // Prevent replying to self
if (ref.replySelf(data.identities, ref.account)) { if (ref.replySelf(data.identities, ref.account)) {
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 = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);