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

Fixed crash

This commit is contained in:
M66B 2019-09-22 21:04:21 +02:00
parent 06e02b9879
commit 3506cbf1ee
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,8 +163,10 @@ public class EntityMessage implements Serializable {
}
boolean replySelf(String via) {
Address[] senders = (reply == null || reply.length == 0 ? from : reply);
if (via == null)
return false;
Address[] senders = (reply == null || reply.length == 0 ? from : reply);
if (senders != null)
for (Address sender : senders)
if (MessageHelper.similarAddress(sender, via))
@ -176,16 +178,17 @@ public class EntityMessage implements Serializable {
Address[] getAllRecipients(String via) {
List<Address> addresses = new ArrayList<>();
if (!replySelf(via) && to != null)
if (to != null && !replySelf(via))
addresses.addAll(Arrays.asList(to));
if (cc != null)
addresses.addAll(Arrays.asList(cc));
// Filter self
for (Address address : new ArrayList<>(addresses))
if (MessageHelper.similarAddress(address, via))
addresses.remove(address);
if (via != null)
for (Address address : new ArrayList<>(addresses))
if (MessageHelper.similarAddress(address, via))
addresses.remove(address);
return addresses.toArray(new Address[0]);
}