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

Immediately display connect errors in the login page

Browse Source 
This is using a Kirigami.InlineMessage component.
This commit is contained in:
Carl Schwan
2020-11-22 11:02:56 +01:00
parent 4bfbca75d8
commit 8f358b7680
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/controller.cpp
View File

@@ -117,17 +117,16 @@ void Controller::loginWithCredentials(QString serverAddr, QString user, QString
setActiveConnection(finalConn);
});
connect(finalConn, &Connection::networkError, [=](QString error, QString, int, int) {
Q_EMIT errorOccured(i18n("Network Error"), error);
Q_EMIT globalErrorOccured(i18n("Network Error"), error);
});
connect(finalConn, &Connection::loginError, [=](QString error, QString) {
Q_EMIT errorOccured(i18n("Login Failed"), error);
});
} else {
Q_EMIT errorOccured(i18n("Error connecting to server"), "");
}
});
connect(conn, &Connection::networkError, this, [=](QString error, QString, int, int) {
Q_EMIT errorOccured(i18n("Network Error"), error);
connect(job, &BaseJob::retryScheduled, this, [=](int, Quotient::BaseJob::duration_ms_t) {
Q_EMIT errorOccured(i18n("%1 is not a matrix server or is unreachable", serverUrl.toString()), QString());
job->abandon();
});
}
}

4
src/controller.h
View File

@@ -88,7 +88,11 @@ private Q_SLOTS:
Q_SIGNALS:
void busyChanged();
/// Error occured because of user inputs
void errorOccured(QString error, QString detail);
/// Error occured because of server or bug in NeoChat
void globalErrorOccured(QString error, QString detail);
void syncDone();
void connectionAdded(Quotient::Connection *conn);
void connectionDropped(Quotient::Connection *conn);