From 6de0c334c74f0d3d0cbc461d537fc50ba5d98130 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 19 Dec 2013 22:28:23 +0000 Subject: [PATCH] Missed a method when replacing private messages with private groups. Unit tests would've caught this. --- .../src/net/sf/briar/db/JdbcDatabase.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java index 666607a8c..55a1f1994 100644 --- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java +++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java @@ -1673,25 +1673,7 @@ abstract class JdbcDatabase implements Database { PreparedStatement ps = null; ResultSet rs = null; try { - // Do we have any sendable private messages? String sql = "SELECT m.messageId FROM messages AS m" - + " JOIN statuses AS s" - + " ON m.messageId = s.messageId" - + " WHERE m.contactId = ? AND seen = FALSE AND expiry < ?" - + " ORDER BY timestamp DESC LIMIT ?"; - ps = txn.prepareStatement(sql); - ps.setInt(1, c.getInt()); - ps.setLong(2, now); - ps.setInt(3, maxMessages); - rs = ps.executeQuery(); - List ids = new ArrayList(); - while(rs.next()) ids.add(new MessageId(rs.getBytes(1))); - rs.close(); - ps.close(); - if(ids.size() == maxMessages) - return Collections.unmodifiableList(ids); - // Do we have any sendable group messages? - sql = "SELECT m.messageId FROM messages AS m" + " JOIN contactGroups AS cg" + " ON m.groupId = cg.groupId" + " JOIN groupVisibilities AS gv" @@ -1709,8 +1691,9 @@ abstract class JdbcDatabase implements Database { ps = txn.prepareStatement(sql); ps.setInt(1, c.getInt()); ps.setLong(2, now); - ps.setInt(3, maxMessages - ids.size()); + ps.setInt(3, maxMessages); rs = ps.executeQuery(); + List ids = new ArrayList(); while(rs.next()) ids.add(new MessageId(rs.getBytes(1))); rs.close(); ps.close();