suumo-search

commit 36b9b50a2562214124c136243ae343e7d23907c4
parent fce717dac22fbdfc534d5359a82959c37cb97730
Author: Kebigon <git@kebigon.xyz>
Date:   Fri, 13 Mar 2020 20:42:41 +0900

Clean handling of from, to and bcc fields when sending e-mail(s)
Diffstat:
M
src/main/java/xyz/kebigon/housesearch/mail/EmailSender.java
 | 
19
+++++++++++++------

1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/xyz/kebigon/housesearch/mail/EmailSender.java b/src/main/java/xyz/kebigon/housesearch/mail/EmailSender.java
@@ -56,13 +56,20 @@ public class EmailSender
         email.setCharset("UTF-8");
         email.setMsg(content);
 
-        email.setFrom(mailSession.getProperty("housesearch.mail.to").trim());
-        for (final String address : mailSession.getProperty("housesearch.mail.to").split(","))
-            email.addTo(address.trim());
+        String from = mailSession.getProperty("housesearch.mail.from");
+        String to = mailSession.getProperty("housesearch.mail.to");
+        String bcc = mailSession.getProperty("housesearch.mail.bcc");
 
-        email.setFrom(mailSession.getProperty("housesearch.mail.bcc").trim());
-        for (final String address : mailSession.getProperty("housesearch.mail.bcc").split(","))
-            email.addBcc(address.trim());
+        if (from != null && !(from = from.trim()).isEmpty())
+            email.setFrom(from);
+
+        if (to != null && !(to = to.trim()).isEmpty())
+            for (final String address : mailSession.getProperty(to).split(","))
+                email.addTo(address.trim());
+
+        if (bcc != null && !(bcc = bcc.trim()).isEmpty())
+            for (final String address : bcc.split(","))
+                email.addBcc(address.trim());
 
         email.send();
     }