1 files changed, 33 insertions, 11 deletions
diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp
index ac35f1d4..30785699 100644
--- a/src/ui/UserProfile.cpp
+++ b/src/ui/UserProfile.cpp
@@ -1,28 +1,43 @@
#include "UserProfile.h"
#include "Logging.h"
-#include "MatrixClient.h"
#include "Utils.h"
+#include "mtx/responses/crypto.hpp"
+#include <iostream>
UserProfile::UserProfile(QObject *parent)
: QObject(parent)
{}
-QMap<QString, QString>
-UserProfile::getDeviceList()
-{
+QVector<DeviceInfo>
+UserProfile::getDeviceList(){
+ UserProfile::fetchDeviceList(this->userId);
return this->deviceList;
}
+QString
+UserProfile::getUserId (){
+ return this->userId;
+}
+
+void
+UserProfile::setUserId (const QString &user_id){
+ if(this->userId != userId)
+ return;
+ else
+ this->userId = user_id;
+}
+
void
-UserProfile::fetchDeviceList(const QString &userId)
+UserProfile::fetchDeviceList(const QString &userID)
{
auto localUser = utils::localUser();
mtx::requests::QueryKeys req;
- req.device_keys[userId.toStdString()] = {};
+ mtx::responses::QueryKeys res;
+ req.device_keys[userID.toStdString()] = {};
http::client()->query_keys(
req,
- [user_id = userId.toStdString()](const mtx::responses::QueryKeys &res,
+ [user_id = userID.toStdString(),this](const mtx::responses::QueryKeys &res,
mtx::http::RequestErr err) {
if (err) {
nhlog::net()->warn("failed to query device keys: {} {}",
@@ -39,14 +54,18 @@ UserProfile::fetchDeviceList(const QString &userId)
auto devices = res.device_keys.at(user_id);
- std::vector<DeviceInfo> deviceInfo;
+ QVector<DeviceInfo> deviceInfo;
for (const auto &d : devices) {
auto device = d.second;
// TODO: Verify signatures and ignore those that don't pass.
- deviceInfo.emplace_back(DeviceInfo{
- QString::fromStdString(d.first),
- QString::fromStdString(device.unsigned_info.device_display_name)});
+ // std::cout<<d.first<<std::endl;
+ // std::cout<<device.unsigned_info.device_display_name<<std::endl;
+ DeviceInfo newdevice(QString::fromStdString(d.first),QString::fromStdString(device.unsigned_info.device_display_name))
+ newdevice->device_id = QString::fromStdString(d.first);
+ newdevice->display_name = QString::fromStdString(device.unsigned_info.device_display_name)
+
+ deviceInfo.append(std::move(newdevice));
}
std::sort(deviceInfo.begin(),
@@ -54,5 +73,8 @@ UserProfile::fetchDeviceList(const QString &userId)
[](const DeviceInfo &a, const DeviceInfo &b) {
return a.device_id > b.device_id;
});
+
+ this->deviceList = deviceInfo;
+ emit UserProfile::deviceListUpdated();
});
}
|
