UPD: Use gigiapiexceptions

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

diff --git a/src/org/cacert/gigi/User.java b/src/org/cacert/gigi/User.java
index 0eed2b8c501cfd93aa20754535a20f5e3464c66a..1dd150116d973e115ce3a3ad71edcc6b5a5ea323 100644 (file)
--- a/src/org/cacert/gigi/User.java
+++ b/src/org/cacert/gigi/User.java
@@ -268,11 +268,14 @@ public class User {
                return null;
        }
 
-       public void updateDefaultEmail(EmailAddress newMail) {
+       public void updateDefaultEmail(EmailAddress newMail) throws GigiApiException {
                try {
                        EmailAddress[] adrs = getEmails();
                        for (int i = 0; i < adrs.length; i++) {
                                if (adrs[i].getAddress().equals(newMail.getAddress())) {
+                                       if (!adrs[i].isVerified()) {
+                                               throw new GigiApiException("Email not verified.");
+                                       }
                                        PreparedStatement ps = DatabaseConnection.getInstance().prepare(
                                                "UPDATE users SET email=? WHERE id=?");
                                        ps.setString(1, newMail.getAddress());
@@ -282,22 +285,22 @@ public class User {
                                        return;
                                }
                        }
-                       throw new IllegalArgumentException("Given address not an address of the user.");
+                       throw new GigiApiException("Given address not an address of the user.");
                } catch (SQLException e) {
-                       e.printStackTrace();
+                       throw new GigiApiException(e);
                }
        }
 
-       public void deleteEmail(EmailAddress mail) {
+       public void deleteEmail(EmailAddress mail) throws GigiApiException {
                if (getEmail().equals(mail.getAddress())) {
-                       throw new IllegalArgumentException("Can't delete user's default e-mail.");
+                       throw new GigiApiException("Can't delete user's default e-mail.");
                }
                try {
                        PreparedStatement ps = DatabaseConnection.getInstance().prepare("DELETE FROM email WHERE id=?");
                        ps.setInt(1, mail.getId());
                        ps.execute();
                } catch (SQLException e) {
-                       e.printStackTrace();
+                       throw new GigiApiException(e);
                }
        }
 }