Factor Out sendmail (Abstraction for Email provider)

diff --git a/src/org/cacert/gigi/util/EmailChecker.java b/src/org/cacert/gigi/email/EmailChecker.java
similarity index 99%
rename from src/org/cacert/gigi/util/EmailChecker.java
rename to src/org/cacert/gigi/email/EmailChecker.java
index f1e8c3672f6ba1e81b5eeab3037e9d87ac42b405..7e18f68b35361f3c6b5c36aefa1a7b1e3c7fccf4 100644 (file)
--- a/src/org/cacert/gigi/util/EmailChecker.java
+++ b/src/org/cacert/gigi/email/EmailChecker.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package org.cacert.gigi.email;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java
new file mode 100644 (file)
index 0000000..1f23249
--- /dev/null
+++ b/src/org/cacert/gigi/email/EmailProvider.java
@@ -0,0 +1,13 @@
+package org.cacert.gigi.email;
+
+import java.io.IOException;
+
+public abstract class EmailProvider {
+       public abstract void sendmail(String to, String subject, String message,
+                       String from, String replyto, String toname, String fromname,
+                       String errorsto, boolean extra) throws IOException;
+       private static EmailProvider instance;
+       public static EmailProvider getInstance() {
+               return instance;
+       }
+}

diff --git a/src/org/cacert/gigi/util/Sendmail.java b/src/org/cacert/gigi/email/Sendmail.java
similarity index 98%
rename from src/org/cacert/gigi/util/Sendmail.java
rename to src/org/cacert/gigi/email/Sendmail.java
index 3333a11a17c738eda11e6f953ab5e723b858b3ab..f709169e4dd3185259f95398791169ffb01955c8 100644 (file)
--- a/src/org/cacert/gigi/util/Sendmail.java
+++ b/src/org/cacert/gigi/email/Sendmail.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package org.cacert.gigi.email;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -11,7 +11,7 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
-public class Sendmail {
+class Sendmail {
        private Sendmail() {
        }
        private static final Pattern NON_ASCII = Pattern

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index f4ba0c1b99e022677fb868fb5aaf8bf93df0a325..58203edf361554126a7de6ef6307c6da3d5bb198 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -16,15 +16,15 @@ import javax.servlet.http.HttpServletRequest;
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.email.EmailChecker;
+import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.Template;
 import org.cacert.gigi.pages.Page;
-import org.cacert.gigi.util.EmailChecker;
 import org.cacert.gigi.util.HTMLEncoder;
 import org.cacert.gigi.util.Notary;
 import org.cacert.gigi.util.PasswordStrengthChecker;
 import org.cacert.gigi.util.RandomToken;
-import org.cacert.gigi.util.Sendmail;
 import org.cacert.gigi.util.ServerConstants;
 
 public class Signup {
@@ -265,7 +265,7 @@ public class Signup {
                body.append("\n");
                body.append(Page.translate(req, "CAcert.org Support!"));
                try {
-                       Sendmail.sendmail(buildup.getEmail(),
+                       EmailProvider.getInstance().sendmail(buildup.getEmail(),
                                        "[CAcert.org] " + Page.translate(req, "Mail Probe"),
                                        body.toString(), "support@cacert.org", null, null, null,
                                        null, false);