forked from blue/squawk
encrypted messages now are displayed in the feed
This commit is contained in:
parent
637eb702a8
commit
0a530bfa93
34 changed files with 439 additions and 245 deletions
|
@ -117,9 +117,8 @@ bool Core::MessageHandler::handleChatMessage(const QXmppMessage& msg, bool outgo
|
|||
qDebug() << "appending message" << sMsg.getId() << "to an out of roster contact";
|
||||
}
|
||||
if (sMsg.getOutgoing()) {
|
||||
if (sMsg.getForwarded()) {
|
||||
if (sMsg.getForwarded())
|
||||
sMsg.setState(Shared::Message::State::sent);
|
||||
}
|
||||
} else {
|
||||
sMsg.setState(Shared::Message::State::delivered);
|
||||
}
|
||||
|
@ -208,6 +207,12 @@ void Core::MessageHandler::initializeMessage(Shared::Message& target, const QXmp
|
|||
target.setTo(source.to());
|
||||
target.setBody(source.body());
|
||||
target.setForwarded(forwarded);
|
||||
#ifdef WITH_OMEMO
|
||||
#if (QXMPP_VERSION) >= QT_VERSION_CHECK(1, 5, 0)
|
||||
if (source.encryptionMethod() == QXmpp::EncryptionMethod::Omemo2)
|
||||
target.setEncryption(Shared::EncryptionProtocol::omemo2);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if (guessing)
|
||||
outgoing = target.getFromJid() == acc->getBareJid();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue