X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=f18f92695a7b037bf8968c52313f6674d22c6fa4;hp=2649824a87a5cd7af2fbf5c3b9bed20f3edd8a62;hb=1adc00219ba072da57994764d086beed8ffb7bb4;hpb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 2649824a..f18f9269 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -125,14 +125,34 @@ CoreIdentity *CoreSession::identity(IdentityId id) const {
 void CoreSession::loadSettings() {
   CoreUserSettings s(user());
 
-  foreach(IdentityId id, s.identityIds()) {
-    createIdentity(s.identity(id));
+  // 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++;
+      }
+    }
+    s.removeIdentity(id);
+  }
+  // end of migration
+
+  foreach(CoreIdentity identity, Core::identities(user())) {
+    createIdentity(identity);
   }
   if(!_identities.count()) {
     Identity identity;
     identity.setToDefaults();
     identity.setIdentityName(tr("Default Identity"));
-    createIdentity(identity);
+    createIdentity(identity, QVariantMap());
   }
 
   foreach(NetworkInfo info, Core::networks(user())) {
@@ -264,45 +284,47 @@ void CoreSession::scriptRequest(QString script) {
 }
 
 /*** Identity Handling ***/
-
 void CoreSession::createIdentity(const Identity &identity, const QVariantMap &additional) {
-  if(_identities.contains(identity.id())) {
-    qWarning() << "duplicate Identity:" << identity.id();
-    return;
-  }
+#ifndef HAVE_SSL
+  Q_UNUSED(additional)
+#endif
 
-  int id = identity.id().toInt();
-  bool newId = !identity.isValid();
-  CoreIdentity *coreIdentity = new CoreIdentity(identity, signalProxy(), this);
+  CoreIdentity coreIdentity(identity);
+#ifdef HAVE_SSL
   if(additional.contains("KeyPem"))
-    coreIdentity->setSslKey(additional["KeyPem"].toByteArray());
+    coreIdentity.setSslKey(additional["KeyPem"].toByteArray());
   if(additional.contains("CertPem"))
-    coreIdentity->setSslCert(additional["CertPem"].toByteArray());
-  if(newId) {
-    // find free ID
-    for(id = 1; id <= _identities.count(); id++) {
-      if(!_identities.keys().contains(id))
-	break;
-    }
-    coreIdentity->setId(id);
-    coreIdentity->save();
-  }
+    coreIdentity.setSslCert(additional["CertPem"].toByteArray());
+#endif
+  IdentityId id = Core::createIdentity(user(), coreIdentity);
+  if(!id.isValid())
+    return;
+  else
+    createIdentity(coreIdentity);
+}
 
-  _identities[id] = coreIdentity;
-  qDebug() << id << coreIdentity->id();
-  signalProxy()->synchronize(coreIdentity);
+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);
+}
 
-  if(newId)
-    emit identityCreated(*coreIdentity);
+void CoreSession::updateIdentityBySender() {
+  CoreIdentity *identity = qobject_cast<CoreIdentity *>(sender());
+  if(!identity)
+    return;
+  Core::updateIdentity(user(), *identity);
 }
 
 void CoreSession::removeIdentity(IdentityId id) {
-  Identity *i = _identities.take(id);
-  if(i) {
+  CoreIdentity *identity = _identities.take(id);
+  if(identity) {
     emit identityRemoved(id);
-    CoreUserSettings s(user());
-    s.removeIdentity(id);
-    i->deleteLater();
+    Core::removeIdentity(user(), id);
+    identity->deleteLater();
   }
 }