StephanRichter/Widerhall
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

Merge branch 'main' into lang_de

Browse Source
This commit is contained in:
Stephan Richter
2022-04-24 16:39:31 +02:00
parent 691077bbb1 742dd673a9
commit 1ebb64eeaa
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/srsoftware/widerhall/data/MailingList.java
View File

@@ -88,7 +88,7 @@ public class MailingList implements MessageHandler, ProblemListener {
this.email = email; this.email = email;
this.name = name; this.name = name;
this.state = state; 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); this.imap = new ImapClient(imapHost,imapPort,imapUser,imapPass,inbox,this);
} }
@@ -722,7 +722,7 @@ public class MailingList implements MessageHandler, ProblemListener {
this.email = email; this.email = email;
} }
this.name = name; 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); imap = new ImapClient(imapHost,imapPort,imapUser,imapPass,inbox,this);
if (this.hasState(STATE_ENABLED)) imap.start().addListener(this); if (this.hasState(STATE_ENABLED)) imap.start().addListener(this);
} }

8
src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java
View File

@@ -1,5 +1,6 @@
package de.srsoftware.widerhall.mail; package de.srsoftware.widerhall.mail;
import com.sun.mail.imap.protocol.ENVELOPE;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -16,19 +17,21 @@ public class SmtpClient {
private static final String HOST = "mail.smtp.host"; private static final String HOST = "mail.smtp.host";
private static final String PORT = "mail.smtp.port"; private static final String PORT = "mail.smtp.port";
private static final String AUTH = "mail.smtp.auth"; 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 SSL = "mail.smtp.ssl.enable";
private static final String UTF8 = "UTF-8"; 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 final int port;
private boolean forwardUsingListAddress = true; private boolean forwardUsingListAddress = true;
private Session session; 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.username = username;
this.password = password; this.password = password;
this.host = host; this.host = host;
this.port = port; this.port = port;
this.from = envelopeFrom;
} }
@@ -87,6 +90,7 @@ public class SmtpClient {
props.put(PORT, port); props.put(PORT, port);
props.put(AUTH, true); props.put(AUTH, true);
props.put(SSL, true); props.put(SSL, true);
props.put(ENVELOPE_FROM,from);
session = Session.getInstance(props); session = Session.getInstance(props);
LOG.debug("Neue Session erzeugt: {}", session); LOG.debug("Neue Session erzeugt: {}", session);