#include "coreirclisthelper.h"
#include "storage.h"
+#include "coreidentity.h"
#include "corenetwork.h"
#include "ircuser.h"
#include "ircchannel.h"
-#include "identity.h"
#include "util.h"
#include "coreusersettings.h"
p->attachSignal(this, SIGNAL(identityCreated(const Identity &)));
p->attachSignal(this, SIGNAL(identityRemoved(IdentityId)));
- p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createIdentity(const Identity &)));
+ p->attachSlot(SIGNAL(createIdentity(const Identity &, const QVariantMap &)), this, SLOT(createIdentity(const Identity &, const QVariantMap &)));
p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId)));
p->attachSignal(this, SIGNAL(networkCreated(NetworkId)));
return 0;
}
-Identity *CoreSession::identity(IdentityId id) const {
+CoreIdentity *CoreSession::identity(IdentityId id) const {
if(_identities.contains(id)) return _identities[id];
return 0;
}
void CoreSession::loadSettings() {
CoreUserSettings s(user());
- foreach(IdentityId id, s.identityIds()) {
- Identity *i = new Identity(s.identity(id), this);
- if(!i->isValid()) {
- qWarning() << "Invalid identity! Removing...";
- s.removeIdentity(id);
- delete i;
- continue;
- }
- if(_identities.contains(i->id())) {
- qWarning() << "Duplicate identity, ignoring!";
- delete i;
- continue;
+ // migrate to db
+ QList<IdentityId> ids = s.identityIds();
+ QList<NetworkInfo> networkInfos = Core::networks(user());
+ foreach(IdentityId id, ids) {
+ CoreIdentity identity(s.identity(id));
+ IdentityId newId = Core::createIdentity(user(), identity);
+ QList<NetworkInfo>::iterator networkIter = networkInfos.begin();
+ while(networkIter != networkInfos.end()) {
+ if(networkIter->identity == id) {
+ networkIter->identity = newId;
+ Core::updateNetwork(user(), *networkIter);
+ networkIter = networkInfos.erase(networkIter);
+ } else {
+ networkIter++;
+ }
}
- connect(i, SIGNAL(updated(const QVariantMap &)), this, SLOT(identityUpdated(const QVariantMap &)));
- _identities[i->id()] = i;
- signalProxy()->synchronize(i);
+ s.removeIdentity(id);
+ }
+ // end of migration
+
+ foreach(CoreIdentity identity, Core::identities(user())) {
+ createIdentity(identity);
}
if(!_identities.count()) {
- Identity i(1);
- i.setToDefaults();
- i.setIdentityName(tr("Default Identity"));
- createIdentity(i);
+ Identity identity;
+ identity.setToDefaults();
+ identity.setIdentityName(tr("Default Identity"));
+ createIdentity(identity, QVariantMap());
}
foreach(NetworkInfo info, Core::networks(user())) {
}
/*** Identity Handling ***/
-
-void CoreSession::createIdentity(const Identity &id) {
- // find free ID
- int i;
- for(i = 1; i <= _identities.count(); i++) {
- if(!_identities.keys().contains(i)) break;
- }
- //qDebug() << "found free id" << i;
- Identity *newId = new Identity(id, this);
- newId->setId(i);
- _identities[i] = newId;
- signalProxy()->synchronize(newId);
- CoreUserSettings s(user());
- s.storeIdentity(*newId);
- connect(newId, SIGNAL(updated(const QVariantMap &)), this, SLOT(identityUpdated(const QVariantMap &)));
- emit identityCreated(*newId);
+void CoreSession::createIdentity(const Identity &identity, const QVariantMap &additional) {
+ CoreIdentity coreIdentity(identity);
+ if(additional.contains("KeyPem"))
+ coreIdentity.setSslKey(additional["KeyPem"].toByteArray());
+ if(additional.contains("CertPem"))
+ coreIdentity.setSslCert(additional["CertPem"].toByteArray());
+ IdentityId id = Core::createIdentity(user(), coreIdentity);
+ if(!id.isValid())
+ return;
+ else
+ createIdentity(coreIdentity);
}
-void CoreSession::removeIdentity(IdentityId id) {
- Identity *i = _identities.take(id);
- if(i) {
- emit identityRemoved(id);
- CoreUserSettings s(user());
- s.removeIdentity(id);
- i->deleteLater();
- }
+void CoreSession::createIdentity(const CoreIdentity &identity) {
+ CoreIdentity *coreIdentity = new CoreIdentity(identity, this);
+ _identities[identity.id()] = coreIdentity;
+ // CoreIdentity has it's own synchronize method since it's "private" sslManager needs to be synced aswell
+ coreIdentity->synchronize(signalProxy());
+ connect(coreIdentity, SIGNAL(updated(const QVariantMap &)), this, SLOT(updateIdentityBySender()));
+ emit identityCreated(*coreIdentity);
}
-void CoreSession::identityUpdated(const QVariantMap &data) {
- IdentityId id = data.value("identityId", 0).value<IdentityId>();
- if(!id.isValid() || !_identities.contains(id)) {
- qWarning() << "Update request for unknown identity received!";
+void CoreSession::updateIdentityBySender() {
+ CoreIdentity *identity = qobject_cast<CoreIdentity *>(sender());
+ if(!identity)
return;
+ Core::updateIdentity(user(), *identity);
+}
+
+void CoreSession::removeIdentity(IdentityId id) {
+ CoreIdentity *identity = _identities.take(id);
+ if(identity) {
+ emit identityRemoved(id);
+ Core::removeIdentity(user(), id);
+ identity->deleteLater();
}
- CoreUserSettings s(user());
- s.storeIdentity(*_identities.value(id));
}
/*** Network Handling ***/