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

[Roberto Mier Escandon]

Last changes in qml-plugin result in a bug that didn't load the db cached messages for a chat when that chat was related to a user. The reason is the "isChat" flag not well set in MessagesView

[Michał Karnicki (karni)]

review: Approve

=== modified file 'qmlplugin/models/messagesview.cpp'
--- qmlplugin/models/messagesview.cpp	2014-08-18 18:49:11 +0000
+++ qmlplugin/models/messagesview.cpp	2014-08-21 10:47:22 +0000
@@ -20,10 +20,10 @@
 #include "data.h"
 #include "dbmanager.h"
 
-MessagesView::MessagesView(qint32 dialogId, bool isChat, QObject *parent) :
+MessagesView::MessagesView(qint32 dialogId, qint32 peerType, QObject *parent) :
     QObject(parent),
     mDialogId(dialogId),
-    mIsChat(isChat),
+    mIsChat(peerType == InputPeer::typeInputPeerChat),
     mQuery(DbManager::instance()->database()),
     mPageSize(20),
     mOffset(0)

=== modified file 'qmlplugin/models/messagesview.h'
--- qmlplugin/models/messagesview.h	2014-08-18 18:49:11 +0000
+++ qmlplugin/models/messagesview.h	2014-08-21 10:47:22 +0000
@@ -27,7 +27,7 @@
     Q_OBJECT
 
 public:
-    MessagesView(qint32 dialogId, bool isChat, QObject *parent = 0);
+    MessagesView(qint32 dialogId, qint32 peerType, QObject *parent = 0);
     ~MessagesView();
 
     QList<MessageItem> nextPage();