/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "coreidentity.h"
-#include "coresession.h"
-#include "coreusersettings.h"
#include "signalproxy.h"
-CoreIdentity::CoreIdentity(IdentityId id, SignalProxy *proxy, CoreSession *parent)
- : Identity(id, parent),
- _certManager(new CoreCertManager(this)),
- _coreSession(parent)
+CoreIdentity::CoreIdentity(IdentityId id, QObject* parent)
+ : Identity(id, parent)
+ , _certManager(this)
{
- proxy->synchronize(_certManager);
- connect(this, SIGNAL(idSet(IdentityId)), _certManager, SLOT(setId(IdentityId)));
+ connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
+ connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
}
-CoreIdentity::CoreIdentity(const Identity &other, SignalProxy *proxy, CoreSession *parent)
- : Identity(other, parent),
- _certManager(new CoreCertManager(this)),
- _coreSession(parent)
+CoreIdentity::CoreIdentity(const Identity& other, QObject* parent)
+ : Identity(other, parent)
+ , _certManager(this)
{
- proxy->synchronize(_certManager);
- connect(this, SIGNAL(idSet(IdentityId)), _certManager, SLOT(setId(IdentityId)));
+ connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
+ connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
}
-void CoreIdentity::update(const QVariantMap &properties) {
- SyncableObject::update(properties);
- save();
+CoreIdentity::CoreIdentity(const CoreIdentity& other, QObject* parent)
+ : Identity(other, parent)
+ , _sslKey(other._sslKey)
+ , _sslCert(other._sslCert)
+ , _certManager(this)
+{
+ connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
+ connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
}
-void CoreIdentity::save() {
- CoreUserSettings s(_coreSession->user());
- s.storeIdentity(*this);
+void CoreIdentity::synchronize(SignalProxy* proxy)
+{
+ proxy->synchronize(this);
+ proxy->synchronize(&_certManager);
}
-void CoreIdentity::setSslKey(const QByteArray &encoded) {
- QSslKey key(encoded, QSsl::Rsa);
- if(key.isNull())
- key = QSslKey(encoded, QSsl::Dsa);
- setSslKey(key);
+void CoreIdentity::setSslKey(const QByteArray& encoded)
+{
+ QSslKey key(encoded, QSsl::Rsa);
+ if (key.isNull())
+ key = QSslKey(encoded, QSsl::Ec);
+ if (key.isNull())
+ key = QSslKey(encoded, QSsl::Dsa);
+ setSslKey(key);
}
-void CoreIdentity::setSslCert(const QByteArray &encoded) {
- setSslCert(QSslCertificate(encoded));
+void CoreIdentity::setSslCert(const QByteArray& encoded)
+{
+ setSslCert(QSslCertificate(encoded));
}
-
// ========================================
// CoreCertManager
// ========================================
-CoreCertManager::CoreCertManager(CoreIdentity *identity)
- : CertManager(identity->id(), identity),
- _identity(identity)
+
+CoreCertManager::CoreCertManager(CoreIdentity* identity)
+ : CertManager(identity->id())
+ , _identity(identity)
{
- setAllowClientUpdates(true);
+ setAllowClientUpdates(true);
}
-void CoreCertManager::setSslKey(const QByteArray &encoded) {
- identity()->setSslKey(encoded);
- CertManager::setSslKey(encoded);
+void CoreCertManager::setId(IdentityId id)
+{
+ setObjectName(QString::number(id.toInt()));
}
-void CoreCertManager::setSslCert(const QByteArray &encoded) {
- identity()->setSslCert(encoded);
- CertManager::setSslCert(encoded);
+void CoreCertManager::setSslKey(const QByteArray& encoded)
+{
+ _identity->setSslKey(encoded);
+ CertManager::setSslKey(encoded);
}
-void CoreCertManager::setId(IdentityId id) {
- renameObject(QString::number(id.toInt()));
+void CoreCertManager::setSslCert(const QByteArray& encoded)
+{
+ _identity->setSslCert(encoded);
+ CertManager::setSslCert(encoded);
}