Only permit login to verified users. Fix in "TestEmailProvider"

[gigi.git] / src / org / cacert / gigi / email / TestEmailProvider.java

diff --git a/src/org/cacert/gigi/email/TestEmailProvider.java b/src/org/cacert/gigi/email/TestEmailProvider.java
index 9f37be97f3966bcb7091c1fa328eae5446de830f..009ecf930c134c508264dcd6ea8a503b6dfe7569 100644 (file)
--- a/src/org/cacert/gigi/email/TestEmailProvider.java
+++ b/src/org/cacert/gigi/email/TestEmailProvider.java
@@ -28,11 +28,7 @@ class TestEmailProvider extends EmailProvider {
                        String fromname, String errorsto, boolean extra) throws IOException {
                boolean sent = false;
                while (!sent) {
-                       if (client == null || client.isClosed()) {
-                               client = servs.accept();
-                               out = new DataOutputStream(client.getOutputStream());
-                               in = new DataInputStream(client.getInputStream());
-                       }
+                       assureLocalConnection();
                        try {
                                out.writeUTF("mail");
                                write(to);
@@ -47,9 +43,17 @@ class TestEmailProvider extends EmailProvider {
                        }
                }
        }
+       private void assureLocalConnection() throws IOException {
+               if (client == null || client.isClosed()) {
+                       client = servs.accept();
+                       out = new DataOutputStream(client.getOutputStream());
+                       in = new DataInputStream(client.getInputStream());
+               }
+       }
        @Override
        public String checkEmailServer(int forUid, String address)
                        throws IOException {
+               assureLocalConnection();
                out.writeUTF("challengeAddrBox");
                out.writeUTF(address);
                return in.readUTF();