diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-04-07 14:58:02 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-04-07 15:23:44 +0200 |
commit | 41c69690d866414cf90d603629fd488ba9a981b5 (patch) | |
tree | 915b159320e82a797977e86a73fafb0ba2c7a344 | |
parent | 9fdcedf88e2fabedad73f0c74906318673f1ffa0 (diff) | |
download | sink-41c69690d866414cf90d603629fd488ba9a981b5.tar.gz sink-41c69690d866414cf90d603629fd488ba9a981b5.zip |
Detect maildir resource errors
-rw-r--r-- | common/domain/applicationdomaintype.h | 1 | ||||
-rw-r--r-- | common/synchronizer.cpp | 3 | ||||
-rw-r--r-- | examples/maildirresource/maildirresource.cpp | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h index d84bda4..e5aa46e 100644 --- a/common/domain/applicationdomaintype.h +++ b/common/domain/applicationdomaintype.h | |||
@@ -99,6 +99,7 @@ enum SINK_EXPORT ErrorCode { | |||
99 | NoServerError, | 99 | NoServerError, |
100 | ConnectionError, | 100 | ConnectionError, |
101 | LoginError, | 101 | LoginError, |
102 | ConfigurationError, | ||
102 | TransmissionError, | 103 | TransmissionError, |
103 | }; | 104 | }; |
104 | 105 | ||
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp index 9451488..fcd135c 100644 --- a/common/synchronizer.cpp +++ b/common/synchronizer.cpp | |||
@@ -315,6 +315,9 @@ void Synchronizer::setStatusFromResult(const KAsync::Error &error, const QString | |||
315 | if (error.errorCode == ApplicationDomain::ConnectionError) { | 315 | if (error.errorCode == ApplicationDomain::ConnectionError) { |
316 | //Couldn't connect, so we assume we don't have a network connection. | 316 | //Couldn't connect, so we assume we don't have a network connection. |
317 | setStatus(ApplicationDomain::OfflineStatus, s, requestId); | 317 | setStatus(ApplicationDomain::OfflineStatus, s, requestId); |
318 | } else if (error.errorCode == ApplicationDomain::ConfigurationError) { | ||
319 | //There is an error with the configuration. | ||
320 | setStatus(ApplicationDomain::ErrorStatus, s, requestId); | ||
318 | } else if (error.errorCode == ApplicationDomain::LoginError) { | 321 | } else if (error.errorCode == ApplicationDomain::LoginError) { |
319 | //If we failed to login altough we could connect that indicates a problem with our setup. | 322 | //If we failed to login altough we could connect that indicates a problem with our setup. |
320 | setStatus(ApplicationDomain::ErrorStatus, s, requestId); | 323 | setStatus(ApplicationDomain::ErrorStatus, s, requestId); |
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp index a2a2f05..9a1d2b8 100644 --- a/examples/maildirresource/maildirresource.cpp +++ b/examples/maildirresource/maildirresource.cpp | |||
@@ -360,12 +360,12 @@ public: | |||
360 | 360 | ||
361 | KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE | 361 | KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE |
362 | { | 362 | { |
363 | auto job = KAsync::start<void>([this] { | 363 | auto job = KAsync::start([this] { |
364 | KPIM::Maildir maildir(mMaildirPath, true); | 364 | KPIM::Maildir maildir(mMaildirPath, true); |
365 | if (!maildir.isValid(false)) { | 365 | if (!maildir.isValid(false)) { |
366 | return KAsync::error<void>(1, "Maildir path doesn't point to a valid maildir: " + mMaildirPath); | 366 | return KAsync::error(ApplicationDomain::ConfigurationError, "Maildir path doesn't point to a valid maildir: " + mMaildirPath); |
367 | } | 367 | } |
368 | return KAsync::null<void>(); | 368 | return KAsync::null(); |
369 | }); | 369 | }); |
370 | 370 | ||
371 | if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) { | 371 | if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) { |