[SCM] ktp-common-internals packaging branch, master, updated. debian/16.04.2-1-111-g6e00b1c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=cbd7bb2

The following commit has been merged in the master branch:
commit cbd7bb27f5caa776c3a41bcb5d35bcf4cb2376b2
Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Wed Sep 14 23:08:33 2016 +0500

    [Declarative/MessagesModel] Implemented message sort by sent timestamp
    
    REVIEW: 128954
---
 KTp/Declarative/messages-model.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index dc1088c..6823574 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -214,10 +214,21 @@ void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
         }
         Q_EMIT dataChanged(originalMessageIndex, originalMessageIndex);
     } else {
-        int length = rowCount();
-        beginInsertRows(QModelIndex(), length, length);
+        int newMessageIndex = 0;
+        const QDateTime sentTimestamp = message.sent();
+        if (sentTimestamp.isValid()) {
+            for (int i = d->messages.count() - 1; i >= 0; --i) {
+                if (sentTimestamp > d->messages.at(i).message.time()) {
+                    newMessageIndex = i;
+                    break;
+                }
+            }
+        } else {
+            newMessageIndex = rowCount();
+        }
+        beginInsertRows(QModelIndex(), newMessageIndex, newMessageIndex);
 
-        d->messages.append(KTp::MessageProcessor::instance()->processIncomingMessage(
+        d->messages.insert(newMessageIndex, KTp::MessageProcessor::instance()->processIncomingMessage(
                                message, d->account, d->textChannel));
 
         endInsertRows();

-- 
ktp-common-internals packaging