Merge lp:~libqtelegram-team/telegram-app/app-crash-secret-chat-accepted into lp:telegram-app/dev

[Roberto Mier Escandon]

Stored priv key in settings and loading it when app starts up. This lets secret chat not created yet having that private key to finish the shared key creation if needed (when the peer was offline when we sent the chat creation request and accepts the chat creation after we have shutdown + started again the app)

Tested:

With current app-dev branch in ubuntu, and having the peer on Android:

- Put peer in flight mode
- Send a request of a new secret chat from ubuntu to android
- Stopped Tg
- Started Tg
- Peer flight mode off (secret chat is accepted and created on android)
- Checked that the secret chat is created also in ubuntu and can be used

Second test
- Put peer in flight mode
- Send a request of a new secret chat from ubuntu to android
- Stopped Tg
- Peer flight mode off (secret chat is accepted and created on android)
- Started Tg
- Checked that the secret chat is created on ubuntu and can be used

=== modified file 'lib/core/settings.cpp'
--- lib/core/settings.cpp	2015-01-28 10:19:49 +0000
+++ lib/core/settings.cpp	2015-02-04 16:03:39 +0000
@@ -29,6 +29,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <openssl/bn.h>
+
 Q_LOGGING_CATEGORY(TG_INIT_SETTINGS, "tg.init.settings")
 
 Settings::Settings() :
@@ -214,9 +216,17 @@
         secretChat->setAdminId(settings.value(ST_ADMIN_ID, 0).toInt());
         secretChat->setParticipantId(settings.value(ST_PARTICIPANT_ID, 0).toInt());
         secretChat->setDate(settings.value(ST_DATE, 0).toInt());
+        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);
+
+        QByteArray base64Mk = settings.value(ST_MY_KEY).toByteArray();
+        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());
         secretChat->setOutSeqNo(settings.value(ST_OUT_SEQ_NO, 0).toInt());
@@ -250,8 +260,15 @@
         settings.setValue(ST_ADMIN_ID, secretChat->adminId());
         settings.setValue(ST_PARTICIPANT_ID, secretChat->participantId());
         settings.setValue(ST_DATE, secretChat->date());
+        settings.setValue(ST_STATE, secretChat->state());
+
+        BIGNUM *myKey = secretChat->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());
+
         settings.setValue(ST_LAYER, secretChat->layer());
         settings.setValue(ST_IN_SEQ_NO, secretChat->inSeqNo());
         settings.setValue(ST_OUT_SEQ_NO, secretChat->outSeqNo());

=== modified file 'lib/core/settings.h'
--- lib/core/settings.h	2015-01-28 10:19:49 +0000
+++ lib/core/settings.h	2015-02-04 16:03:39 +0000
@@ -66,6 +66,8 @@
 #define ST_LAYER "layer"
 #define ST_IN_SEQ_NO "inSeqNo"
 #define ST_OUT_SEQ_NO "outSeqNo"
+#define ST_STATE "state"
+#define ST_MY_KEY "myKey"
 
 #define DEFAULT_CONFIG_PATH "~/.libqtelegram"
 #define DEFAULT_PUBLIC_KEY_FILE "qtelegram.pub"

=== modified file 'lib/secret/secretchat.cpp'
--- lib/secret/secretchat.cpp	2015-01-30 14:24:53 +0000
+++ lib/secret/secretchat.cpp	2015-02-04 16:03:39 +0000
@@ -90,6 +90,11 @@
     return mMyKey;
 }
 
+void SecretChat::setMyKey(BIGNUM *myKey) {
+    BN_clear_free(mMyKey);
+    mMyKey = BN_dup(myKey);
+}
+
 qint64 SecretChat::keyFingerprint() {
     if (!mKeyFingerprint) {
         mKeyFingerprint = Utils::getKeyFingerprint(mSharedKey);

=== modified file 'lib/secret/secretchat.h'
--- lib/secret/secretchat.h	2015-01-28 15:50:32 +0000
+++ lib/secret/secretchat.h	2015-02-04 16:03:39 +0000
@@ -77,6 +77,7 @@
     void setParticipantId(qint32 participantId);
     void setDate(qint32 date);
     void setGAOrB(QByteArray gAOrB);
+    void setMyKey(BIGNUM *myKey);
     void setKeyFingerprint(qint64 keyFingerprint);
     void setLayer(qint32 layer);
     void setInSeqNo(qint32 inSeqNo);

=== modified file 'lib/telegram.cpp'
--- lib/telegram.cpp	2015-02-03 19:13:26 +0000
+++ lib/telegram.cpp	2015-02-04 16:03:39 +0000
@@ -536,6 +536,7 @@
     }
 
     BN_free(r);
+    mSecretState.save();
 }
 
 void Telegram::onMessagesRequestEncryptionEncryptedChat(qint64, const EncryptedChat &chat) {
@@ -722,7 +723,10 @@
             qCDebug(TG_LIB_SECRET) << "received keyFingerprint:" << keyFingerprint;
 
             SecretChat *secretChat = mSecretState.chats().value(chatId);
-            ASSERT(secretChat);
+            if (!secretChat) {
+                qCWarning(TG_LIB_SECRET) << "Could not find secret chat with id" << chatId;
+                return;
+            }
 
             createSharedKey(secretChat, mSecretState.p(), gB);