Merge pull request #701 from meganz/fix/newmsg-invalid-keyxid

#12664. Fix invalid keyxid for new messages
meganz · Jul 15, 2019 · fca7b4c · fca7b4c
2 parents 05040c4 + d510f7a
commit fca7b4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/chatd.cpp b/src/chatd.cpp
@@ -3697,6 +3697,7 @@ void Chat::keyConfirm(KeyId keyxid, KeyId keyid)
             msg->keyid = keyid;
             delete item.keyCmd;
             item.keyCmd = NULL;
+            item.msgCmd->setKeyId(keyid);
             count++;
         }
     }

diff --git a/src/chatdDb.h b/src/chatdDb.h
@@ -220,8 +220,7 @@ class ChatdSqliteDb: public chatd::DbInterface
             // if message was already encrypted, restore the MsgCommand
             if (stmt.hasBlobCol(11))
             {
-                chatd::KeyId chatdKeyid = (keyid < 0xffff0001) ? keyid : CHATD_KEYID_UNCONFIRMED;
-                chatd::MsgCommand *msgCmd = new chatd::MsgCommand(opcode, mChat.chatId(), userid, msgid, ts, updated, chatdKeyid);
+                chatd::MsgCommand *msgCmd = new chatd::MsgCommand(opcode, mChat.chatId(), userid, msgid, ts, updated, keyid);
                 Buffer buf;
                 stmt.blobCol(11, buf);
                 msgCmd->setMsg(buf.buf(), buf.dataSize());