thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix device list not showing up and UserProfile blocking the window

Browse source
This commit is contained in:
Nicolas Werner 2021-05-22 14:31:38 +02:00
parent d307f24adf
commit f2bc184550
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
8 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ui/NhekoGlobalObject.h
View file

@ -40,7 +40,7 @@ public:
Q_INVOKABLE void openLink(QString link) const;
private slots:
public slots:
void updateUserProfile();
signals:

4
src/ui/UserProfile.cpp
View file

@ -42,7 +42,6 @@ UserProfile::UserProfile(QString roomid,
if (!cache::client() || !cache::client()->isDatabaseReady())
return;
fetchDeviceList(this->userid_);
connect(cache::client(),
&Cache::verificationStatusChanged,
this,
@ -66,7 +65,9 @@ UserProfile::UserProfile(QString roomid,
: verification::VERIFIED;
}
deviceList_.reset(deviceList_.deviceList_);
emit devicesChanged();
});
fetchDeviceList(this->userid_);
}
QHash<int, QByteArray>
@ -223,6 +224,7 @@ UserProfile::fetchDeviceList(const QString &userID)
}
this->deviceList_.queueReset(std::move(deviceInfo));
emit devicesChanged();
});
});
}

3
src/ui/UserProfile.h
View file

@ -90,7 +90,7 @@ class UserProfile : public QObject
Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)
Q_PROPERTY(QString userid READ userid CONSTANT)
Q_PROPERTY(QString avatarUrl READ avatarUrl NOTIFY avatarUrlChanged)
Q_PROPERTY(DeviceInfoModel *deviceList READ deviceList CONSTANT)
Q_PROPERTY(DeviceInfoModel *deviceList READ deviceList NOTIFY devicesChanged)
Q_PROPERTY(bool isGlobalUserProfile READ isGlobalUserProfile CONSTANT)
Q_PROPERTY(int userVerified READ getUserStatus NOTIFY userStatusChanged)
Q_PROPERTY(bool isLoading READ isLoading NOTIFY loadingChanged)
@ -133,6 +133,7 @@ signals:
void avatarUrlChanged();
void displayError(const QString &errorMessage);
void globalUsernameRetrieved(const QString &globalUser);
void devicesChanged();
public slots:
void updateAvatarUrl();