Support customizing the "from" display name for generated emails

Change-Id: Ibad9e2b1c12a24ad9c671a0d96aafb3365daa529

1 files changed, 29 insertions, 3 deletions

diff --git a/src/main/java/com/gitblit/manager/NotificationManager.java b/src/main/java/com/gitblit/manager/NotificationManager.java
index a226d1a0..22ae5517 100644
--- a/src/main/java/com/gitblit/manager/NotificationManager.java
+++ b/src/main/java/com/gitblit/manager/NotificationManager.java
@@ -142,7 +142,20 @@ public class NotificationManager implements INotificationManager {
 	 */
 	@Override
 	public void sendHtmlMail(String subject, String message, Collection<String> toAddresses) {
-		this.sendHtmlMail(subject, message, toAddresses.toArray(new String[0]));
+		this.sendHtmlMail(null, subject, message, toAddresses.toArray(new String[0]));
+	}
+
+	/**
+	 * Notify users by email of something.
+	 *
+	 * @param from
+	 * @param subject
+	 * @param message
+	 * @param toAddresses
+	 */
+	@Override
+	public void sendHtmlMail(String from, String subject, String message, Collection<String> toAddresses) {
+		this.sendHtmlMail(from, subject, message, toAddresses.toArray(new String[0]));
 	}
 
 	/**
@@ -154,12 +167,25 @@ public class NotificationManager implements INotificationManager {
 	 */
 	@Override
 	public void sendHtmlMail(String subject, String message, String... toAddresses) {
+		this.sendHtmlMail(null, message, toAddresses);
+	}
+
+	/**
+	 * Notify users by email of something.
+	 *
+	 * @param from
+	 * @param subject
+	 * @param message
+	 * @param toAddresses
+	 */
+	@Override
+	public void sendHtmlMail(String from, String subject, String message, String... toAddresses) {
 		if (toAddresses == null || toAddresses.length == 0) {
-			logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
+			logger.debug("Dropping message {} because there are no recipients", subject);
 			return;
 		}
 		try {
-			Message mail = mailExecutor.createMessage(toAddresses);
+			Message mail = mailExecutor.createMessage(from, toAddresses);
 			if (mail != null) {
 				mail.setSubject(subject);