From 3506cbf1eeb90a0a133e10de5d26ecabbb2c5835 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 22 Sep 2019 21:04:21 +0200 Subject: [PATCH] Fixed crash --- .../main/java/eu/faircode/email/EntityMessage.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java index 87aa7e428a..82039ea620 100644 --- a/app/src/main/java/eu/faircode/email/EntityMessage.java +++ b/app/src/main/java/eu/faircode/email/EntityMessage.java @@ -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
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]); }