Avoid assembling uid ourselves

2 files changed, 5 insertions, 16 deletions

diff --git a/accounts/maildir/maildirsettings.cpp b/accounts/maildir/maildirsettings.cpp
index e47b834f..96b75a1e 100644
--- a/accounts/maildir/maildirsettings.cpp
+++ b/accounts/maildir/maildirsettings.cpp
@@ -22,7 +22,6 @@
 
 #include <sink/store.h>
 #include <QDebug>
-#include <QUuid>
 #include <QDir>
 #include <QUrl>
 
@@ -177,12 +176,9 @@ void MaildirSettings::save()
         })
         .exec();
     } else {
-        const auto resourceIdentifier = "org.kde.maildir." + QUuid::createUuid().toByteArray();
-        mIdentifier = resourceIdentifier;
-
-        Sink::ApplicationDomain::SinkResource resource;
+        auto resource = Sink::ApplicationDomain::ApplicationDomainType::createEntity<Sink::ApplicationDomain::SinkResource>();
+        mIdentifier = resource.identifier();
         resource.setProperty("path", property("path"));
-        resource.setProperty("identifier", resourceIdentifier);
         resource.setProperty("type", "org.kde.maildir");
         resource.setProperty("account", mAccountIdentifier);
         Sink::Store::create(resource).then<void>([]() {},
@@ -202,12 +198,8 @@ void MaildirSettings::save()
         })
         .exec();
     } else {
-        //FIXME we shouldn't have to do this magic
-        const auto resourceIdentifier = "org.kde.mailtransport." + QUuid::createUuid().toByteArray();
-        mMailtransportIdentifier = resourceIdentifier;
-
-        Sink::ApplicationDomain::SinkResource resource;
-        resource.setProperty("identifier", resourceIdentifier);
+        auto resource = Sink::ApplicationDomain::ApplicationDomainType::createEntity<Sink::ApplicationDomain::SinkResource>();
+        mMailtransportIdentifier = resource.identifier();
         resource.setProperty("type", "org.kde.mailtransport");
         resource.setProperty("account", mAccountIdentifier);
         resource.setProperty("server", mSmtpServer);
diff --git a/framework/domain/accountscontroller.cpp b/framework/domain/accountscontroller.cpp
index b5e7e9ca..2f47fa03 100644
--- a/framework/domain/accountscontroller.cpp
+++ b/framework/domain/accountscontroller.cpp
@@ -24,7 +24,6 @@
 #include <sink/store.h>
 
 #include <QVariant>
-#include <QUuid>
 #include <QDebug>
 
 AccountsController::AccountsController(QObject *parent) : QObject(parent)
@@ -33,9 +32,7 @@ AccountsController::AccountsController(QObject *parent) : QObject(parent)
 
 void AccountsController::createAccount(const QString &accountType)
 {
-    const auto identifier = QUuid::createUuid().toByteArray();
-    Sink::ApplicationDomain::SinkAccount account;
-    account.setProperty("identifier", identifier);
+    auto account = Sink::ApplicationDomain::ApplicationDomainType::createEntity<Sink::ApplicationDomain::SinkAccount>();
     account.setProperty("type", accountType);
     Sink::Store::create(account).then<void>([]() {},
     [](int errorCode, const QString &errorMessage) {