Merge lp:~libqtelegram-team/telegram-app/dialog-bad-dates into lp:telegram-app/dev

[Roberto Mier Escandon]

Changed condition to update dialogs date when inserted a messages. Not in all cases that is inserted a message the dialog date must be updated (for instance, when db is empty, on first app start, a lot of messages are inserted when history is requested)

Steps to reproduce the bug were:
- Start app up
- Enter into a dialog
- Restart app

Expected result:
- Dialogs are shown in same order and with same dates as first start

Result:
- Dialog where entered (and requested its history) has a bad date and is in bad position in list

[Giulio Collura (gcollura)]

The code is fine and the issue is gone too. Thanks Roberto!

review: Approve

=== modified file 'qmlplugin/data.cpp'
--- qmlplugin/data.cpp	2014-12-18 07:49:09 +0000
+++ qmlplugin/data.cpp	2014-12-18 13:11:41 +0000
@@ -3091,7 +3091,7 @@
 
     QSqlQuery query(mDbManager.database());
 
-    query.prepare("SELECT id FROM dialogs WHERE id=:id");
+    query.prepare("SELECT id, date FROM dialogs WHERE id=:id");
     query.bindValue(":id", dialogId);
 
     if (!query.exec()) {
@@ -3114,20 +3114,27 @@
             return false;
         }
     } else {
-        // dialog already exists, update its date and increase unread count if needed.
-        QString arg1 = mustIncreaseUnreadCount ? "unreadCount=unreadCount+1," : "";
-        QString sql = QString("UPDATE dialogs SET %1 date=:date WHERE id=:id").arg(arg1);
-
-        query.prepare(sql);
-        query.bindValue(":id", dialogId);
-        query.bindValue(":date", message.date());
-
-        if (!query.exec()) {
-            qCCritical(TG_PLUGIN_LOGIC) << "Error:" << query.lastError() << query.lastQuery();
-            mDbManager.rollbackTransaction();
-            return false;
+        qint32 dialogDate = query.value("date").toInt();
+        bool mustUpdateDate = message.date() > dialogDate;
+
+        if (mustIncreaseUnreadCount || mustUpdateDate) {
+            // dialog already exists, update its date and increase unread count if needed.
+            QString arg1 = mustIncreaseUnreadCount ? "unreadCount=unreadCount+1," : "";
+            QString arg2 = mustUpdateDate ? "date=:date" : "";
+            QString sql = QString("UPDATE dialogs SET %1 %2 WHERE id=:id").arg(arg1, arg2);
+
+            query.prepare(sql);
+            query.bindValue(":id", dialogId);
+            if (mustUpdateDate) {
+                query.bindValue(":date", message.date());
+            }
+
+            if (!query.exec()) {
+                qCCritical(TG_PLUGIN_LOGIC) << "Error:" << query.lastError() << query.lastQuery();
+                mDbManager.rollbackTransaction();
+                return false;
+            }
         }
-
     }
 
     qint64 mediaId = 0;
@@ -3335,8 +3342,38 @@
 
 bool Data::updateMessage(qint32 oldMessageId, qint32 newMessageId, qint32 date) {
 
+    mDbManager.beginTransaction();
+
     QSqlQuery query(mDbManager.database());
 
+    qint32 dialogId = getDialogIdFromMessageId(oldMessageId);
+    query.prepare("SELECT date FROM dialogs WHERE id=:dialogId");
+    query.bindValue(":dialogId", dialogId);
+    if (!query.exec()) {
+        qCCritical(TG_PLUGIN_LOGIC) << "Error getting date from dialog" << dialogId << query.lastError() << query.lastQuery();
+        mDbManager.rollbackTransaction();
+        return false;
+    }
+
+    if (!query.next()) {
+        qCCritical(TG_PLUGIN_LOGIC) << "Could not find any related register to dialog" << dialogId;
+        mDbManager.rollbackTransaction();
+        return false;
+    }
+
+    qint32 dialogDate = query.value("date").toInt();
+
+    if (date > dialogDate) {
+        query.prepare("UPDATE dialogs SET date=:date WHERE id=:dialogId");
+        query.bindValue(":date", date);
+        query.bindValue(":dialogId", dialogId);
+        if (!query.exec()) {
+            qCCritical(TG_PLUGIN_LOGIC) << "Error updating date for dialog" << dialogId << query.lastError() << query.lastQuery();
+            mDbManager.rollbackTransaction();
+            return false;
+        }
+    }
+
     //when updating message date is because and update date is taken from server. Update sent to true also
     query.prepare("UPDATE messages SET date=:date, id=:newId, sent=1 WHERE id=:oldId");
     query.bindValue(":date", date);
@@ -3344,14 +3381,18 @@
     query.bindValue(":newId", newMessageId);
     if (!query.exec()) {
         qCCritical(TG_PLUGIN_LOGIC) << "Error:" << query.lastError() << query.lastQuery();
+        mDbManager.rollbackTransaction();
         return false;
     }
 
     if (query.numRowsAffected() == 0) {
         qCCritical(TG_PLUGIN_LOGIC) << "No row was updated during this execution:" << query.lastQuery();
+        mDbManager.rollbackTransaction();
         return false;
     }
 
+    mDbManager.finishTransaction();
+
     return true;
 }