From cd5ecf7b381ebc76196931e213c92664c3443be8 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 20 Mar 2017 09:24:06 +0100
Subject: Make error codes part of the applicationdomain interface

---
 common/domain/applicationdomaintype.h | 12 ++++++++++++
 common/notification.h                 | 16 ----------------
 common/synchronizer.cpp               |  3 ++-
 3 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'common')

diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 8ff3e8b..ae8e6bc 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -92,6 +92,18 @@
 namespace Sink {
 namespace ApplicationDomain {
 
+enum ErrorCode {
+    NoError = 0,
+    UnknownError,
+    NoServerError,
+    LoginError,
+    TransmissionError,
+};
+
+enum SuccessCode {
+    TransmissionSuccess
+};
+
 struct SINK_EXPORT Error {
 
 };
diff --git a/common/notification.h b/common/notification.h
index 87c22db..4b52274 100644
--- a/common/notification.h
+++ b/common/notification.h
@@ -49,22 +49,6 @@ public:
         Success = 0,
         Failure
     };
-    /**
-     * Used as code for Warning/Error type notifications
-     */
-    enum ErrorCode {
-        NoError = 0,
-        UnknownError,
-        NoServerAvailable,
-        LoginFailed,
-        TransmissionFailed,
-    };
-    /**
-     * Used as code for Info type notifications
-     */
-    enum SuccessCode {
-        TransmissionSucceeded
-    };
 
     QByteArray id;
     int type = 0;
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index ff13783..4ed6e3a 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -391,7 +391,7 @@ KAsync::Job<void> Synchronizer::processSyncQueue()
         mSyncInProgress = true;
     })
     .then(processRequest(request))
-    .then<void>([this](const KAsync::Error &error) {
+    .then<void>([this, request](const KAsync::Error &error) {
         SinkTraceCtx(mLogCtx) << "Sync request processed";
         mEntityStore->abortTransaction();
         mSyncTransaction.abort();
@@ -403,6 +403,7 @@ KAsync::Job<void> Synchronizer::processSyncQueue()
         }
         if (error) {
             SinkWarningCtx(mLogCtx) << "Error during sync: " << error;
+            emitNotification(Notification::Error, error.errorCode, error.errorMessage, request.requestId);
         }
         //In case we got more requests meanwhile.
         return processSyncQueue();
-- 
cgit v1.2.3