ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add error callback of join room and add room.

Browse Source 
Also fix a bug of not being able to log out when the access token is
revoked.
This commit is contained in:
Black Hat
2018-10-13 18:54:33 +08:00
parent fa3082ca6b
commit d9592e4a7c
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/controller.h
View File

@@ -15,8 +15,6 @@ using namespace QMatrixClient;
class Controller : public QObject {
Q_OBJECT
Q_PROPERTY(bool busy READ busy WRITE setBusy NOTIFY busyChanged)
Q_PROPERTY(int accountCount READ accountCount NOTIFY connectionAdded NOTIFY
connectionDropped)
@@ -34,14 +32,6 @@ class Controller : public QObject {
void dropConnection(Connection* c);
// All the Q_PROPERTYs.
bool busy() { return m_busy; }
void setBusy(bool value) {
if (value != m_busy) {
m_busy = value;
emit busyChanged();
}
}
int accountCount() { return m_connections.count(); }
Q_INVOKABLE QColor color(QString userId);
@@ -53,8 +43,6 @@ class Controller : public QObject {
QMenu* trayMenu = new QMenu();
QVector<Connection*> m_connections;
bool m_busy = false;
QByteArray loadAccessToken(const AccountSettings& account);
bool saveAccessToken(const AccountSettings& account,
const QByteArray& accessToken);
@@ -77,6 +65,7 @@ class Controller : public QObject {
void logout(Connection* conn);
void joinRoom(Connection* c, const QString& alias);
void createRoom(Connection* c, const QString& name, const QString& topic);
void createDirectChat(Connection* c, const QString& userID);
void copyToClipboard(const QString& text);
void playAudio(QUrl localFile);
void showMessage(const QString& title, const QString& msg, const QIcon& icon);