diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-03-25 18:08:28 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-03-25 18:08:28 +0900 |
| commit | 6895d14865c44b6dd6cf138a6a7413c6337b9802 (patch) | |
| tree | 8c0755f6ee801a4f438df25fc2927966a00d4813 | |
| parent | 2f57ea69098fee6a5f90ec35ebac89a26ef8efeb (diff) | |
| download | libquotient-6895d14865c44b6dd6cf138a6a7413c6337b9802.tar.gz libquotient-6895d14865c44b6dd6cf138a6a7413c6337b9802.zip | |
Split connectionError into networkError and syncError
When SyncJob retries, networkError is emitted; if it fails entirely, either loginError or syncError, depending on the kind of failure.
| -rw-r--r-- | connection.cpp | 3 | ||||
| -rw-r--r-- | connection.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/connection.cpp b/connection.cpp index cf08321c..25786361 100644 --- a/connection.cpp +++ b/connection.cpp @@ -175,12 +175,13 @@ void Connection::sync(int timeout) d->syncJob = nullptr; emit syncDone(); }); + connect( job, &SyncJob::retryScheduled, this, &Connection::networkError); connect( job, &SyncJob::failure, [=] () { d->syncJob = nullptr; if (job->error() == BaseJob::ContentAccessError) emit loginError(job->errorString()); else - emit connectionError(job->errorString()); + emit syncError(job->errorString()); }); } diff --git a/connection.h b/connection.h index a00afc91..849106a1 100644 --- a/connection.h +++ b/connection.h @@ -94,8 +94,9 @@ namespace QMatrixClient void joinedRoom(Room* room); void loginError(QString error); - void connectionError(QString error); + void networkError(size_t nextAttempt, int inMilliseconds); void resolveError(QString error); + void syncError(QString error); //void jobError(BaseJob* job); protected: |