diff --git a/pom.xml b/pom.xml index d9d5e9b..75d7279 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.example Widerhall - 0.2.44 + 0.2.45 diff --git a/src/main/java/de/srsoftware/widerhall/data/MailingList.java b/src/main/java/de/srsoftware/widerhall/data/MailingList.java index b6e6a85..5ca0dc8 100644 --- a/src/main/java/de/srsoftware/widerhall/data/MailingList.java +++ b/src/main/java/de/srsoftware/widerhall/data/MailingList.java @@ -87,7 +87,7 @@ public class MailingList implements MessageHandler, ProblemListener { this.email = email; this.name = name; this.state = state; - this.smtp = new SmtpClient(smtpHost,smtpPort,smtpUser,smtpPass); + this.smtp = new SmtpClient(smtpHost,smtpPort,smtpUser,smtpPass,email); this.imap = new ImapClient(imapHost,imapPort,imapUser,imapPass,inbox,this); } @@ -721,7 +721,7 @@ public class MailingList implements MessageHandler, ProblemListener { this.email = email; } this.name = name; - smtp = new SmtpClient(smtpHost,smtpPort,smtpUser,smtpPass); + smtp = new SmtpClient(smtpHost,smtpPort,smtpUser,smtpPass,email); imap = new ImapClient(imapHost,imapPort,imapUser,imapPass,inbox,this); if (this.hasState(STATE_ENABLED)) imap.start().addListener(this); } diff --git a/src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java b/src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java index 670d3df..71c01cd 100644 --- a/src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java +++ b/src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java @@ -1,5 +1,6 @@ package de.srsoftware.widerhall.mail; +import com.sun.mail.imap.protocol.ENVELOPE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,19 +16,21 @@ public class SmtpClient { private static final String HOST = "mail.smtp.host"; private static final String PORT = "mail.smtp.port"; private static final String AUTH = "mail.smtp.auth"; + private static final String ENVELOPE_FROM = "mail.smtp.from"; private static final String SSL = "mail.smtp.ssl.enable"; private static final String UTF8 = "UTF-8"; - private final String host,password,username; + private final String host,password,username,from; private final int port; private boolean forwardUsingListAddress = true; private Session session; - public SmtpClient(String host, int port, String username, String password){ + public SmtpClient(String host, int port, String username, String password, String envelopeFrom){ this.username = username; this.password = password; this.host = host; this.port = port; + this.from = envelopeFrom; } @@ -86,6 +89,7 @@ public class SmtpClient { props.put(PORT, port); props.put(AUTH, true); props.put(SSL, true); + props.put(ENVELOPE_FROM,from); session = Session.getInstance(props); LOG.debug("Created new session: {}", session);