Merge lp:~libqtelegram-team/telegram-app/dev-secret-media-nosave into lp:telegram-app/trunk

[Michał Karnicki]

Surfaced TTL on MessageItem in messages model.

Tested by creating:
1) secret chat from Ubuntu and
2) secret chat from Android and
for each of those
a) sent self destruct message (in and out)
b) sent regular message, then sent a self destruct msg (regular message stays, self destruct destroys)

[Roberto Mier Escandon (rmescandon)]

Are you trying to land this to trunk ??!!

review: Needs Resubmitting

Unmerged revisions

=== modified file 'lib/core/settings.cpp'
--- lib/core/settings.cpp	2015-02-04 15:57:51 +0000
+++ lib/core/settings.cpp	2015-02-17 13:31:13 +0000
@@ -219,13 +219,17 @@
         secretChat->setState((SecretChat::State)settings.value(ST_STATE, 0).toInt());
 
         QByteArray base64Sk = settings.value(ST_SHARED_KEY).toByteArray();
-        QByteArray parsedSk = QByteArray::fromBase64(base64Sk);
-        memcpy(secretChat->sharedKey(), parsedSk.data(), SHARED_KEY_LENGTH);
+        if (!base64Sk.isEmpty()) {
+            QByteArray parsedSk = QByteArray::fromBase64(base64Sk);
+            memcpy(secretChat->sharedKey(), parsedSk.data(), SHARED_KEY_LENGTH);
+        }
 
         QByteArray base64Mk = settings.value(ST_MY_KEY).toByteArray();
-        QByteArray parsedMk = QByteArray::fromBase64(base64Mk);
-        BIGNUM *myKey = Utils::bytesToBignum(parsedMk);
-        secretChat->setMyKey(myKey);
+        if (!base64Mk.isEmpty()) {
+            QByteArray parsedMk = QByteArray::fromBase64(base64Mk);
+            BIGNUM *myKey = Utils::bytesToBignum(parsedMk);
+            secretChat->setMyKey(myKey);
+        }
 
         secretChat->setLayer(settings.value(ST_LAYER, 0).toInt());
         secretChat->setInSeqNo(settings.value(ST_IN_SEQ_NO, 0).toInt());
@@ -263,11 +267,15 @@
         settings.setValue(ST_STATE, secretChat->state());
 
         BIGNUM *myKey = secretChat->myKey();
-        QByteArray myKeyToSave = Utils::bignumToBytes(myKey);
-        settings.setValue(ST_MY_KEY, myKeyToSave.toBase64());
+        if (myKey) {
+            QByteArray myKeyToSave = Utils::bignumToBytes(myKey);
+            settings.setValue(ST_MY_KEY, myKeyToSave.toBase64());
+        }
 
-        QByteArray sharedKeyToSave((char *)secretChat->sharedKey(), SHARED_KEY_LENGTH);
-        settings.setValue(ST_SHARED_KEY, sharedKeyToSave.toBase64());
+        if (secretChat->sharedKey()) {
+            QByteArray sharedKeyToSave((char *)secretChat->sharedKey(), SHARED_KEY_LENGTH);
+            settings.setValue(ST_SHARED_KEY, sharedKeyToSave.toBase64());
+        }
 
         settings.setValue(ST_LAYER, secretChat->layer());
         settings.setValue(ST_IN_SEQ_NO, secretChat->inSeqNo());

=== modified file 'lib/secret/decrypter.cpp'
--- lib/secret/decrypter.cpp	2015-01-28 15:50:32 +0000
+++ lib/secret/decrypter.cpp	2015-02-17 13:31:13 +0000
@@ -103,7 +103,6 @@
             deflatedOutSeqNo = receivedOutSeqNoParam / 2;
             qint32 deflatedInSeqNo = receivedInSeqNoParam / 2;
 
-
             if (deflatedOutSeqNo != mSecretChat->inSeqNo()) {
                 if (deflatedOutSeqNo < mSecretChat->inSeqNo()) {
                     qCWarning(TG_LIB_SECRET) << "Received out_seq_no (" << deflatedOutSeqNo
@@ -111,7 +110,7 @@
                     processMessage = false;
                 } else if (deflatedOutSeqNo > mSecretChat->inSeqNo()) {
                     qCWarning(TG_LIB_SECRET) << "Found gap since received out_seq_no (" << deflatedOutSeqNo
-                                             << ") is greter than expected (" << mSecretChat->inSeqNo()
+                                             << ") is greater than expected (" << mSecretChat->inSeqNo()
                                              << "). Requesting intermediate messages to fill the gap";
                     processMessage = false;
                     // set gap flag to true, to store the incoming message into a gap waiting queue until solving the gap

=== modified file 'lib/secret/secretchatmessage.h'
--- lib/secret/secretchatmessage.h	2015-01-23 15:34:54 +0000
+++ lib/secret/secretchatmessage.h	2015-02-17 13:31:13 +0000
@@ -9,15 +9,18 @@
 public:
     explicit SecretChatMessage() :
         mChatId(0),
+        mTtl(0),
         mDate(0),
         mDecryptedMessage(DecryptedMessage::typeDecryptedMessage_level8),
         mAttachment(EncryptedFile::typeEncryptedFileEmpty) {}
 
     qint32 chatId() const { return mChatId; }
+    qint32 ttl() const { return mTtl; }
     qint32 date() const { return mDate; }
     DecryptedMessage decryptedMessage() const { return mDecryptedMessage; }
     EncryptedFile attachment() const { return mAttachment; }
     void setChatId(qint32 chatId) { mChatId = chatId; }
+    void setTtl(qint32 ttl) { mTtl = ttl; }
     void setDate(qint32 date) { mDate = date; }
     void setDecryptedMessage(const DecryptedMessage &decryptedMessage) { mDecryptedMessage = decryptedMessage; }
     void setAttachment(const EncryptedFile &attachment) { mAttachment = attachment; }
@@ -29,6 +32,7 @@
 
 private:
     qint32 mChatId;
+    qint32 mTtl;
     qint32 mDate;
     DecryptedMessage mDecryptedMessage;
     EncryptedFile mAttachment;

=== modified file 'lib/telegram.cpp'
--- lib/telegram.cpp	2015-02-12 15:30:59 +0000
+++ lib/telegram.cpp	2015-02-17 13:31:13 +0000
@@ -628,11 +628,14 @@
     DecryptedMessage decrypted = mDecrypter.decryptEncryptedData(encrypted.randomId(), encrypted.bytes());
     secretChatMessage.setDecryptedMessage(decrypted);
 
-    EncryptedFile attachment = encrypted.file();
     // if having a not 0 randomId, the decrypted message is valid
     if (decrypted.randomId()) {
+
+        EncryptedFile attachment = encrypted.file();
+
         //if attachment, check keyFingerprint
         if (attachment.classType() != EncryptedFile::typeEncryptedFileEmpty) {
+
             qint32 receivedKeyFingerprint = attachment.keyFingerprint();
             const QByteArray &key = decrypted.media().key();
             const QByteArray &iv = decrypted.media().iv();
@@ -648,10 +651,10 @@
 
             secretChatMessage.setAttachment(attachment);
         }
+
+        mSecretState.save();
     }
 
-    mSecretState.save();
-
     return secretChatMessage;
 }
 
@@ -661,6 +664,7 @@
         EncryptedMessage encrypted = update.encryptedMessage();
 
         SecretChatMessage secretChatMessage = toSecretChatMessage(encrypted);
+
         // if having a not 0 randomId, the decrypted message is valid
         if (secretChatMessage.decryptedMessage().randomId()) {
             mSecretState.save();

=== modified file 'lib/types/message.h'
--- lib/types/message.h	2015-01-28 08:01:23 +0000
+++ lib/types/message.h	2015-02-17 13:31:13 +0000
@@ -47,6 +47,7 @@
 
     Message() :
         m_id(0),
+        m_ttl(0),
         m_toId(Peer::typePeerUser),
         m_unread(false),
         m_action(MessageAction::typeMessageActionEmpty),
@@ -62,6 +63,7 @@
 
     Message(MessageType classType) :
         m_id(0),
+        m_ttl(0),
         m_toId(Peer::typePeerUser),
         m_unread(false),
         m_action(MessageAction::typeMessageActionEmpty),
@@ -80,6 +82,12 @@
     qint32 id() const {
         return m_id;
     }
+    void setTtl(qint32 ttl) {
+        m_ttl = ttl;
+    }
+    qint32 ttl() const {
+        return m_ttl;
+    }
     void setFromId(qint32 fromId) {
         m_fromId = fromId;
     }
@@ -149,6 +157,7 @@
 
 private:
     qint32 m_id;
+    qint32 m_ttl;
     Peer m_toId;
     bool m_unread;
     MessageAction m_action;

=== modified file 'qmlplugin/data.cpp'
--- qmlplugin/data.cpp	2015-02-11 11:52:21 +0000
+++ qmlplugin/data.cpp	2015-02-17 13:31:13 +0000
@@ -89,10 +89,11 @@
 
     qCDebug(TG_PLUGIN_LOGIC) << "onUpdatesGetStateAnswer";
 
+    TelegramService *service = static_cast<TelegramService *>(mServiceRef);
+
     UpdatesState clientState = getState();
 
     if ( (clientState.seq() > 0 && clientState.seq() < seq) || (seq == 1 && clientState.pts() < pts) ){
-        TelegramService *service = static_cast<TelegramService *>(mServiceRef);
         service->updatesGetDifference(clientState.pts(), clientState.date(), clientState.qts());
     }
 
@@ -501,6 +502,9 @@
                 }
                 Q_EMIT dialogThumbnailUpdated(id, filePath);
                 Q_EMIT contactThumbnailUpdated(id, filePath);
+
+                notifySecretChatsThumbnailUpdated(id, filePath);
+
                 break;
             }
             case IncomingFile::ChatThumbnail: {
@@ -635,6 +639,9 @@
 
     Q_FOREACH (const User &user, users) {
 
+        // check previous username before update user db register
+        bool changedUsername = hasChangedUsername(user);
+
         if (!insertOrUpdateUser(user)) {
             mDbManager.rollbackTransaction();
             qCCritical(TG_PLUGIN_LOGIC) << "Error adding new contact to local database";
@@ -654,6 +661,13 @@
             contactItems.append(contactItem);
         }
 
+
+        if (changedUsername) {
+            QString completeName = user.firstName() + " " + user.lastName();
+            Q_EMIT dialogTitleUpdated(user.id(), completeName);
+            notifySecretChatsTitleUpdated(user.id(), completeName);
+        }
+
         Q_EMIT userInfo(contactItem);
     }
 
@@ -2094,6 +2108,26 @@
     Q_EMIT chatUpdated(update.chatId());
 }
 
+void Data::processUpdateUserName(const Update &update) {
+    qint32 userId = update.userId();
+    QString firstName = update.firstName();
+    QString lastName = update.lastName();
+    if (updateUserName(userId, firstName, lastName)) {
+        Q_EMIT contactNameUpdated(userId, firstName, lastName);
+
+        QString completeName = firstName + " " + lastName;
+        Q_EMIT dialogTitleUpdated(userId, completeName);
+        notifySecretChatsTitleUpdated(userId, completeName);
+    }
+}
+
+void Data::processUpdateUserPhoto(const Update &update) {
+    qint32 userId = update.userId();
+    const FileLocation &photoToDownload = update.photo().photoSmall();
+    bool isUserPhoto = true;
+    getProfilePhotoFileFromServer(photoToDownload, userId, isUserPhoto);
+}
+
 bool Data::processUpdate(const Update &update, const QList<User> &users, const QList<Chat> &chats) {
     // FIXME Users and Chats code blocks repeated in onUpdatesGetDifferenceAnswer.
     mDbManager.beginTransaction();
@@ -2103,6 +2137,8 @@
             qCCritical(TG_PLUGIN_LOGIC) << "Error updating user in database while processing an update";
             return false;
         }
+        // request user photo if it has changed
+        getProfilePhotoFileFromServer(user.photo().photoSmall(), user.id(), true);
     }
     Q_FOREACH (const Chat &chat, chats) {
         if (!insertOrUpdateChat(chat)) {
@@ -2155,6 +2191,12 @@
         Q_EMIT userTyping(update.chatId());
         break;
     }
+    case Update::typeUpdateUserName:
+        processUpdateUserName(update);
+        break;
+    case Update::typeUpdateUserPhoto:
+        processUpdateUserPhoto(update);
+        break;
     case Update::typeUpdateNewMessage: {
 
         Message message = update.message();
@@ -2289,9 +2331,6 @@
         }
         break;
     }
-
-//        case Update::typeUpdateUserTyping: { ModelsManager::instance()->dialogsModel().setIsTyping(update.userId(), update.userId()); break; }
-//        case Update::typeUpdateChatUserTyping: { ModelsManager::instance()->dialogsModel().setIsTyping(update.chatId(), update.userId()); break; }
     }
 
         // FIXME for those other updates that don't call it yet:
@@ -2314,6 +2353,20 @@
     }
 }
 
+void Data::notifySecretChatsThumbnailUpdated(qint32 userId, const QString &filePath) {
+    QList<qint32> userSecretChats = getUserSecretChats(userId);
+    Q_FOREACH (qint32 secretChatId, userSecretChats) {
+        Q_EMIT dialogThumbnailUpdated(secretChatId, filePath);
+    }
+}
+
+void Data::notifySecretChatsTitleUpdated(qint32 userId, const QString &title) {
+    QList<qint32> userSecretChats = getUserSecretChats(userId);
+    Q_FOREACH (qint32 secretChatId, userSecretChats) {
+        Q_EMIT dialogTitleUpdated(secretChatId, title);
+    }
+}
+
 bool Data::getProfilePhotoFileFromServer(const FileLocation &photoToDownload, qint32 id, bool isUser) {
 
     if (photoToDownload.classType() != FileLocation::typeFileLocationUnavailable) {
@@ -2322,7 +2375,7 @@
         // received ones. In that case don't download cos it's the same file
         QSqlQuery query(mDbManager.database());
 
-        QString queryString("SELECT dcId, localId, secret, volumeId FROM fileLocations,%1 "
+        QString queryString("SELECT localPath, dcId, localId, secret, volumeId FROM fileLocations,%1 "
                             "WHERE %1.thumbnail=fileLocations.rowid AND %1.id=:id");
         if (isUser) {
             queryString = queryString.arg("users");
@@ -2337,17 +2390,21 @@
             return false;
         }
 
+        // Don't download if server location data is same as db and local path is not empty
         if (query.next()) {
-            qint32 dcId = query.value("dcId").toInt();
-            qint32 localId = query.value("localId").toInt();
-            qint64 secret = query.value("secret").toLongLong();
-            qint64 volumeId = query.value("volumeId").toLongLong();
+            QString localPath = query.value("localPath").toString();
+            if (!localPath.isEmpty()) {
+                qint32 dcId = query.value("dcId").toInt();
+                qint32 localId = query.value("localId").toInt();
+                qint64 secret = query.value("secret").toLongLong();
+                qint64 volumeId = query.value("volumeId").toLongLong();
 
-            if (dcId == photoToDownload.dcId() &&
-                    localId == photoToDownload.localId() &&
-                    secret == photoToDownload.secret() &&
-                    volumeId == photoToDownload.volumeId()) {
-                return false;
+                if (dcId == photoToDownload.dcId() &&
+                        localId == photoToDownload.localId() &&
+                        secret == photoToDownload.secret() &&
+                        volumeId == photoToDownload.volumeId()) {
+                    return false;
+                }
             }
         }
 
@@ -3075,7 +3132,7 @@
 
     QSqlQuery query(mDbManager.database());
 
-    query.prepare("SELECT dialogId, fromId, toId, toIsChat, out, sent, unread, date, text, mediaType, "
+    query.prepare("SELECT dialogId, fromId, toId, toIsChat, out, sent, unread, date, ttl, text, mediaType, "
                   "(SELECT localPath FROM fileLocations, photoSizes WHERE fileLocations.rowid=fileLocationId AND "
                       "photoId=mediaId AND (type='s' OR type='m') ORDER BY size DESC LIMIT 1) AS photoSmall, "
                   "(SELECT localPath FROM fileLocations, photoSizes WHERE fileLocations.rowid=fileLocationId AND "
@@ -3112,6 +3169,7 @@
         bool out = query.value("out").toBool();
         bool sent = query.value("sent").toBool();
         bool unread = query.value("unread").toBool();
+        qint32 ttl = query.value("ttl").toInt();
         qint32 date = query.value("date").toInt();
         QString text = query.value("text").toString();
         qint32 mediaType = query.value("mediaType").toInt();
@@ -3144,6 +3202,7 @@
         messageItem.setOut(out);
         messageItem.setSent(sent);
         messageItem.setUnread(unread);
+        messageItem.setTtl(ttl);
         messageItem.setDate(date);
         messageItem.setMessage(text);
         MessageMedia media((MessageMedia::MessageMediaType)mediaType);
@@ -3988,8 +4047,8 @@
         }
     }
 
-    query.prepare("INSERT INTO messages (id, dialogId, randomId, fromId, toId, toIsChat, out, unread, date, text, mediaType, mediaId, sent) "
-                  "VALUES (:id, :dialogId, :randomId, :fromId, :toId, :toIsChat, :out, :unread, :date, :text, :mediaType, :mediaId, :sent)");
+    query.prepare("INSERT INTO messages (id, dialogId, randomId, fromId, toId, toIsChat, out, unread, date, ttl, text, mediaType, mediaId, sent) "
+                  "VALUES (:id, :dialogId, :randomId, :fromId, :toId, :toIsChat, :out, :unread, :date, :ttl, :text, :mediaType, :mediaId, :sent)");
     query.bindValue(":id", message.id());
     query.bindValue(":dialogId", dialogId);
     query.bindValue(":randomId", randomId);
@@ -3999,6 +4058,7 @@
     query.bindValue(":out", message.out());
     query.bindValue(":unread", message.unread());
     query.bindValue(":date", message.date());
+    query.bindValue(":ttl", message.ttl());
     query.bindValue(":text", message.message());
     query.bindValue(":mediaType", mediaType);
     query.bindValue(":mediaId", mediaId);
@@ -4436,6 +4496,26 @@
     return result;
 }
 
+QList<qint32> Data::getUserSecretChats(qint32 userId) {
+
+    QList<qint32> secretChats;
+
+    QSqlQuery query(mDbManager.database());
+
+    query.prepare("SELECT id FROM secretChats WHERE peerId=:userId");
+    query.bindValue(":userId", userId);
+    if (!query.exec()) {
+        qCCritical(TG_PLUGIN_LOGIC) << "Could not get user secret chats" << query.lastQuery() << query.lastError();
+        return secretChats;
+    }
+
+    while (query.next()) {
+        secretChats << query.value("id").toInt();
+    }
+
+    return secretChats;
+}
+
 bool Data::isContact(qint32 userId) {
 
     QSqlQuery query(mDbManager.database());
@@ -4448,6 +4528,7 @@
     if (!updateUser(user)) {
         return insertUser(user);
     }
+
     return true;
 }
 
@@ -4502,6 +4583,23 @@
     return query.numRowsAffected() > 0;
 }
 
+bool Data::updateUserName(qint32 userId, const QString &firstName, const QString &lastName) {
+
+    QSqlQuery query(mDbManager.database());
+    query.prepare("UPDATE users SET firstName=:firstName, lastName=:lastName WHERE id=:id");
+    query.bindValue(":firstName", firstName);
+    query.bindValue(":lastName", lastName);
+    query.bindValue(":id", userId);
+
+    if (!query.exec()) {
+        qCCritical(TG_PLUGIN_LOGIC) << "Could not update user name for userId" << userId
+                                    << query.lastError() << query.lastQuery();
+        return false;
+    }
+
+    return query.numRowsAffected() > 0;
+}
+
 bool Data::updateUserIsContact(qint32 userId, bool isContact, bool hasPhone) {
 
     qint32 type = User::typeUserContact;
@@ -4555,6 +4653,28 @@
     return true;
 }
 
+bool Data::hasChangedUsername(const User &user) {
+
+    QSqlQuery query(mDbManager.database());
+
+    query.prepare("SELECT firstName, lastName FROM users WHERE id=:id");
+    query.bindValue(":id", user.id());
+    if (!query.exec()) {
+        qCCritical(TG_PLUGIN_LOGIC) << "Could not check if name has changed for user" << user.id()
+                                    << query.lastError() << query.lastQuery();
+        return false;
+    }
+
+    if (query.next()) {
+        QString firstName = query.value("firstName").toString();
+        QString lastName = query.value("lastName").toString();
+
+        return user.firstName() != firstName || user.lastName() != lastName;
+    }
+
+    return false;
+}
+
 // CHATs operations
 DialogItem Data::getChat(qint32 id) {
     DialogItem dialog;

=== modified file 'qmlplugin/data.h'
--- qmlplugin/data.h	2015-02-04 22:36:12 +0000
+++ qmlplugin/data.h	2015-02-17 13:31:13 +0000
@@ -72,10 +72,13 @@
     bool insertOrUpdateUser(const User &user);
     bool insertUser(const User &user);
     bool updateUser(const User &user);
+    bool updateUserName(qint32 userId, const QString &firstName, const QString &lastName);
     bool updateUserIsContact(qint32 userId, bool isContact, bool hasPhone);
     bool deleteUsers();
+    bool hasChangedUsername(const User &user);
     ContactItem getUser(qint32 id);
     QList<ContactItem> getUsers();
+    QList<qint32> getUserSecretChats(qint32 userId);
 
     // contacts operations
     bool isContact(qint32 userId);
@@ -191,6 +194,7 @@
     void chatUpdated(const qint32 chatId);
     void contactThumbnailUpdated(qint32 userId, const QString &thumbnail);
     void dialogThumbnailUpdated(qint32 dialogId, const QString &thumbnail);
+    void contactNameUpdated(qint32 userId, const QString &firstName, const QString lastName);
     void dialogTitleUpdated(qint32 dialogId, const QString &title);
     void dialogMuted(qint32 dialogId, bool muted);
     void dialogsMuted(NotifyPeer::NotifyPeerType notifyType, bool muted);
@@ -287,8 +291,13 @@
     // process notifications to update db and models
     void updateChatParticipantsFromUpdate(const Update &update);
     bool processUpdate(const Update &update, const QList<User> &users = QList<User>(), const QList<Chat> &chats =  QList<Chat>());
+    void processUpdateUserName(const Update &update);
+    void processUpdateUserPhoto(const Update &update);
     bool needUpdateDifference(qint32 seq, UpdatesState clientState);
 
+    void notifySecretChatsThumbnailUpdated(qint32 userId, const QString &filePath);
+    void notifySecretChatsTitleUpdated(qint32 userId, const QString &title);
+
     // settings
     bool muteDialog(qint32 dialogId, bool muted);
     bool muteDialogs(NotifyPeer::NotifyPeerType peerType, bool muted);

=== modified file 'qmlplugin/models/messageitem.cpp'
--- qmlplugin/models/messageitem.cpp	2015-01-13 17:29:41 +0000
+++ qmlplugin/models/messageitem.cpp	2015-02-17 13:31:13 +0000
@@ -37,6 +37,7 @@
     setToId(*tlMessage->toId());
     setOut(tlMessage->out());
     setUnread(tlMessage->unread());
+    setTtl(messageItem.ttl());
     setDate(tlMessage->date());
     setMessage(tlMessage->message());
     setMedia(*tlMessage->media());
@@ -76,6 +77,7 @@
     setToId(msg.toId());
     setOut(msg.out());
     setUnread(msg.unread());
+    setTtl(msg.ttl());
     setDate(msg.date());
     setMessage(msg.message());
     setMedia(msg.media());
@@ -262,6 +264,7 @@
     qCDebug(TG_PLUGIN_LOGIC) << "OUT" << out();
     qCDebug(TG_PLUGIN_LOGIC) << "UNREAD" << unread();
     qCDebug(TG_PLUGIN_LOGIC) << "DATE" << date();
+    qCDebug(TG_PLUGIN_LOGIC) << "TTL" << ttl();
     qCDebug(TG_PLUGIN_LOGIC) << "TEXT" << text();
     qCDebug(TG_PLUGIN_LOGIC) << "MEDIA" << media()->classType();
     qCDebug(TG_PLUGIN_LOGIC) << "THUMBNAIL" << mThumbnail;

=== modified file 'qmlplugin/models/messageitem.h'
--- qmlplugin/models/messageitem.h	2014-12-12 08:18:18 +0000
+++ qmlplugin/models/messageitem.h	2015-02-17 13:31:13 +0000
@@ -33,6 +33,7 @@
     Q_PROPERTY(qint32 fromUserType READ fromUserType NOTIFY fromUserTypeChanged)
     Q_PROPERTY(qint32 toId READ toId NOTIFY toIdChanged)
     Q_PROPERTY(bool toIsChat READ toIsChat NOTIFY toIsChatChanged)
+    Q_PROPERTY(qint32 ttl READ ttl NOTIFY ttlChanged)
     Q_PROPERTY(QString text READ text NOTIFY textChanged)
     Q_PROPERTY(qint32 mediaType READ mediaType NOTIFY mediaTypeChanged)
     Q_PROPERTY(QString thumbnail READ thumbnail NOTIFY thumbnailChanged)
@@ -105,6 +106,7 @@
     void fromUserTypeChanged(qint32);
     void toIdChanged(qint32);
     void toIsChatChanged(bool);
+    void ttlChanged(qint32);
     void textChanged(QString);
     void mediaTypeChanged(qint32);
     void thumbnailChanged(QString);

=== modified file 'qmlplugin/models/messagesmodel.cpp'
--- qmlplugin/models/messagesmodel.cpp	2015-02-04 21:49:12 +0000
+++ qmlplugin/models/messagesmodel.cpp	2015-02-17 13:31:13 +0000
@@ -296,6 +296,7 @@
     roles[UnreadRole] = "unread";
     roles[SectionDateRole] = "sectionDate";
     roles[DateRole] = "date";
+    roles[TtlRole] = "ttl";
     roles[TextRole] = "text";
     roles[MediaTypeRole] = "mediaType";
     roles[PhotoRole] = "photo";
@@ -375,6 +376,9 @@
     case DateRole:
         return message.date();
         break;
+    case TtlRole:
+        return message.ttl();
+        break;
     case TextRole:
         result = message.text();
         break;

=== modified file 'qmlplugin/models/messagesmodel.h'
--- qmlplugin/models/messagesmodel.h	2015-02-04 09:37:32 +0000
+++ qmlplugin/models/messagesmodel.h	2015-02-17 13:31:13 +0000
@@ -47,6 +47,7 @@
         SentRole,
         SectionDateRole,
         DateRole,
+        TtlRole,
         TextRole,
         MediaTypeRole,
         PhotoRole,

=== modified file 'qmlplugin/models/messagesview.cpp'
--- qmlplugin/models/messagesview.cpp	2015-01-07 11:02:41 +0000
+++ qmlplugin/models/messagesview.cpp	2015-02-17 13:31:13 +0000
@@ -39,6 +39,7 @@
                 "       out,\n"
                 "       sent,\n"
                 "       unread,\n"
+                "       ttl,\n"
                 "       date,\n"
                 "       text,\n"
                 "       mediaType,\n"
@@ -79,7 +80,7 @@
 
     QList<MessageItem> messages;
 
-    mQuery.prepare(QString("SELECT id, fromId, toId, toIsChat, out, unread, sent, date, text, mediaType, fromFirstName, "
+    mQuery.prepare(QString("SELECT id, fromId, toId, toIsChat, out, unread, sent, date, ttl, text, mediaType, fromFirstName, "
                            "fromLastName, fromPhone, fromThumbnail, fromUserType, photoSmall, photoBigLocal, photoBigRemote, "
                            "video, actionType, actionTitle, actionUser "
                            "FROM messagesView_%1 LIMIT %2 OFFSET %3")
@@ -105,6 +106,7 @@
         bool unread = mQuery.value("unread").toBool();
         bool sent = mQuery.value("sent").toBool();
         qint32 date = mQuery.value("date").toInt();
+        qint32 ttl = mQuery.value("ttl").toInt();
         QString text = mQuery.value("text").toString();
         qint32 mediaType = mQuery.value("mediaType").toInt();
         QString photoSmall = mQuery.value("photoSmall").toString();
@@ -132,6 +134,7 @@
         message.setUnread(unread);
         message.setSent(sent);
         message.setDate(date);
+        message.setTtl(ttl);
         message.setMessage(text);
         MessageMedia media((MessageMedia::MessageMediaType)mediaType);
         message.setMedia(media);

=== modified file 'qmlplugin/telegramservice.cpp'
--- qmlplugin/telegramservice.cpp	2015-02-06 10:19:34 +0000
+++ qmlplugin/telegramservice.cpp	2015-02-17 13:31:13 +0000
@@ -152,6 +152,7 @@
 void TelegramService::onWoken() {
     mTelegramLib->updatesGetState();
     mSelfDestructTimer.start();
+    updateUserProfiles();
     Q_EMIT woken();
 }
 
@@ -191,6 +192,10 @@
             SIGNAL(openChat()));
 
     connect(mTelegramLib,
+            SIGNAL(usersGetUsersAnswer(qint64,QList<User>)),
+            &mData,
+            SLOT(onUsersGetUsersAnswer(qint64,QList<User>)));
+    connect(mTelegramLib,
             SIGNAL(messagesGetDialogsAnswer(qint64,qint32,QList<Dialog>,QList<Message>,QList<Chat>,QList<User>)),
             &mData,
             SLOT(onMessagesGetDialogsAnswer(qint64,qint32,QList<Dialog>,QList<Message>,QList<Chat>,QList<User>)));
@@ -338,6 +343,7 @@
             SLOT(onUpdateSecretChatMessage(SecretChatMessage,qint32)));
 
     mTelegramLib->updatesGetState();
+    updateUserProfiles();
 }
 
 void TelegramService::onAuthLoggedOut() {
@@ -622,6 +628,16 @@
     return mTelegramLib->accountUpdateNotifySettings(inputNotifyPeer, settings);
 }
 
+void TelegramService::updateUserProfiles() {
+    // Get all the users info to update db when started up
+    QList<ContactItem> contacts = mData.getUsers();
+    QList<InputUser> inputUsers;
+    Q_FOREACH (const ContactItem &contact, contacts) {
+        inputUsers << Tools::toInputUser(contact);
+    }
+    mTelegramLib->usersGetUsers(inputUsers);
+}
+
 qint64 TelegramService::createSecretChat(qint32 userId) {
     ContactItem user = mData.getUser(userId);
     InputUser inputUser = Tools::toInputUser(user);

=== modified file 'qmlplugin/telegramservice.h'
--- qmlplugin/telegramservice.h	2015-02-03 19:23:45 +0000
+++ qmlplugin/telegramservice.h	2015-02-17 13:31:13 +0000
@@ -156,6 +156,7 @@
 
     QString copyToDownloadsPath(const QString &file);
     qint64 updateMuteUntilSetting(qint32 peerId, qint32 muteUntil);
+    void updateUserProfiles();
 
 private Q_SLOTS:
     void onMessagesAddChatUserAnswer(qint64 id, const Message &message, const QList<Chat> &chats, const QList<User> &users, const QList<ContactsLink> &links, qint32 pts, qint32 seq);

=== modified file 'qmlplugin/types/tlmessage.h'
--- qmlplugin/types/tlmessage.h	2014-08-18 18:49:11 +0000
+++ qmlplugin/types/tlmessage.h	2015-02-17 13:31:13 +0000
@@ -68,6 +68,7 @@
         setFromId(s->fromId());
         setOut(s->out());
         setDate(s->date());
+        setTtl(s->ttl());
         setMedia(s->media());
         setFwdDate(s->fwdDate());
         setFwdFromId(s->fwdFromId());