From 4e84166db5c5538e3984d9d2d6bb1f9902e65ee0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 04 Nov 2014 17:38:17 -0500
Subject: [PATCH] Merged #217 "Exclude SSLv3 from Gitblit GO https protocols"

---
 src/main/java/com/gitblit/manager/INotificationManager.java |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/gitblit/manager/INotificationManager.java b/src/main/java/com/gitblit/manager/INotificationManager.java
index f53ae68..64fc01e 100644
--- a/src/main/java/com/gitblit/manager/INotificationManager.java
+++ b/src/main/java/com/gitblit/manager/INotificationManager.java
@@ -17,13 +17,24 @@
 
 import java.util.Collection;
 
-public interface INotificationManager {
+import com.gitblit.models.Mailing;
+
+public interface INotificationManager extends IManager {
+
+	/**
+	 * Returns true if the email service is configured and ready to send notifications.
+	 *
+	 * @return true if the email service is operational
+	 * @since 1.6.0
+	 */
+	boolean isSendingMail();
 
 	/**
 	 * Notify the administrators by email.
 	 *
 	 * @param subject
 	 * @param message
+ 	 * @since 1.4.0
 	 */
 	void sendMailToAdministrators(String subject, String message);
 
@@ -33,6 +44,7 @@
 	 * @param subject
 	 * @param message
 	 * @param toAddresses
+ 	 * @since 1.4.0
 	 */
 	void sendMail(String subject, String message, Collection<String> toAddresses);
 
@@ -42,25 +54,17 @@
 	 * @param subject
 	 * @param message
 	 * @param toAddresses
-	 */
-	void sendMail(String subject, String message, String... toAddresses);
-
-	/**
-	 * Notify users by email of something.
-	 *
-	 * @param subject
-	 * @param message
-	 * @param toAddresses
+ 	 * @since 1.4.0
 	 */
 	void sendHtmlMail(String subject, String message, Collection<String> toAddresses);
 
 	/**
 	 * Notify users by email of something.
 	 *
-	 * @param subject
-	 * @param message
-	 * @param toAddresses
+	 * @param mailing
+	 * @return the mail message object
+ 	 * @since 1.4.0
 	 */
-	void sendHtmlMail(String subject, String message, String... toAddresses);
+	void send(Mailing mailing);
 
 }
\ No newline at end of file

--
Gitblit v1.9.1