3 files changed, 30 insertions, 4 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 3718f77..ee70c35 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -34,7 +34,13 @@ QDebug Sink::ApplicationDomain::operator<< (QDebug d, const Sink::ApplicationDom
 QDebug Sink::ApplicationDomain::operator<< (QDebug d, const Sink::ApplicationDomain::ApplicationDomainType &type)
 {
     d << "ApplicationDomainType(\n";
-    auto properties = type.mAdaptor->availableProperties();
+    auto properties = [&] {
+        if (!type.changedProperties().isEmpty()) {
+            return type.changedProperties();
+        } else {
+            return type.mAdaptor->availableProperties();
+        }
+    }();
     std::sort(properties.begin(), properties.end());
     d << " " << "Id: " << "\t" << type.identifier() << "\n";
     d << " " << "Resource: " << "\t" << type.resourceInstanceIdentifier() << "\n";
@@ -216,8 +222,13 @@ QVariant ApplicationDomainType::getProperty(const QByteArray &key) const
 void ApplicationDomainType::setProperty(const QByteArray &key, const QVariant &value)
 {
     Q_ASSERT(mAdaptor);
-    mChangeSet->insert(key);
-    mAdaptor->setProperty(key, value);
+    auto existing = mAdaptor->getProperty(key);
+    if (existing.isValid() && existing == value) {
+        SinkTrace() << "Tried to set property that is still the same: " << key << value;
+    } else {
+        mChangeSet->insert(key);
+        mAdaptor->setProperty(key, value);
+    }
 }
 
 void ApplicationDomainType::setResource(const QByteArray &identifier)
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 602d54c..f7fd07e 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -101,6 +101,7 @@ enum SINK_EXPORT ErrorCode {
     LoginError,
     ConfigurationError,
     TransmissionError,
+    ConnectionLostError,
 };
 
 enum SINK_EXPORT SuccessCode {
@@ -118,12 +119,14 @@ enum SINK_EXPORT SyncStatus {
  * The status of an account or resource.
  *
  * It is set as follows:
- * * By default the status is offline.
+ * * By default the status is no status.
+ * * If a connection to the server failed the status is Offline.
  * * If a connection to the server could be established the status is Connected.
  * * If an error occurred that keeps the resource from operating (so non transient), the resource enters the error state.
  * * If a long running operation is started the resource goes to the busy state (and return to the previous state after that).
  */
 enum SINK_EXPORT Status {
+    NoStatus,
     OfflineStatus,
     ConnectedStatus,
     BusyStatus,
@@ -270,7 +273,17 @@ public:
     bool hasProperty(const QByteArray &key) const;
 
     QVariant getProperty(const QByteArray &key) const;
+
+    /**
+     * Set a property and record a changed property
+     *
+     * If the propery is available and did not change the call will be ignored.
+     */
     void setProperty(const QByteArray &key, const QVariant &value);
+
+    /**
+     * Convenience method to set a reference property.
+     */
     void setProperty(const QByteArray &key, const ApplicationDomainType &value);
 
     QByteArray getBlobProperty(const QByteArray &key) const;
diff --git a/common/domain/applicationdomaintype_p.h b/common/domain/applicationdomaintype_p.h
index a5a6b1d..a60df38 100644
--- a/common/domain/applicationdomaintype_p.h
+++ b/common/domain/applicationdomaintype_p.h
@@ -45,5 +45,7 @@ struct TypeHelper {
         } else {
             Q_ASSERT(false);
         }
+        //Silence compiler warning
+        return Func<Sink::ApplicationDomain::Mail>{}(std::forward<Args...>(args...));
     }
 };