Merge lp:~cellsoftware/telegram-app/1517626 into lp:telegram-app

[Paz Chauhan]

The following changes need to be made in the library:

In telegram.cpp (found in deps/libqtelegram-ae) change method messagesCreateEncryptedChat to the following:

qint64 Telegram::messagesCreateEncryptedChat(const InputUser &user) {

    qCDebug(TG_LIB_SECRET) << "creating new encrypted chat";
    // generate a new object where store all the needed secret chat data
    SecretChat *secretChat = new SecretChat(prv->mSettings);
    secretChat->setAdminId(prv->mSettings->ourId());
    secretChat->setParticipantId(user.userId());
    secretChat->setRequestedUser(user);
    return generateGAorB(secretChat);
}

In telegramqml.cpp (found in deps/TelegramQML) change method refreshSecretChats to the following:

void TelegramQml::refreshSecretChats()
{
    if(!p->tsettings)
        return;

    const QList<SecretChat*> &secrets = p->tsettings->secretChats();
    Q_FOREACH(SecretChat *sc, secrets)
    {

        EncryptedChat chat(EncryptedChat::typeEncryptedChat);

        if (sc->date() == 0)
            chat.setClassType(EncryptedChat::typeEncryptedChatWaiting);

        chat.setAccessHash(sc->accessHash());
        chat.setAdminId(sc->adminId());
        chat.setDate(sc->date());
        chat.setGAOrB(sc->gAOrB());
        chat.setId(sc->chatId());
        chat.setKeyFingerprint(sc->keyFingerprint());
        chat.setParticipantId(sc->participantId());

        insertEncryptedChat(chat);
    }
}

[lp:~cellsoftware/telegram-app/1517626]

204. By Paz Chauhan on 2016-06-15

State change to Chat Waiting commented out

205. By Paz Chauhan on 2016-06-15

State change to Chat Waiting code uncommented

206. By Paz Chauhan on 2016-06-15

.po and .pot files reverted

Unmerged revisions

206. By Paz Chauhan on 2016-06-15

.po and .pot files reverted

205. By Paz Chauhan on 2016-06-15

State change to Chat Waiting code uncommented

204. By Paz Chauhan on 2016-06-15

State change to Chat Waiting commented out

203. By Paz Chauhan on 2016-06-10

.po and .pot files reverted

202. By Paz Chauhan on 2016-06-10

Changes made in the library, back-end and QML layers

=== modified file 'telegram/app/qml/components/DialogsListItem.qml'
--- telegram/app/qml/components/DialogsListItem.qml	2016-05-16 06:52:04 +0000
+++ telegram/app/qml/components/DialogsListItem.qml	2016-06-15 12:11:27 +0000
@@ -41,6 +41,7 @@
     // in delegate -- selected: currentDialog == dialog
     property bool selected: false
 
+    property real typeMessageActionEmpty:               0xb6aef7b0
     property real typeMessageActionChatCreate:          0xa6638b9a
     property real typeMessageActionChatAddUser:         0x5e3cfc4b
     property real typeMessageActionChatDeleteUser:      0xb2ae9b0c
@@ -250,6 +251,10 @@
                                 res = i18n.tr("<font color=\"DarkBlue\">%1 joined the group via invite link</font>").arg(fromUserName)
                             break
 
+                        case typeMessageActionEmpty:
+                            res = i18n.tr("<font color=\"DarkBlue\">%1 is currently offline</font>").arg(title);
+                            break;
+
                         default:
                             break
                     }