Merge lp:~libqtelegram-team/telegram-app/lib-fix-delays into lp:telegram-app/trunk

[Michał Karnicki]

Requires: lp:~libqtelegram-team/libqtelegram/app-fix-delays

  Collapse in time updates to unread badge.
  Collapse in time updates to user metrics.
  Be smarter about updating dialog top messages.

Intentionally proposed to trunk.

[lp:~libqtelegram-team/telegram-app/lib-fix-delays]

95. By Michał Karnicki on 2015-06-01

Rename method.

[Roberto Mier Escandon (rmescandon)]

Brilliant!!!
Tested and superquick

review: Approve

=== modified file 'qmlplugin/data.cpp'
--- qmlplugin/data.cpp	2015-05-05 17:09:36 +0000
+++ qmlplugin/data.cpp	2015-06-01 13:36:23 +0000
@@ -33,7 +33,8 @@
     mFilesAvgTime(0),
     mFilesCount(0),
     mFilesTotalTime(0),
-    mLastUnreadCount(-1) {
+    mLastUnreadCount(-1),
+    mBadgeUpdateTimer(0) {
 
     // Priorities for thumbnail sizes are m, b, s, a, x, c, y, d, w
     mPhotoSmallPriorities.insert("m", 1);
@@ -149,6 +150,7 @@
         }
     }
 
+    qint32 newMessagesReceivedCount = 0;
     Q_FOREACH (const Message &message, messages) {
 
         qint32 dialogId = Tools::getBelongingDialogId(message);
@@ -179,7 +181,11 @@
             TelegramService *service = static_cast<TelegramService *>(mServiceRef);
             service->messagesGetDialogs(0, dialogId, 1);
         }
+
+        newMessagesReceivedCount += (!message.out() && message.unread()) ? 1 : 0;
     }
+    Q_EMIT messagesReceived(newMessagesReceivedCount);
+    updateBadge();
 
     Q_FOREACH (const SecretChatMessage &secretChatMessage, secretChatMessages) {
 
@@ -250,9 +256,10 @@
     }
 
     if (!isIntermediateState) {
-        surfaceUnreadCount();
+        updateBadge();
     }
 
+    Q_EMIT selfDestructMessages();
     qCDebug(TG_PLUGIN_PROFILING) << "onUpdatesGetDifferenceAnswer - end:" << time.elapsed() << "ms";
 }
 
@@ -1700,7 +1707,7 @@
     }
 
     Q_EMIT messagesAdded(messageItems, messageItems.count());
-
+    Q_EMIT selfDestructMessages();
     qCDebug(TG_PLUGIN_PROFILING) << "onMessagesForwardMessagesAnswer - end";
 }
 
@@ -1803,6 +1810,8 @@
     mDbManager.finishTransaction();
 
     Q_EMIT messageAdded(messageItem);
+    Q_EMIT messagesReceived(1);
+    Q_EMIT selfDestructMessages();
 }
 
 void Data::onUpdateShort(const Update &update, qint32 date) {
@@ -1899,6 +1908,7 @@
 
     MessageItem messageItem = getMessage(message.randomId());
     Q_EMIT outgoingMessageAdded(chatId, messageItem);
+    Q_EMIT selfDestructMessages();
 
     // 'local' is the size for sent photos until having a server location and different sizes
     // if there is a mediaLocalPath and media type is photo ro video, emit photo updated signal. Same for video
@@ -2518,7 +2528,8 @@
     service->messagesReceivedQueue(qts);
 
     Q_EMIT messageAdded(messageItem);
-    surfaceUnreadCount();
+    updateBadge();
+    Q_EMIT selfDestructMessages();
 
     qCDebug(TG_PLUGIN_PROFILING) << "onUpdateSecretChatMessage - end:" << time.elapsed() << "ms";
 }
@@ -2655,6 +2666,7 @@
             qCCritical(TG_PLUGIN_LOGIC) << "Impossible insert new received message";
             return false;
         }
+        Q_EMIT messagesReceived(1);
 
         if (!executeAction(message)) {
             mDbManager.rollbackTransaction();
@@ -2672,6 +2684,7 @@
 
         MessageItem messageItem = getMessage(message.id());
         Q_EMIT messageAdded(messageItem);
+        Q_EMIT selfDestructMessages();
 
         if (newDialog) {
             // Ask telegram servers for info about this just created dialog where it will be included the phone number
@@ -2687,6 +2700,7 @@
     case Update::typeUpdateReadMessages: {
         if (markMessagesAsRead(update.messages())) {
             Q_EMIT messagesMarkedAsRead(update.messages());
+            Q_EMIT selfDestructMessages();
         }
 
         UpdatesState clientState = getState();
@@ -2893,7 +2907,7 @@
 }
 
 bool Data::getProfilePhotoFileFromServer(const FileLocation &serverLocation, qint32 id, bool isUser, bool isThumbnail) {
-
+    
     if (serverLocation.classType() != FileLocation::typeFileLocationUnavailable) {
         // Search in database if same location parameter are stored for thumbnail that
         // received ones. In that case don't download cos it's the same file
@@ -2911,7 +2925,7 @@
 }
 
 bool Data::downloadPhotoFileFromServer(const FileLocation &serverLocation, qint32 id, bool isUser, bool isThumbnail) {
-
+    qCWarning(TG_PLUGIN_LOGIC) << "Data::downloadPhotoFileFromServer";
     if (serverLocation.classType() != FileLocation::typeFileLocationUnavailable) {
         // create object with the data of the file to be downloaded
         TelegramService *service = static_cast<TelegramService *>(mServiceRef);
@@ -3891,7 +3905,7 @@
     }
 
     if (!query.next()) {
-        qCCritical(TG_PLUGIN_LOGIC) << "Message to update not found.";
+        qCDebug(TG_PLUGIN_LOGIC) << "Message to update not found.";
         return false;
     }
 
@@ -4925,11 +4939,7 @@
 
     mDbManager.finishTransaction();
 
-    if (!message.out() && message.unread()) {
-        Q_EMIT messageReceived();
-    }
-
-    surfaceUnreadCount();
+    updateBadge();
 
     return true;
 }
@@ -5128,7 +5138,7 @@
     query.prepare(("UPDATE messages SET unread = 0 WHERE dialogId=:dialogId AND out = 0 AND unread = 1"));
     query.bindValue(":dialogId", chatId);
     if (query.exec()) {
-        surfaceUnreadCount();
+        updateBadge();
     }
 
     Q_EMIT chatMarkedAsRead(chatId);
@@ -5178,7 +5188,7 @@
 
     mDbManager.finishTransaction();
 
-    surfaceUnreadCount();
+    updateBadge();
 
     return true;
 }
@@ -6647,7 +6657,23 @@
     return dialog;
 }
 
-void Data::surfaceUnreadCount() {
+void Data::updateBadge() {
+    if (mBadgeUpdateTimer != 0) {
+        killTimer(mBadgeUpdateTimer);
+    }
+    mBadgeUpdateTimer = startTimer(200);
+}
+
+void Data::timerEvent(QTimerEvent *e) {
+    if(e->timerId() == mBadgeUpdateTimer) {
+        killTimer(mBadgeUpdateTimer);
+        mBadgeUpdateTimer = 0;
+        onUpdateBadge();
+    }
+    QObject::timerEvent(e);
+}
+
+void Data::onUpdateBadge() {
     QSqlQuery query;
     query.prepare(QString("SELECT SUM(unreadCount) AS unreadCount FROM dialogsView"));
 
 
=== modified file 'qmlplugin/data.h'
--- qmlplugin/data.h	2015-05-05 17:09:36 +0000
+++ qmlplugin/data.h	2015-06-01 13:36:23 +0000
@@ -212,6 +212,8 @@
     void updateChatPhoto(qint32 chatId, const Photo &photo);
     void updateChatFull(const ChatFull &chatFull);
 
+    void timerEvent(QTimerEvent *e);
+
 Q_SIGNALS:
     void userInfo(const ContactItem &user);
 
@@ -234,6 +236,7 @@
     void messagesAdded(const QList<MessageItem> &messages, qint32 totalCount);
     void messageAdded(const MessageItem &message);
     void outgoingMessageAdded(qint32 recipientId, const MessageItem &message);
+    void selfDestructMessages();
     void messageUpdated(qint32 msgId, const MessageItem &message);
 
     void chatMarkedAsRead(qint32 chatId);
@@ -247,7 +250,7 @@
     void messageDocumentUpdated(qint32 msgId, const QString &documentLocalPath, const QString &fileName = "", qint32 size = 0);
 
     void messageSent();
-    void messageReceived();
+    void messagesReceived(qint32 count);
 
     void downloadingUpdated(qint32 id, bool downloading);
     void downloadedPercentageUpdated(qint32 id, qint8 downloadedPercentage);
@@ -271,6 +274,7 @@
     DbManager mDbManager;
 
     qint32 mLastUnreadCount;
+    qint32 mBadgeUpdateTimer;
 
     // time mesurement map for file downloading. Correlates fileId with a QTime object for calculate total download time
     QMap<qint64, QTime *> mFileTimes;
@@ -346,7 +350,8 @@
     bool muteDialog(qint32 dialogId, bool muted);
     bool muteDialogs(NotifyPeer::NotifyPeerType peerType, bool muted);
 
-    void surfaceUnreadCount();
+    void updateBadge();
+    void onUpdateBadge();
 
     bool exists(qint32 id, bool isUser);
 
 
=== modified file 'qmlplugin/models/dialogsmodel.cpp'
--- qmlplugin/models/dialogsmodel.cpp	2015-02-16 13:51:55 +0000
+++ qmlplugin/models/dialogsmodel.cpp	2015-06-01 13:36:23 +0000
@@ -28,6 +28,7 @@
     mCanFetchMore(true),
     mState(Created),
     mSecretDialogsCount(0),
+    mTopMessagesTimer(0),
     mTelegramClient(0) {
 }
 
@@ -420,41 +421,71 @@
 }
 
 void DialogsModel::onMessageAdded(const MessageItem &message) {
+    mTopMessages.insert(message.dialogId(), message);
 
     qint32 dialogId = message.dialogId();
     qint32 pos = mDlgIdsMap.value(dialogId, -1);
-
     if (0 <= pos && pos < mDialogs.size()) {
-        DialogItem &dlg = mDialogs[pos];
-
-        if (!message.out()) {
-            dlg.setTyping(false);
-        }
-
-        //Remove previous top message id from mapping
-        MessageItem oldTopMessage = dlg.topMessage();
-        if (!oldTopMessage.isEmpty()) {
-            mTopMessageIdsMap.remove(oldTopMessage.id());
-        }
-
-        dlg.setTopMessage(message);
-        dlg.setDate(message.date());
-        mTopMessageIdsMap.insert(message.id(), dlg.id());
-
         if (!message.out() && message.unread()) {
+            DialogItem &dlg = mDialogs[pos];
             dlg.setUnreadCount(dlg.unreadCount() + 1);
         }
-
-        const QVector<qint32> changedRoles(QVector<qint32>() << UnreadCountRole << DateRole << TopMessageIdRole << TopMessageFromIdRole <<
-                                           TopMessageFromFirstNameRole << TopMessageFromLastNameRole << TopMessageFromPhoneRole <<
-                                           TopMessageToIdRole << TopMessageOutRole << TopMessageUnreadRole << TopMessageSentRole <<
-                                           TopMessageDateRole << TopMessageTextRole << TopMessageMediaTypeRole <<
-                                           TopMessageActionTitleRole << TopMessageActionTypeRole << TopMessageActionUserRole <<
-                                           TypingRole << WhoIsTypingRole);
-        Q_EMIT dataChanged(index(pos), index(pos), changedRoles);
-    } else {
-        qCWarning(TG_PLUGIN_LOGIC) << "onMessageAdded: dialog not found for new top message";
-    }
+    }
+
+    // Delay refreshing top messages while messages incoming.
+    if (mTopMessagesTimer != 0) {
+        killTimer(mTopMessagesTimer);
+    }
+    mTopMessagesTimer = startTimer(200);
+}
+
+void DialogsModel::timerEvent(QTimerEvent *e) {
+    if(e->timerId() == mTopMessagesTimer) {
+        killTimer(mTopMessagesTimer);
+        mTopMessagesTimer = 0;
+        onTopMessagesChanged();
+    }
+    QAbstractListModel::timerEvent(e);
+}
+
+void DialogsModel::onTopMessagesChanged() {
+    qCDebug(TG_PLUGIN_LOGIC) << "onTopMessagesChanged";
+
+    Q_FOREACH(const MessageItem &message, mTopMessages.values()) {
+
+        qint32 dialogId = message.dialogId();
+        qint32 pos = mDlgIdsMap.value(dialogId, -1);
+
+        if (0 <= pos && pos < mDialogs.size()) {
+            DialogItem &dlg = mDialogs[pos];
+
+            if (!message.out()) {
+                dlg.setTyping(false);
+            }
+
+            //Remove previous top message id from mapping
+            MessageItem oldTopMessage = dlg.topMessage();
+            if (!oldTopMessage.isEmpty()) {
+                mTopMessageIdsMap.remove(oldTopMessage.id());
+            }
+
+            dlg.setTopMessage(message);
+            dlg.setDate(message.date());
+            mTopMessageIdsMap.insert(message.id(), dlg.id());
+
+            const QVector<qint32> changedRoles(QVector<qint32>() << UnreadCountRole << DateRole << TopMessageIdRole << TopMessageFromIdRole <<
+                                               TopMessageFromFirstNameRole << TopMessageFromLastNameRole << TopMessageFromPhoneRole <<
+                                               TopMessageToIdRole << TopMessageOutRole << TopMessageUnreadRole << TopMessageSentRole <<
+                                               TopMessageDateRole << TopMessageTextRole << TopMessageMediaTypeRole <<
+                                               TopMessageActionTitleRole << TopMessageActionTypeRole << TopMessageActionUserRole <<
+                                               TypingRole << WhoIsTypingRole);
+            Q_EMIT dataChanged(index(pos), index(pos), changedRoles);
+        } else {
+            qCWarning(TG_PLUGIN_LOGIC) << "onMessageAdded: dialog not found for new top message";
+        }
+    }
+
+    mTopMessages.clear();
 }
 
 void DialogsModel::onMessagesAdded(const QList<MessageItem> &messages, qint32 totalCount) {
 
=== modified file 'qmlplugin/models/dialogsmodel.h'
--- qmlplugin/models/dialogsmodel.h	2015-02-16 13:51:55 +0000
+++ qmlplugin/models/dialogsmodel.h	2015-06-01 13:36:23 +0000
@@ -95,6 +95,9 @@
 
     Q_INVOKABLE void setTelegramClient(TelegramClient *telegramClient);
 
+protected:
+    void timerEvent(QTimerEvent *e);
+
 private:
     QList<DialogItem> mDialogs;
     // correlates dialog->id() --> index in m_dialogs
@@ -106,6 +109,9 @@
     ModelState mState;
     qint32 mSecretDialogsCount;
 
+    qint32 mTopMessagesTimer;
+    QMap<qint32, MessageItem> mTopMessages;
+
     // reference to telegram client
     TelegramClient *mTelegramClient;
 
@@ -129,9 +135,11 @@
     void onMessageAdded(const MessageItem &message);
     void onMessagesAdded(const QList<MessageItem> &messages, qint32 totalCount);
     void onOutgoingMessageAdded(qint32 recipientId, const MessageItem &message);
+    void onTopMessagesChanged();
     void onMessageUpdated(qint32 msgId, const MessageItem &message);
     void onMessagesDeleted(const QList<qint32> msgIds);
     void onMessagesMarkedAsRead(const QList<qint32> &msgIds);
+
     void onChatMarkedAsRead(qint32 dialogId);
     void onChatHistoryDeleted(qint32 dialogId);
     void onChatDeleted(qint32 dialogId);
 
=== modified file 'qmlplugin/telegramclient.cpp'
--- qmlplugin/telegramclient.cpp	2015-04-02 13:13:41 +0000
+++ qmlplugin/telegramclient.cpp	2015-06-01 13:36:23 +0000
@@ -95,7 +95,7 @@
 
     connect(mTelegramService, SIGNAL(unreadCountChanged(qint32)), SIGNAL(unreadCountChanged(qint32)));
     connect(mTelegramService, SIGNAL(messageSent()), SIGNAL(messageSent()));
-    connect(mTelegramService, SIGNAL(messageReceived()), SIGNAL(messageReceived()));
+    connect(mTelegramService, SIGNAL(messagesReceived(qint32)), SIGNAL(messagesReceived(qint32)));
 
     // connect database signals
     DbManager &dbManager = mTelegramService->data().dbManager();
 
=== modified file 'qmlplugin/telegramclient.h'
--- qmlplugin/telegramclient.h	2015-04-02 13:13:41 +0000
+++ qmlplugin/telegramclient.h	2015-06-01 13:36:23 +0000
@@ -161,7 +161,7 @@
 
     void unreadCountChanged(qint32 unreadCount);
     void messageSent();
-    void messageReceived();
+    void messagesReceived(qint32 count);
 
     void userTyping(qint32 dialogId, const QString &whoIsTyping = QString());
 
 
=== modified file 'qmlplugin/telegramservice.cpp'
--- qmlplugin/telegramservice.cpp	2015-05-05 17:09:36 +0000
+++ qmlplugin/telegramservice.cpp	2015-06-01 13:36:23 +0000
@@ -68,7 +68,7 @@
     connect(&mData, SIGNAL(dialogsAdded(QList<DialogItem>,qint32)), SIGNAL(dialogsAdded(QList<DialogItem>,qint32)));
     connect(&mData, SIGNAL(unreadCountChanged(qint32)), SIGNAL(unreadCountChanged(qint32)));
     connect(&mData, SIGNAL(messageSent()), SIGNAL(messageSent()));
-    connect(&mData, SIGNAL(messageReceived()), SIGNAL(messageReceived()));
+    connect(&mData, SIGNAL(messagesReceived(qint32)), SIGNAL(messagesReceived(qint32)));
     connect(&mData, SIGNAL(secretChatRequested(qint32,qint32,qint32,qint64)), SIGNAL(secretChatRequested(qint32,qint32,qint32,qint64)));
     connect(&mData, SIGNAL(secretChatCreated(qint32)), SIGNAL(secretChatCreated(qint32)));
     connect(&mData, SIGNAL(secretChatDiscarded(qint32)), SIGNAL(secretChatDiscarded(qint32)));
@@ -78,9 +78,7 @@
 
     mSelfDestructTimer.setSingleShot(true);
     connect(&mSelfDestructTimer, SIGNAL(timeout()), this, SLOT(processSelfDestructMessages()));
-    connect(&mData, SIGNAL(messageAdded(MessageItem)), &mSelfDestructTimer, SIGNAL(timeout()));
-    connect(&mData, SIGNAL(messagesMarkedAsRead(QList<qint32>)),&mSelfDestructTimer, SIGNAL(timeout()));
-    connect(&mData, SIGNAL(outgoingMessageAdded(qint32,MessageItem)), &mSelfDestructTimer, SIGNAL(timeout()));
+    connect(&mData, SIGNAL(selfDestructMessages()), &mSelfDestructTimer, SIGNAL(timeout()));
     connect(this, SIGNAL(messagesReadEncryptedHistoryAnswer(qint64,bool)), &mSelfDestructTimer, SIGNAL(timeout()));
 }
 
@@ -128,7 +126,7 @@
     }
 
     mTelegramLib->init();
-    mSelfDestructTimer.start();
+    QMetaObject::invokeMethod(&mSelfDestructTimer, "start", Qt::QueuedConnection);
 }
 
 void TelegramService::shutdown() {
@@ -162,7 +160,7 @@
 
 void TelegramService::onWoken() {
     mTelegramLib->updatesGetState();
-    mSelfDestructTimer.start();
+    QMetaObject::invokeMethod(&mSelfDestructTimer, "start", Qt::QueuedConnection);
     updateUserProfiles();
     Q_EMIT woken();
 }
@@ -944,6 +942,10 @@
 }
 
 void TelegramService::processSelfDestructMessages() {
+    QTime time;
+    time.start();
+    qCDebug(TG_PLUGIN_LOGIC) << "processSelfDestructMessages";
+
     QSqlQuery query;
 
     // Purge expired messages.
@@ -965,6 +967,9 @@
     if (query.exec() && query.next()) {
         if (query.value("expires").isNull()) {
             qCDebug(TG_PLUGIN_LOGIC) << "TTL: all expired messages deleted";
+            if (mSelfDestructTimer.isActive()) {
+                QMetaObject::invokeMethod(&mSelfDestructTimer, "stop", Qt::QueuedConnection);
+            }
             return;
         }
 
@@ -972,14 +977,17 @@
         if (nextInSeconds > 0) {
             qCDebug(TG_PLUGIN_LOGIC) << "TTL: next message in" << nextInSeconds << "s";
             if (mSelfDestructTimer.isActive()) {
-                mSelfDestructTimer.stop();
+                QMetaObject::invokeMethod(&mSelfDestructTimer, "stop", Qt::QueuedConnection);
             }
-            mSelfDestructTimer.start(1000*nextInSeconds);
+            QMetaObject::invokeMethod(&mSelfDestructTimer, "start", Qt::QueuedConnection,
+                    Q_ARG(qint32, 1000*nextInSeconds));
         } else {
             // We already have an expired message.
-            mSelfDestructTimer.start(500);
+            QMetaObject::invokeMethod(&mSelfDestructTimer, "start", Qt::QueuedConnection,
+                    Q_ARG(qint32, 500));
         }
     }
+    qCDebug(TG_PLUGIN_PROFILING) << "processSelfDestructMessages - end:" << time.elapsed() << "ms";
 }
 
 void TelegramService::createCrashFile() {
 
=== modified file 'qmlplugin/telegramservice.h'
--- qmlplugin/telegramservice.h	2015-03-26 17:16:20 +0000
+++ qmlplugin/telegramservice.h	2015-06-01 13:36:23 +0000
@@ -162,7 +162,7 @@
 
     void unreadCountChanged(qint32 unreadCount);
     void messageSent();
-    void messageReceived();
+    void messagesReceived(qint32 count);
 
     void userTyping(qint32 dialogId, const QString &whoIsTyping = QString());