Merge lp:~libqtelegram-team/telegram-app/double-message-on-push into lp:telegram-app/dev

[Roberto Mier Escandon]

When got a page from messagesView, checked that fetched messages are not already in the model

=== modified file 'qmlplugin/models/messagesmodel.cpp'
--- qmlplugin/models/messagesmodel.cpp	2015-01-27 10:50:07 +0000
+++ qmlplugin/models/messagesmodel.cpp	2015-02-04 09:38:58 +0000
@@ -194,14 +194,31 @@
             }
         }
     } else {
-        beginInsertRows(QModelIndex(), mMessages.count(), mMessages.count() + messages.count() - 1);
-        Q_FOREACH (const MessageItem newMessage, messages) {
-            mMessages << newMessage;
-            mKeysMap.insert(newMessage.id(), &mMessages[mMessages.count() - 1]);
+        insertNewMessages(messages);
+    }
+}
+
+void MessagesModel::insertNewMessages(const QList<MessageItem> &messages) {
+
+    if (!messages.count()) {
+        mCanFetchMore = false;
+        return;
+    }
+
+    QList<MessageItem> filteredMessages;
+    Q_FOREACH (const MessageItem &message, messages) {
+        if (!exists(message)) {
+            filteredMessages << message;
         }
-        endInsertRows();
-        Q_EMIT countChanged(mMessages.count());
-    }
+    }
+
+    beginInsertRows(QModelIndex(), mMessages.count(), mMessages.count() + filteredMessages.count() - 1);
+    Q_FOREACH (const MessageItem newMessage, filteredMessages) {
+        mMessages << newMessage;
+        mKeysMap.insert(newMessage.id(), &mMessages[mMessages.count() -1]);
+    }
+    endInsertRows();
+    Q_EMIT countChanged(mMessages.count());
 }
 
 void MessagesModel::onGetUserAnswer(QVariant qvariantUser) {
@@ -417,26 +434,7 @@
 
 void MessagesModel::onMessagesAdded(const QList<MessageItem> &messages, qint32 totalCount) {
 
-    if (!messages.count()) {
-        mCanFetchMore = false;
-        return;
-    }
-
-    QList<MessageItem> filteredMessages;
-    Q_FOREACH (const MessageItem &message, messages) {
-        if (!exists(message)) {
-            filteredMessages << message;
-        }
-    }
-
-    beginInsertRows(QModelIndex(), mMessages.count(), mMessages.count() + filteredMessages.count() - 1);
-    Q_FOREACH (const MessageItem newMessage, filteredMessages) {
-        mMessages << newMessage;
-        mKeysMap.insert(newMessage.id(), &mMessages[mMessages.count() -1]);
-    }
-    endInsertRows();
-    Q_EMIT countChanged(mMessages.count());
-
+    insertNewMessages(messages);
     mCanFetchMore = totalCount > 0 && totalCount > mMessages.count();
 }
 

=== modified file 'qmlplugin/models/messagesmodel.h'
--- qmlplugin/models/messagesmodel.h	2015-01-26 01:27:48 +0000
+++ qmlplugin/models/messagesmodel.h	2015-02-04 09:38:58 +0000
@@ -135,6 +135,7 @@
     void getHistoryFromServer();
     bool acceptMessage(const MessageItem &message);
     bool exists(const MessageItem &message);
+    void insertNewMessages(const QList<MessageItem> &messages);
 };
 
 #endif // MESSAGESMODEL_H