Merge remote-tracking branch 'origin/emailMgmt'

[gigi.git] / src / org / cacert / gigi / EmailAddress.java

diff --git a/src/org/cacert/gigi/EmailAddress.java b/src/org/cacert/gigi/EmailAddress.java
index feb65915cd1397404683834fb3563273252f1f14..a2a7e5801d8566ef88b5c7fd59840650a77204d1 100644 (file)
--- a/src/org/cacert/gigi/EmailAddress.java
+++ b/src/org/cacert/gigi/EmailAddress.java
@@ -33,6 +33,9 @@ public class EmailAddress {
        }
 
        public EmailAddress(String address, User owner) {
+               if (!EmailProvider.MAIL.matcher(address).matches()) {
+                       throw new IllegalArgumentException("Invalid email.");
+               }
                this.address = address;
                this.owner = owner;
                this.hash = RandomToken.generateToken(16);
@@ -96,6 +99,7 @@ public class EmailAddress {
                                ps2.setInt(1, owner.getId());
                                ps2.setString(2, address);
                                ps2.execute();
+                               this.hash = "";
                        } catch (SQLException e) {
                                throw new GigiApiException(e);
                        }
@@ -114,4 +118,8 @@ public class EmailAddress {
                        throw new IllegalArgumentException(e);
                }
        }
+
+       public boolean isVerified() {
+               return hash.isEmpty();
+       }
 }