Keyring fixes

* Avoid double free
* track unlocked state
* Ensure we bring up the login screen on startup and after saving the
  configuration.

1 files changed, 15 insertions, 1 deletions

diff --git a/framework/src/keyring.cpp b/framework/src/keyring.cpp
index e3fdb1cb..7bd406c0 100644
--- a/framework/src/keyring.cpp
+++ b/framework/src/keyring.cpp
@@ -20,18 +20,31 @@
 
 #include <sink/secretstore.h>
 #include <QSettings>
+#include <QtGlobal>
 
 using namespace Kube;
 
+Q_GLOBAL_STATIC(Keyring, sKeyring);
+
 Keyring::Keyring()
     : QObject()
 {
 
 }
 
+Keyring *Keyring::instance()
+{
+    return sKeyring;
+}
+
 bool Keyring::isUnlocked(const QByteArray &accountId)
 {
-    return false;
+    return mUnlocked.contains(accountId);
+}
+
+void Keyring::unlock(const QByteArray &accountId)
+{
+    mUnlocked.insert(accountId);
 }
 
 AccountKeyring::AccountKeyring(const QByteArray &accountId, QObject *parent)
@@ -45,6 +58,7 @@ void AccountKeyring::storePassword(const QByteArray &resourceId, const QString &
     QSettings settings{mAccountIdentifier + ".keyring", QSettings::IniFormat};
     settings.setValue(resourceId, password);
     Sink::SecretStore::instance().insert(resourceId, password);
+    Keyring::instance()->unlock(mAccountIdentifier);
 }
 
 void AccountKeyring::unlock()