only take 1:1 conversations into account when determining catchup timestamp

This commit is contained in:
Daniel Gultsch 2017-03-08 20:54:13 +01:00
parent 8ca16a6f63
commit 9d043076e8

View file

@ -835,7 +835,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
Cursor cursor = null; Cursor cursor = null;
try { try {
SQLiteDatabase db = this.getReadableDatabase(); SQLiteDatabase db = this.getReadableDatabase();
String sql = "select messages.timeSent,messages.serverMsgId from accounts join conversations on accounts.uuid=conversations.accountUuid join messages on conversations.uuid=messages.conversationUuid where accounts.uuid=? and (messages.status=0 or messages.carbon=1 or messages.serverMsgId not null) order by messages.timesent desc limit 1"; String sql = "select messages.timeSent,messages.serverMsgId from accounts join conversations on accounts.uuid=conversations.accountUuid join messages on conversations.uuid=messages.conversationUuid where accounts.uuid=? and (messages.status=0 or messages.carbon=1 or messages.serverMsgId not null) and conversations.mode=0 order by messages.timesent desc limit 1";
String[] args = {account.getUuid()}; String[] args = {account.getUuid()};
cursor = db.rawQuery(sql, args); cursor = db.rawQuery(sql, args);
if (cursor.getCount() == 0) { if (cursor.getCount() == 0) {