mirror of
https://github.com/M66B/FairEmail.git
synced 2026-01-02 19:10:11 +01:00
Fixed reply all (3)
This commit is contained in:
@@ -40,6 +40,7 @@ import java.util.Objects;
|
||||
import java.util.Random;
|
||||
|
||||
import javax.mail.Address;
|
||||
import javax.mail.internet.InternetAddress;
|
||||
|
||||
import static androidx.room.ForeignKey.CASCADE;
|
||||
import static androidx.room.ForeignKey.SET_NULL;
|
||||
@@ -159,16 +160,28 @@ public class EntityMessage implements Serializable {
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
Address[] getAll() {
|
||||
Address[] getAllRecipients(String via) {
|
||||
List<Address> addresses = new ArrayList<>();
|
||||
if (reply != null && reply.length > 0)
|
||||
addresses.addAll(Arrays.asList(reply));
|
||||
else if (to != null)
|
||||
addresses.addAll(Arrays.asList(to));
|
||||
|
||||
String r = null;
|
||||
Address[] replying = (reply == null || reply.length == 0 ? from : reply);
|
||||
if (replying != null && replying.length == 1)
|
||||
r = MessageHelper.canonicalAddress(((InternetAddress) replying[0]).getAddress());
|
||||
if (r == null && !r.equals(via)) {
|
||||
if (to != null)
|
||||
addresses.addAll(Arrays.asList(to));
|
||||
}
|
||||
|
||||
if (cc != null)
|
||||
addresses.addAll(Arrays.asList(cc));
|
||||
|
||||
// Filter self
|
||||
for (Address address : new ArrayList<>(addresses)) {
|
||||
String recipient = MessageHelper.canonicalAddress(((InternetAddress) address).getAddress());
|
||||
if (recipient.equals(via))
|
||||
addresses.remove(address);
|
||||
}
|
||||
|
||||
return addresses.toArray(new Address[0]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user