forked from blue/squawk
some work towards encryption
This commit is contained in:
parent
297e08ba41
commit
a7d1a28f29
21 changed files with 129 additions and 81 deletions
|
@ -50,6 +50,7 @@ Application::Application(Core::Squawk* p_core):
|
|||
connect(this, &Application::replaceMessage, core, &Core::Squawk::replaceMessage);
|
||||
connect(this, &Application::sendMessage, core, &Core::Squawk::sendMessage);
|
||||
connect(this, &Application::resendMessage, core, &Core::Squawk::resendMessage);
|
||||
connect(this, &Application::setEncryption, core, &Core::Squawk::setContactEncryption);
|
||||
connect(&roster, &Models::Roster::requestArchive,
|
||||
std::bind(&Core::Squawk::requestArchive, core, std::placeholders::_1, std::placeholders::_2, 20, std::placeholders::_3));
|
||||
|
||||
|
@ -526,6 +527,7 @@ void Application::subscribeConversation(Conversation* conv) {
|
|||
connect(conv, &Conversation::sendMessage, this, &Application::onConversationMessage);
|
||||
connect(conv, &Conversation::replaceMessage, this, &Application::onConversationReplaceMessage);
|
||||
connect(conv, &Conversation::resendMessage, this, &Application::onConversationResend);
|
||||
connect(conv, &Conversation::setEncryption, this, &Application::onConversationSetEncryption);
|
||||
connect(conv, &Conversation::notifyableMessage, this, &Application::notify);
|
||||
}
|
||||
|
||||
|
@ -586,6 +588,14 @@ void Application::onConversationReplaceMessage(const QString& originalId, const
|
|||
emit replaceMessage(acc, originalId, msg);
|
||||
}
|
||||
|
||||
void Application::onConversationSetEncryption(Shared::EncryptionProtocol value) {
|
||||
Conversation* conv = static_cast<Conversation*>(sender());
|
||||
QString acc = conv->getAccount();
|
||||
QString jid = conv->getJid();
|
||||
|
||||
emit setEncryption(acc, jid, value);
|
||||
}
|
||||
|
||||
void Application::onConversationResend(const QString& id) {
|
||||
Conversation* conv = static_cast<Conversation*>(sender());
|
||||
QString acc = conv->getAccount();
|
||||
|
|
|
@ -60,6 +60,7 @@ signals:
|
|||
void setRoomAutoJoin(const QString& account, const QString& jid, bool joined);
|
||||
void subscribeContact(const QString& account, const QString& jid, const QString& reason);
|
||||
void unsubscribeContact(const QString& account, const QString& jid, const QString& reason);
|
||||
void setEncryption(const QString& account, const QString& jid, Shared::EncryptionProtocol value);
|
||||
|
||||
void quitting();
|
||||
void readyToQuit();
|
||||
|
@ -101,6 +102,7 @@ private slots:
|
|||
void onItemExpanded(const QModelIndex& index);
|
||||
void onItemCollapsed(const QModelIndex& index);
|
||||
void onAddedElement(const std::list<QString>& path);
|
||||
void onConversationSetEncryption(Shared::EncryptionProtocol value);
|
||||
|
||||
private:
|
||||
void createMainWindow();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue