clean up loose ends in SqliteMailbox

darcs-hash:20080301074723-5007d-a6f5ac86275a6f558454b3bc938af27573f6f3ef.gz

diff --git a/src/org/ibex/mail/SqliteMailbox.java b/src/org/ibex/mail/SqliteMailbox.java
index 5f23706..384dc4d 100644 (file)
--- a/src/org/ibex/mail/SqliteMailbox.java
+++ b/src/org/ibex/mail/SqliteMailbox.java
@@ -335,6 +335,7 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree {
                 int oldflags = rs.getInt("flags_");
                 if (oldflags==flags) return;
                 Log.info(this, "setflags (old="+oldflags+")" + "update mail set flags_="+(flags)+" where uid_="+uid()+"");
+                if ((flags & Mailbox.Flag.DELETED) != 0) Log.printStackTrace("deletion", Log.WARN);
                 PreparedStatement update = conn.prepareStatement("update mail set flags_=? where uid_=?");
                 update.setInt(1, flags);
                 update.setInt(2, uid());
@@ -353,11 +354,7 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree {
         }
         public int     imapNumber() {
             if ("".equals(whereClause)) return count;
-            try {
-                ResultSet rs = conn.prepareStatement("select count(*) from mail where uid_ <= " + uid()).executeQuery();
-                rs.next();
-                return rs.getInt(1);
-            } catch (Exception e) { throw new RuntimeException(e); }
+            try { return queryImapNumberCache(uid()); } catch (SQLException s) { throw new RuntimeException(s); }
         }
         public int     nntpNumber() { return uid(); }
         public void    delete()     {