1 files changed, 19 insertions, 35 deletions

diff --git a/framework/domain/accountfactory.cpp b/framework/domain/accountfactory.cpp
index d54f70a2..ab1a09e5 100644
--- a/framework/domain/accountfactory.cpp
+++ b/framework/domain/accountfactory.cpp
@@ -18,55 +18,39 @@
 */
 #include "accountfactory.h"
 
-#include <QQmlComponent>
-#include <QQmlEngine>
 #include <QDebug>
 
 #include <KPackage/PackageLoader>
+#include <KPackage/Package>
+#include <KPluginMetaData>
+
+#include "settings/settings.h"
 
 AccountFactory::AccountFactory(QObject *parent)
     : QObject(parent)
 {
-
-}
-
-QString AccountFactory::name() const
-{
-    return "Maildir";
-}
-
-QString AccountFactory::icon() const
-{
-    return "icon";
 }
 
-QVariant AccountFactory::ui() const
+void AccountFactory::setAccountId(const QString &accountId)
 {
-    return createComponent(getAccountType());
-}
+    mAccountId = accountId;
 
-QByteArray AccountFactory::getAccountType() const
-{
-    return "maildir";
-}
+    Kube::Account account(mAccountId.toUtf8());
+    mAccountType = account.type();
 
-QString AccountFactory::uiPath() const
-{
-    auto accountType = getAccountType();
-    auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.accounts." + accountType);
-    Q_ASSERT(package.isValid());
-    return package.filePath("mainscript");
+    loadPackage();
 }
 
-QVariant AccountFactory::createComponent(const QByteArray &accountType) const const
+void AccountFactory::loadPackage()
 {
-    qWarning() << "Trying to load accounts package " << accountType << mAccountId;
-    auto engine = qmlEngine(this);
-    Q_ASSERT(engine);
-    auto component = new QQmlComponent(engine, QUrl::fromLocalFile(uiPath()), QQmlComponent::PreferSynchronous);
-    for (const auto &error : component->errors()) {
-        qWarning() << error.toString();
+    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(component->isReady());
-    return QVariant::fromValue(component);
+    Q_ASSERT(package.isValid());
+    mUiPath = package.filePath("mainscript");
+    mName = package.metadata().name();
+    mIcon = package.metadata().iconName();
+    emit accountLoaded();
 }