garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

configurable "from" address (fix #664)

Browse Source
This commit is contained in:
Athou
2014-11-07 09:38:55 +01:00
parent 97c2cc3d15
commit c0557856a3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/CommaFeedConfiguration.java
View File

@@ -89,6 +89,8 @@ public class CommaFeedConfiguration extends Configuration {
private String smtpPassword; private String smtpPassword;
private String smtpFromAddress;
@NotNull @NotNull
private boolean heavyLoad; private boolean heavyLoad;

4
src/main/java/com/commafeed/backend/service/MailService.java
View File

@@ -17,6 +17,7 @@ import lombok.RequiredArgsConstructor;
import com.commafeed.CommaFeedConfiguration; import com.commafeed.CommaFeedConfiguration;
import com.commafeed.CommaFeedConfiguration.ApplicationSettings; import com.commafeed.CommaFeedConfiguration.ApplicationSettings;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
import com.google.common.base.Optional;
/** /**
* Mailing service * Mailing service
@@ -34,6 +35,7 @@ public class MailService {
final String username = settings.getSmtpUserName(); final String username = settings.getSmtpUserName();
final String password = settings.getSmtpPassword(); final String password = settings.getSmtpPassword();
final String fromAddress = Optional.fromNullable(settings.getSmtpFromAddress()).or(settings.getSmtpUserName());
String dest = user.getEmail(); String dest = user.getEmail();
@@ -51,7 +53,7 @@ public class MailService {
}); });
Message message = new MimeMessage(session); Message message = new MimeMessage(session);
message.setFrom(new InternetAddress(username, "CommaFeed")); message.setFrom(new InternetAddress(fromAddress, "CommaFeed"));
message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(dest)); message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(dest));
message.setSubject("CommaFeed - " + subject); message.setSubject("CommaFeed - " + subject);
message.setContent(content, "text/html; charset=utf-8"); message.setContent(content, "text/html; charset=utf-8");