X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FUser.java;h=a2768de11feefa3903f2e26c6d1779eb9350a4f1;hb=72a723e511367907db01384564035f48f2cf4af6;hp=70b48d246660e7c96e59b8c09c1b1d36b7e01c1d;hpb=c33265cc8b9e8e8f86706a06c92d212780f43a0d;p=gigi.git

diff --git a/src/org/cacert/gigi/User.java b/src/org/cacert/gigi/User.java
index 70b48d24..a2768de1 100644
--- a/src/org/cacert/gigi/User.java
+++ b/src/org/cacert/gigi/User.java
@@ -246,7 +246,8 @@ public class User {
 
 	public EmailAddress[] getEmails() {
 		try {
-			PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM email WHERE memid=?");
+			PreparedStatement ps = DatabaseConnection.getInstance().prepare(
+				"SELECT id FROM email WHERE memid=? AND deleted=0");
 			ps.setInt(1, id);
 			ResultSet rs = ps.executeQuery();
 			rs.last();
@@ -296,10 +297,12 @@ public class User {
 			throw new GigiApiException("Can't delete user's default e-mail.");
 		}
 		try {
-			PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE email SET deleted=1 WHERE id=?");
-			ps.setInt(1, mail.getId());
+			PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE email SET deleted=? WHERE id=?");
+			ps.setDate(1, new Date(System.currentTimeMillis()));
+			ps.setInt(2, mail.getId());
 			ps.execute();
 		} catch (SQLException e) {
+			e.printStackTrace();
 			throw new GigiApiException(e);
 		}
 	}