From bd9c640bf83b6a430cd4d7e91376aab7222ce07a Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sat, 12 Mar 2016 15:29:11 +0100
Subject: Set the accountId on the settings component.

---
 accounts/maildir/maildirsettings.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'accounts/maildir/maildirsettings.cpp')

diff --git a/accounts/maildir/maildirsettings.cpp b/accounts/maildir/maildirsettings.cpp
index a2e2e96e..58ff77fd 100644
--- a/accounts/maildir/maildirsettings.cpp
+++ b/accounts/maildir/maildirsettings.cpp
@@ -49,10 +49,14 @@ QByteArray MaildirSettings::identifier() const
 
 void MaildirSettings::setAccountIdentifier(const QByteArray &id)
 {
+    if (id.isEmpty()) {
+        return;
+    }
     mAccountIdentifier = id;
+    Q_ASSERT(!id.isEmpty());
     Kube::Account account(id);
-    account.property("maildirResource").toByteArray();
-    setIdentifier(account.property("maildirResource").toByteArray());
+    auto maildirResource = account.property("maildirResource").toByteArray();
+    setIdentifier(maildirResource);
 }
 
 QByteArray MaildirSettings::accountIdentifier() const
@@ -88,6 +92,7 @@ void MaildirSettings::save()
         resource.setProperty("identifier", resourceIdentifier);
         resource.setProperty("type", "org.kde.maildir");
         Sink::Store::create(resource).exec();
+        Q_ASSERT(!mAccountIdentifier.isEmpty());
         Kube::Account account(mAccountIdentifier);
         account.setProperty("maildirResource", resourceIdentifier);
         account.save();
-- 
cgit v1.2.3