Apply sender rule condition to from and reply-to

pull/194/merge
M66B 3 years ago
parent 9034c9360a
commit d0a5e3e1ea

@ -157,9 +157,13 @@ public class EntityRule {
boolean known = jsender.optBoolean("known"); boolean known = jsender.optBoolean("known");
boolean matches = false; boolean matches = false;
if (message.from != null) { List<Address> senders = new ArrayList<>();
for (Address from : message.from) { if (message.from != null)
InternetAddress ia = (InternetAddress) from; senders.addAll(Arrays.asList(message.from));
if (message.reply != null)
senders.addAll(Arrays.asList(message.reply));
for (Address sender : senders) {
InternetAddress ia = (InternetAddress) sender;
String email = ia.getAddress(); String email = ia.getAddress();
String personal = ia.getPersonal(); String personal = ia.getPersonal();
@ -190,7 +194,6 @@ public class EntityRule {
} }
} }
} }
}
if (!matches) if (!matches)
return false; return false;
} }

Loading…
Cancel
Save