From e7d86f1ac66e3c7a8d0c95c3cf4abc5d49c9e68a Mon Sep 17 00:00:00 2001 From: Janis Streib Date: Fri, 25 Jul 2014 01:56:36 +0200 Subject: [PATCH] UPD: Check, if a mail is verified before setting it as default --- src/org/cacert/gigi/User.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/org/cacert/gigi/User.java b/src/org/cacert/gigi/User.java index 0eed2b8c..0e1ee22c 100644 --- 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,9 +285,9 @@ 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); } } -- 2.39.2