adasauce
/
nheko
forked from mirror/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Windows build

Browse Source
remotes/origin/HEAD
Konstantinos Sideris 7 years ago
parent 888700743a
commit c4613b210e
4 changed files with 114 additions and 121 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      include/Olm.hpp
  2. 9
      src/Olm.cpp
  3. 40
      src/notifications/ManagerLinux.cpp
  4. 38
      src/notifications/ManagerWin.cpp

2
include/Olm.hpp
Unescape View File

@ -41,7 +41,7 @@ client();
void
handle_to_device_messages(const std::vector<nlohmann::json> &msgs);
boost::optional<json>
nlohmann::json
try_olm_decryption(const std::string &sender_key,
const mtx::events::msg::OlmCipherContent &content);

9
src/Olm.cpp
Unescape View File

@ -90,9 +90,9 @@ handle_olm_message(const OlmMessage &msg)
auto payload = try_olm_decryption(msg.sender_key, cipher.second);
if (payload) {
nhlog::crypto()->info("decrypted olm payload: {}", payload.value().dump(2));
create_inbound_megolm_session(msg.sender, msg.sender_key, payload.value());
if (!payload.is_null()) {
nhlog::crypto()->info("decrypted olm payload: {}", payload.dump(2));
create_inbound_megolm_session(msg.sender, msg.sender_key, payload);
return;
}
@ -184,7 +184,7 @@ encrypt_group_message(const std::string &room_id,
return data;
}
boost::optional<json>
nlohmann::json
try_olm_decryption(const std::string &sender_key, const mtx::events::msg::OlmCipherContent &msg)
{
auto session_ids = cache::client()->getOlmSessions(sender_key);
@ -203,7 +203,6 @@ try_olm_decryption(const std::string &sender_key, const mtx::events::msg::OlmCip
try {
text = olm::client()->decrypt_message(session->get(), msg.type, msg.body);
cache::client()->saveOlmSession(id, std::move(session.value()));
} catch (const olm_exception &e) {
nhlog::crypto()->info("failed to decrypt olm message ({}, {}) with {}: {}",
msg.type,

40
src/notifications/ManagerLinux.cpp
Unescape View File

@ -1,15 +1,14 @@
#include "notifications/Manager.h"
#include <QImage>
#include <QDebug>
#include <QImage>
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage>
#include <QtDBus/QDBusMetaType>
#include <QtDBus/QDBusConnection>
NotificationsManager::NotificationsManager(QObject *parent) :
QObject(parent),
dbus(
"org.freedesktop.Notifications",
NotificationsManager::NotificationsManager(QObject *parent)
: QObject(parent)
, dbus("org.freedesktop.Notifications",
"/org/freedesktop/Notifications",
"org.freedesktop.Notifications",
QDBusConnection::sessionBus(),
@ -17,17 +16,13 @@ NotificationsManager::NotificationsManager(QObject *parent) :
{
qDBusRegisterMetaType<QImage>();
//connectSlot("ActionInvoked", SLOT(actionInvoked(uint, QString)));
//connectSlot("NotificationClosed", SLOT(notificationClosed(uint, uint)));
QDBusConnection::sessionBus().connect(
"org.freedesktop.Notifications",
QDBusConnection::sessionBus().connect("org.freedesktop.Notifications",
"/org/freedesktop/Notifications",
"org.freedesktop.Notifications",
"ActionInvoked",
this,
SLOT(actionInvoked(uint, QString)));
QDBusConnection::sessionBus().connect(
"org.freedesktop.Notifications",
QDBusConnection::sessionBus().connect("org.freedesktop.Notifications",
"/org/freedesktop/Notifications",
"org.freedesktop.Notifications",
"NotificationClosed",
@ -53,7 +48,9 @@ NotificationsManager::postNotification(const QString &roomid,
* Licensed under the GNU General Public License, version 3
*/
uint
NotificationsManager::showNotification(const QString summary, const QString text, const QImage image)
NotificationsManager::showNotification(const QString summary,
const QString text,
const QImage image)
{
QVariantMap hints;
hints["image_data"] = image;
@ -67,14 +64,11 @@ NotificationsManager::showNotification(const QString summary, const QString text
argumentList << hints; // hints
argumentList << (int)0; // timeout in ms
static QDBusInterface notifyApp(
"org.freedesktop.Notifications",
static QDBusInterface notifyApp("org.freedesktop.Notifications",
"/org/freedesktop/Notifications",
"org.freedesktop.Notifications");
QDBusMessage reply = notifyApp.callWithArgumentList(
QDBus::AutoDetect,
"Notify",
argumentList);
QDBusMessage reply =
notifyApp.callWithArgumentList(QDBus::AutoDetect, "Notify", argumentList);
if (reply.type() == QDBusMessage::ErrorMessage) {
qDebug() << "D-Bus Error:" << reply.errorMessage();
return 0;
@ -109,7 +103,9 @@ NotificationsManager::notificationClosed(uint id, uint reason)
*
* Copyright 2010, David Sansome <me@davidsansome.com>
*/
QDBusArgument& operator<<(QDBusArgument& arg, const QImage& image) {
QDBusArgument &
operator<<(QDBusArgument &arg, const QImage &image)
{
if (image.isNull()) {
arg.beginStructure();
arg << 0 << 0 << 0 << false << 0 << 0 << QByteArray();
@ -151,7 +147,9 @@ QDBusArgument& operator<<(QDBusArgument& arg, const QImage& image) {
return arg;
}
const QDBusArgument& operator>>(const QDBusArgument& arg, QImage&) {
const QDBusArgument &
operator>>(const QDBusArgument &arg, QImage &)
{
// This is needed to link but shouldn't be called.
Q_ASSERT(0);
return arg;

38
src/notifications/ManagerWin.cpp
Unescape View File

@ -27,43 +27,39 @@ init()
}
}
NotificationsManager::NotificationsManager(QObject *parent): QObject(parent)
{
}
NotificationsManager::NotificationsManager(QObject *parent)
: QObject(parent)
{}
void
NotificationsManager::postNotification(const QString &, //roomid
const QString &, //eventid
const QString &roomname,
NotificationsManager::postNotification(const QString &room_id,
const QString &event_id,
const QString &room_name,
const QString &sender,
const QString &text,
const QImage &) //icon
const QImage &icon)
{
Q_UNUSED(room_id)
Q_UNUSED(event_id)
Q_UNUSED(icon)
if (!isInitialized)
init();
auto templ = WinToastTemplate(WinToastTemplate::ImageAndText02);
if (roomname != sender)
templ.setTextField(QString("%1 - %2").arg(sender).arg(roomname).toStdWString(),
if (room_name != sender)
templ.setTextField(QString("%1 - %2").arg(sender).arg(room_name).toStdWString(),
WinToastTemplate::FirstLine);
else
templ.setTextField(QString("%1").arg(user).toStdWString(),
templ.setTextField(QString("%1").arg(sender).toStdWString(),
WinToastTemplate::FirstLine);
templ.setTextField(QString("%1").arg(msg).toStdWString(), WinToastTemplate::SecondLine);
templ.setTextField(QString("%1").arg(text).toStdWString(), WinToastTemplate::SecondLine);
// TODO: implement room or user avatar
// templ.setImagePath(L"C:/example.png");
WinToast::instance()->showToast(templ, new CustomHandler());
}
//unused
void
NotificationsManager::actionInvoked(uint, QString)
{
}
void NotificationsManager::actionInvoked(uint, QString) {}
void
NotificationsManager::notificationClosed(uint, uint)
{
}
void NotificationsManager::notificationClosed(uint, uint) {}

Write Preview
Loading…
Cancel
Save