diff options
| author | James Moger <james.moger@gitblit.com> | 2013-11-26 16:26:44 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-12-30 16:53:58 -0500 |
| commit | afaab55bf4f309382b55793db44033233dcfb64d (patch) | |
| tree | fa14a1a5558647bbfac3666eccfab7286ee07ef5 /src/main/java/com/gitblit/service/MailService.java | |
| parent | 81c90eed7323c31c7e1134e2fb21aa7819d55a30 (diff) | |
| download | gitblit-afaab55bf4f309382b55793db44033233dcfb64d.tar.gz gitblit-afaab55bf4f309382b55793db44033233dcfb64d.zip | |
Support customizing the "from" display name for generated emails
Change-Id: Ibad9e2b1c12a24ad9c671a0d96aafb3365daa529
Diffstat (limited to 'src/main/java/com/gitblit/service/MailService.java')
| -rw-r--r-- | src/main/java/com/gitblit/service/MailService.java | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/service/MailService.java b/src/main/java/com/gitblit/service/MailService.java index 1d5e91f5..54b6c911 100644 --- a/src/main/java/com/gitblit/service/MailService.java +++ b/src/main/java/com/gitblit/service/MailService.java @@ -114,7 +114,6 @@ public class MailService implements Runnable { return session != null;
}
-
/**
* Create a message.
*
@@ -122,7 +121,7 @@ public class MailService implements Runnable { * @return a message
*/
public Message createMessage(String... toAddresses) {
- return createMessage(Arrays.asList(toAddresses));
+ return createMessage(null, Arrays.asList(toAddresses));
}
/**
@@ -132,13 +131,35 @@ public class MailService implements Runnable { * @return a message
*/
public Message createMessage(List<String> toAddresses) {
+ return createMessage(null, toAddresses);
+ }
+
+ /**
+ * Create a message.
+ *
+ * @param fromDisplayName
+ * @param toAddresses
+ * @return a message
+ */
+ public Message createMessage(String fromDisplayName, String... toAddresses) {
+ return createMessage(fromDisplayName, Arrays.asList(toAddresses));
+ }
+
+ /**
+ * Create a message.
+ *
+ * @param fromDisplayName
+ * @param toAddresses
+ * @return a message
+ */
+ public Message createMessage(String fromDisplayName, List<String> toAddresses) {
MimeMessage message = new MimeMessage(session);
try {
String fromAddress = settings.getString(Keys.mail.fromAddress, null);
if (StringUtils.isEmpty(fromAddress)) {
fromAddress = "gitblit@gitblit.com";
}
- InternetAddress from = new InternetAddress(fromAddress, "Gitblit");
+ InternetAddress from = new InternetAddress(fromAddress, fromDisplayName == null ? "Gitblit" : fromDisplayName);
message.setFrom(from);
// determine unique set of addresses
|