From 72a723e511367907db01384564035f48f2cf4af6 Mon Sep 17 00:00:00 2001
From: Janis Streib <janis@dogcraft.de>
Date: Fri, 25 Jul 2014 17:24:16 +0200
Subject: [PATCH] FIX: Correctly handle deleted mails

---
 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 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);
 		}
 	}
-- 
2.39.2