1 files changed, 11 insertions, 9 deletions

diff --git a/framework/domain/accountfactory.cpp b/framework/domain/accountfactory.cpp
index af37710a..ab1a09e5 100644
--- a/framework/domain/accountfactory.cpp
+++ b/framework/domain/accountfactory.cpp
@@ -24,28 +24,30 @@
 #include <KPackage/Package>
 #include <KPluginMetaData>
 
+#include "settings/settings.h"
+
 AccountFactory::AccountFactory(QObject *parent)
     : QObject(parent)
 {
-
 }
 
 void AccountFactory::setAccountId(const QString &accountId)
 {
-    qWarning() << "setting account id: " << accountId;
     mAccountId = accountId;
-    loadPackage();
-}
 
-QByteArray AccountFactory::getAccountType() const
-{
-    return "maildir";
+    Kube::Account account(mAccountId.toUtf8());
+    mAccountType = account.type();
+
+    loadPackage();
 }
 
 void AccountFactory::loadPackage()
 {
-    auto accountType = getAccountType();
-    auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.accounts." + accountType);
+    auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.accounts." + mAccountType);
+    if (!package.isValid()) {
+        qWarning() << "Failed to load account package: " << "org.kube.accounts." + mAccountType;
+        return;
+    }
     Q_ASSERT(package.isValid());
     mUiPath = package.filePath("mainscript");
     mName = package.metadata().name();