Fix crash when fetching global profile

This commit is contained in:
Nicolas Werner 2022-08-13 16:28:41 +02:00
parent 9570c3ccc4
commit 242b7d5506
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 35 additions and 10 deletions

View file

@ -67,6 +67,7 @@ Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents)
Q_DECLARE_METATYPE(std::vector<DeviceInfo>) Q_DECLARE_METATYPE(std::vector<DeviceInfo>)
Q_DECLARE_METATYPE(std::vector<mtx::responses::PublicRoomsChunk>) Q_DECLARE_METATYPE(std::vector<mtx::responses::PublicRoomsChunk>)
Q_DECLARE_METATYPE(mtx::responses::PublicRoom) Q_DECLARE_METATYPE(mtx::responses::PublicRoom)
Q_DECLARE_METATYPE(mtx::responses::Profile)
MainWindow *MainWindow::instance_ = nullptr; MainWindow *MainWindow::instance_ = nullptr;
@ -145,6 +146,7 @@ MainWindow::registerQmlTypes()
qRegisterMetaType<mtx::events::msg::KeyVerificationRequest>(); qRegisterMetaType<mtx::events::msg::KeyVerificationRequest>();
qRegisterMetaType<mtx::events::msg::KeyVerificationStart>(); qRegisterMetaType<mtx::events::msg::KeyVerificationStart>();
qRegisterMetaType<mtx::responses::PublicRoom>(); qRegisterMetaType<mtx::responses::PublicRoom>();
qRegisterMetaType<mtx::responses::Profile>();
qRegisterMetaType<CombinedImagePackModel *>(); qRegisterMetaType<CombinedImagePackModel *>();
qRegisterMetaType<mtx::events::collections::TimelineEvents>(); qRegisterMetaType<mtx::events::collections::TimelineEvents>();
qRegisterMetaType<std::vector<DeviceInfo>>(); qRegisterMetaType<std::vector<DeviceInfo>>();

View file

@ -487,17 +487,27 @@ UserProfile::isLoading() const
void void
UserProfile::getGlobalProfileData() UserProfile::getGlobalProfileData()
{ {
http::client()->get_profile( auto profProx = std::make_shared<UserProfileFetchProxy>();
userid_.toStdString(), [this](const mtx::responses::Profile &res, mtx::http::RequestErr err) { connect(profProx.get(),
if (err) { &UserProfileFetchProxy::profileFetched,
nhlog::net()->warn("failed to retrieve profile info for {}", userid_.toStdString()); this,
return; [this](const mtx::responses::Profile &res) {
} emit globalUsernameRetrieved(QString::fromStdString(res.display_name));
globalAvatarUrl = QString::fromStdString(res.avatar_url);
emit avatarUrlChanged();
});
emit globalUsernameRetrieved(QString::fromStdString(res.display_name)); http::client()->get_profile(userid_.toStdString(),
globalAvatarUrl = QString::fromStdString(res.avatar_url); [prox = std::move(profProx), user = userid_.toStdString()](
emit avatarUrlChanged(); const mtx::responses::Profile &res, mtx::http::RequestErr err) {
}); if (err) {
nhlog::net()->warn("failed to retrieve profile info for {}",
user);
return;
}
emit prox->profileFetched(res);
});
} }
void void

View file

@ -32,6 +32,19 @@ Q_ENUM_NS(Status)
class DeviceVerificationFlow; class DeviceVerificationFlow;
class TimelineViewManager; class TimelineViewManager;
class UserProfileFetchProxy : public QObject
{
Q_OBJECT
public:
UserProfileFetchProxy(QObject *p = nullptr)
: QObject(p)
{}
signals:
void profileFetched(mtx::responses::Profile);
};
class DeviceInfo class DeviceInfo
{ {
public: public: