From f25a8fb49abf8a9b7ba5d6f8fbd4c05bd647c1c0 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 22 Sep 2017 11:58:47 +0200
Subject: Fixed showing a loginview after the account setup

The view managment is starting to become a mess. I guess we'll need
something like a state machine in the long run managing the view
transitions.
---
 framework/src/domain/settings/accountsettings.cpp | 12 +++++++++---
 framework/src/startupcheck.cpp                    |  7 ++-----
 framework/src/startupcheck.h                      |  7 ++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'framework')

diff --git a/framework/src/domain/settings/accountsettings.cpp b/framework/src/domain/settings/accountsettings.cpp
index c174adfe..acf85522 100644
--- a/framework/src/domain/settings/accountsettings.cpp
+++ b/framework/src/domain/settings/accountsettings.cpp
@@ -292,7 +292,9 @@ void AccountSettings::saveImapResource()
             {"server", mImapServer},
             {"username", mImapUsername}
         });
-    Kube::AccountKeyring{mAccountIdentifier}.storePassword(mImapIdentifier, mImapPassword);
+    if (!mImapPassword.isEmpty()) {
+        Kube::AccountKeyring{mAccountIdentifier}.storePassword(mImapIdentifier, mImapPassword);
+    }
 }
 
 void AccountSettings::saveCardDavResource()
@@ -301,7 +303,9 @@ void AccountSettings::saveCardDavResource()
             {"server", mCardDavServer},
             {"username", mCardDavUsername}
         });
-    Kube::AccountKeyring{mAccountIdentifier}.storePassword(mCardDavIdentifier, mCardDavPassword);
+    if (!mCardDavPassword.isEmpty()) {
+        Kube::AccountKeyring{mAccountIdentifier}.storePassword(mCardDavIdentifier, mCardDavPassword);
+    }
 }
 
 void AccountSettings::saveMaildirResource()
@@ -317,7 +321,9 @@ void AccountSettings::saveMailtransportResource()
             {"server", mSmtpServer},
             {"username", mSmtpUsername}
         });
-    Kube::AccountKeyring{mAccountIdentifier}.storePassword(mMailtransportIdentifier, mSmtpPassword);
+    if (!mSmtpPassword.isEmpty()) {
+        Kube::AccountKeyring{mAccountIdentifier}.storePassword(mMailtransportIdentifier, mSmtpPassword);
+    }
 }
 
 void AccountSettings::saveIdentity()
diff --git a/framework/src/startupcheck.cpp b/framework/src/startupcheck.cpp
index 850be7bb..fa750173 100644
--- a/framework/src/startupcheck.cpp
+++ b/framework/src/startupcheck.cpp
@@ -23,13 +23,10 @@
 StartupCheck::StartupCheck(QObject *parent)
     : QObject(parent)
 {
-    QMetaObject::invokeMethod(this, "check", Qt::QueuedConnection);
 }
 
-void StartupCheck::check()
+bool StartupCheck::noAccount() const
 {
     auto accounts = Sink::Store::read<Sink::ApplicationDomain::SinkAccount>({});
-    if (accounts.isEmpty()) {
-        emit noAccount();
-    }
+    return accounts.isEmpty();
 }
diff --git a/framework/src/startupcheck.h b/framework/src/startupcheck.h
index dd79ee04..b8b2e3a0 100644
--- a/framework/src/startupcheck.h
+++ b/framework/src/startupcheck.h
@@ -21,12 +21,9 @@
 
 class StartupCheck : public QObject {
     Q_OBJECT
+    Q_PROPERTY(bool noAccount READ noAccount CONSTANT);
 public:
     StartupCheck(QObject *parent = nullptr);
 
-signals:
-    void noAccount();
-
-private Q_SLOTS:
-    void check();
+    bool noAccount() const;
 };
-- 
cgit v1.2.3