diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index f4d1c00e..22fe4d6d 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -16,12 +16,38 @@
#include "dialogs/ImageOverlay.h"
#include "emoji/EmojiModel.h"
#include "emoji/Provider.h"
-#include "../ui/UserProfile.h"
#include "src/ui/UserProfile.h"
#include "src/ui/UserProfileModel.h"
Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents)
+namespace msgs = mtx::events::msg;
+
+void
+DeviceVerificationList::add(QString tran_id)
+{
+ this->dv_list.push_back(tran_id);
+}
+void
+DeviceVerificationList::remove(QString tran_id)
+{
+ for (QVector<QString>::iterator it = 0; it != (this->dv_list).end(); ++it) {
+ if (*it == tran_id) {
+ this->dv_list.erase(it);
+ break;
+ }
+ }
+}
+bool
+DeviceVerificationList::exist(QString tran_id)
+{
+ for (int i = 0; i < (this->dv_list).size(); ++i) {
+ if (dv_list[i] == tran_id)
+ return true;
+ }
+ return false;
+}
+
void
TimelineViewManager::updateEncryptedDescriptions()
{
@@ -63,12 +89,12 @@ TimelineViewManager::userColor(QString id, QColor background)
return userColors.value(id);
}
-QString
-TimelineViewManager::userPresence(QString id) const
-{
- return QString::fromStdString(
- mtx::presence::to_string(cache::presenceState(id.toStdString())));
-}
+// QString
+// TimelineViewManager::userPresence(QString id) const
+// {
+// return QString::fromStdString(
+// mtx::presence::to_string(cache::presenceState(id.toStdString())));
+// }
QString
TimelineViewManager::userStatus(QString id) const
{
@@ -81,6 +107,7 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettin
, blurhashProvider(new BlurhashProvider())
, settings(userSettings)
{
+ qRegisterMetaType<mtx::events::collections::DeviceEvents>();
qmlRegisterUncreatableMetaObject(qml_mtx_events::staticMetaObject,
"im.nheko",
1,
@@ -106,6 +133,7 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettin
0,
"EmojiCategory",
"Error: Only enums");
+ this->dvList = new DeviceVerificationList;
#ifdef USE_QUICK_VIEW
view = new QQuickView();
@@ -127,6 +155,7 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettin
container->setMinimumSize(200, 200);
view->rootContext()->setContextProperty("timelineManager", this);
view->rootContext()->setContextProperty("settings", settings.data());
+ view->rootContext()->setContextProperty("deviceVerificationList", this->dvList);
updateColorPalette();
view->engine()->addImageProvider("MxcImage", imgProvider);
view->engine()->addImageProvider("colorimage", colorImgProvider);
@@ -141,6 +170,32 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettin
&ChatPage::decryptSidebarChanged,
this,
&TimelineViewManager::updateEncryptedDescriptions);
+ connect(dynamic_cast<ChatPage *>(parent),
+ &ChatPage::recievedDeviceVerificationRequest,
+ this,
+ [this](const mtx::events::collections::DeviceEvents &message) {
+ auto msg =
+ std::get<mtx::events::DeviceEvent<msgs::KeyVerificationRequest>>(message);
+ QString tranID = QString::fromStdString(msg.content.transaction_id);
+ QString deviceId = QString::fromStdString(msg.content.from_device);
+ QString userId = QString::fromStdString(msg.sender);
+ if (!(this->dvList->exist(tranID))) {
+ emit newDeviceVerificationRequest(tranID, userId, deviceId);
+ }
+ });
+ connect(dynamic_cast<ChatPage *>(parent),
+ &ChatPage::recievedDeviceVerificationStart,
+ this,
+ [this](const mtx::events::collections::DeviceEvents &message) {
+ auto msg =
+ std::get<mtx::events::DeviceEvent<msgs::KeyVerificationStart>>(message);
+ QString tranID = QString::fromStdString(msg.content.transaction_id);
+ QString deviceId = QString::fromStdString(msg.content.from_device);
+ QString userId = QString::fromStdString(msg.sender);
+ if (!(this->dvList->exist(tranID))) {
+ emit newDeviceVerificationRequest(tranID, userId, deviceId);
+ }
+ });
}
void
@@ -468,9 +523,3 @@ TimelineViewManager::queueVideoMessage(const QString &roomid,
model->sendMessage(video);
}
-
-void
-TimelineViewManager::startDummyVerification()
-{
- emit deviceVerificationRequest(new DeviceVerificationFlow(this));
-}
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index 583a9e4c..70912715 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -22,6 +22,18 @@ class BlurhashProvider;
class ColorImageProvider;
class UserSettings;
+class DeviceVerificationList : public QObject
+{
+ Q_OBJECT
+public:
+ Q_INVOKABLE void add(QString tran_id);
+ Q_INVOKABLE void remove(QString tran_id);
+ Q_INVOKABLE bool exist(QString tran_id);
+
+private:
+ QVector<QString> dv_list;
+};
+
class TimelineViewManager : public QObject
{
Q_OBJECT
@@ -44,9 +56,8 @@ public:
Q_INVOKABLE bool isInitialSync() const { return isInitialSync_; }
Q_INVOKABLE void openImageOverlay(QString mxcUrl, QString eventId) const;
Q_INVOKABLE QColor userColor(QString id, QColor background);
- Q_INVOKABLE void startDummyVerification();
- Q_INVOKABLE QString userPresence(QString id) const;
+ // Q_INVOKABLE QString userPresence(QString id) const;
Q_INVOKABLE QString userStatus(QString id) const;
signals:
@@ -56,7 +67,7 @@ signals:
void initialSyncChanged(bool isInitialSync);
void replyingEventChanged(QString replyingEvent);
void replyClosed();
- void deviceVerificationRequest(DeviceVerificationFlow *deviceVerificationFlow);
+ void newDeviceVerificationRequest(QString transactionId, QString userId, QString deviceId);
public slots:
void updateReadReceipts(const QString &room_id, const std::vector<QString> &event_ids);
@@ -114,4 +125,7 @@ private:
QSharedPointer<UserSettings> settings;
QHash<QString, QColor> userColors;
+
+ DeviceVerificationList *dvList;
};
+Q_DECLARE_METATYPE(mtx::events::collections::DeviceEvents)
\ No newline at end of file
|
