diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java index e0d7150e58a5b3ac94b7296c983f7ffc81ab33e8..854fe74e733fb2fe66d3024f8ccf442d72c36cb1 100644 --- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java +++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java @@ -1275,8 +1275,8 @@ abstract class JdbcDatabase implements Database<Connection> { ResultSet rs = null; try { String sql = "SELECT messageId, parentId, m.authorId, authorName," - + " authorKey, contentType, subject, timestamp, read," - + " starred, rating" + + " authorKey, rating, contentType, subject, timestamp," + + " read, starred" + " FROM messages AS m" + " LEFT OUTER JOIN ratings AS r" + " ON m.authorId = r.authorId" @@ -1301,13 +1301,13 @@ abstract class JdbcDatabase implements Database<Connection> { String authorName = rs.getString(4); byte[] authorKey = rs.getBytes(5); author = new Author(authorId, authorName, authorKey); - rating = Rating.values()[rs.getByte(11)]; + rating = Rating.values()[rs.getByte(6)]; } - String contentType = rs.getString(6); - String subject = rs.getString(7); - long timestamp = rs.getLong(8); - boolean read = rs.getBoolean(9); - boolean starred = rs.getBoolean(10); + String contentType = rs.getString(7); + String subject = rs.getString(8); + long timestamp = rs.getLong(9); + boolean read = rs.getBoolean(10); + boolean starred = rs.getBoolean(11); headers.add(new GroupMessageHeader(id, parent, contentType, subject, timestamp, read, starred, g, author, rating)); }