Merge lp:~libqtelegram-team/telegram-app/bugfix-1348724 into lp:~libqtelegram-team/telegram-app/qml-plugin

[Roberto Mier Escandon]

Received messages in a list are sorted from most to less recent and should be always added at the end or inserted at beginning. This change evaluates if needed to append or prepend them and does the operation.
This way is not needed to have a proxy for sorting messages because list will remain always sorted.

Anyway, this change must be considered "under observation" for every new operation involving the messages model because it could happen that is not always valid or should it be completed with any special case.

[Michał Karnicki (karni)]

inline comments, then +1

review: Approve

Unmerged revisions

182. By Roberto Mier Escandon on 2014-08-06

BUGFIX for 1348724; dialog history messages not well sorted

=== modified file 'qmlplugin/models/messagesmodel.cpp'
--- qmlplugin/models/messagesmodel.cpp	2014-07-25 16:45:31 +0000
+++ qmlplugin/models/messagesmodel.cpp	2014-08-06 13:38:34 +0000
@@ -108,7 +108,7 @@
     if (m_messages.isEmpty()) {
         return MessageItem();
     }
-    return m_messages.first();
+    return m_messages.last();
 }
 
 void MessagesModel::append(const MessageItem &newMessage) {
@@ -124,16 +124,33 @@
         return;
     }
 
-    beginInsertRows(QModelIndex(), m_messages.count(), m_messages.count() + messages.count() - 1);
-    Q_FOREACH (MessageItem newMessage, messages) {
-        m_keysMap.insert(newMessage.id(), m_messages.count());
-        m_messages.append(newMessage);
+    // check if most recent received message (first in the list) has lower date than first one in model
+    // to prepending instead of appending
+    if (m_messages.count() > 0 && (m_messages.at(0).date() > messages.at(0).date())) {
+
+        // when prepending, the first message to prepend should be the most recent
+        beginInsertRows(QModelIndex(), 0, messages.count() - 1);
+        for (int i = 0; i < messages.count(); i++) {
+            const MessageItem &msg = messages.at(i);
+            m_keysMap.insert(msg.id(), messages.count() - i - 1);
+            m_messages.prepend(msg);
+        }
+    } else {
+
+        // when appending, the last message to append should be the most recent
+        beginInsertRows(QModelIndex(), m_messages.count(), m_messages.count() + messages.count() - 1);
+        for (int i = messages.count()-1; i >= 0; i--) {
+            const MessageItem &msg = messages.at(i);
+            m_keysMap.insert(msg.id(), m_messages.count());
+            m_messages.append(msg);
+        }
     }
     endInsertRows();
 
     m_canFetchMore = totalCount > m_messages.count();
 }
 
+
 void MessagesModel::update(qint32 msgId, const MessageItem &message) {
 
     qint32 pos = m_keysMap.take(msgId);

=== modified file 'qmlplugin/telegramclient.cpp'
--- qmlplugin/telegramclient.cpp	2014-07-30 16:09:13 +0000
+++ qmlplugin/telegramclient.cpp	2014-08-06 13:38:34 +0000
@@ -102,14 +102,7 @@
     m_telegram->messagesGetHistory(peer);
 
     MessagesModel &messagesModel = ModelsManager::instance()->messagesModel(dialogId);
-
-    // build messages model and proxy
-    m_messagesModelProxy.setSourceModel(&messagesModel);
-    m_messagesModelProxy.setSortRole(MessagesModel::DateRole);
-    m_messagesModelProxy.sort(0, Qt::AscendingOrder);
-    m_messagesModelProxy.setDynamicSortFilter(true);
-
-    return QVariant::fromValue(&m_messagesModelProxy);
+    return QVariant::fromValue(&messagesModel);
 }
 
 QVariant TelegramClient::getDialog(qint32 dialogId) {

=== modified file 'qmlplugin/telegramclient.h'
--- qmlplugin/telegramclient.h	2014-07-30 16:09:13 +0000
+++ qmlplugin/telegramclient.h	2014-08-06 13:38:34 +0000
@@ -48,7 +48,6 @@
 private:
     DialogsProxy m_dialogsModelProxy;
     ContactsProxy m_contactsModelProxy;
-    QSortFilterProxyModel m_messagesModelProxy;
 
     // updates state
     ClientState m_state;

=== modified file 'uitest/uitest.qml'
--- uitest/uitest.qml	2014-08-06 10:59:18 +0000
+++ uitest/uitest.qml	2014-08-06 13:38:34 +0000
@@ -119,13 +119,13 @@
 
         onMessagesGetDialogsAnswer: {
             // *Uncomment to render dialogsPage
-            //pageStack.showPage(dialogsPage);
+            pageStack.showPage(dialogsPage);
 
             // *Uncomment to render contactsPage
             //pageStack.showPage(contactsPage);
 
             // *Uncomment to render settingsPage
-            pageStack.showPage(settingsPage);
+            //pageStack.showPage(settingsPage);
         }
 
     }