X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=4a798eae0b1c3aeb0c12f895940b304275e5bdde;hp=866f85bbfbe43f6accf0dad760ebf73ffc8e11c6;hb=52a4b82e170fe88725de8381c842a5278c7d1e46;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 866f85bb..4a798eae 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -18,236 +18,296 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QtScript>
+
+#include "core.h"
 #include "coresession.h"
-#include "server.h"
+#include "networkconnection.h"
 
 #include "signalproxy.h"
+#include "buffersyncer.h"
 #include "storage.h"
 
-#include "networkinfo.h"
+#include "network.h"
 #include "ircuser.h"
 #include "ircchannel.h"
 #include "identity.h"
 
 #include "util.h"
-#include "sessionsettings.h"
-
-#include <QtScript>
+#include "coreusersettings.h"
 
-CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent)
-  : QObject(parent),
-    user(uid),
+CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObject(parent),
+    _user(uid),
     _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)),
-    storage(_storage),
+    _bufferSyncer(new BufferSyncer(this)),
     scriptEngine(new QScriptEngine(this))
 {
 
   SignalProxy *p = signalProxy();
 
-  SessionSettings s(user);
-  sessionData = s.sessionData(); qDebug() << sessionData;
-  /*
-  QSettings s;  // FIXME don't use QSettings anymore
-  mutex.lock();
-  s.beginGroup(QString("SessionData/%1").arg(user));
-  foreach(QString key, s.allKeys()) { qDebug() << key;
-    sessionData[key] = s.value(key);
-  }
-  s.endGroup();
-  mutex.unlock(); // FIXME remove
-  */
-  /* temporarily disabled
-  s.beginGroup(QString("Identities/%1").arg(user));
-  foreach(QString id, s.childKeys()) {
-    Identity *i = new Identity(s.value(id).value<Identity>(), this);
-    if(i->id() < 1) {
-      qDebug() << QString("Invalid identity!");
-      continue;
-    }
-    if(_identities.contains(i->id())) {
-      qDebug() << "Duplicate identity, ignoring!";
-      continue;
-    }
-    qDebug() << "loaded identity" << id;
-    _identities[i->id()] = i;
-  }
-  s.endGroup();
-  mutex.unlock();
-  if(!_identities.count()) {
-    Identity i(1);
-    i.setToDefaults();
-    //_identities[i->id()] = i;
-    createOrUpdateIdentity(i);
-  }
-  */
-
-  p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(serverStateRequested()));
   p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
-  p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromGui(BufferInfo, QString)));
+  p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME
+  p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromClient(BufferInfo, QString)));
   p->attachSlot(SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)), this, SLOT(sendBacklog(BufferInfo, QVariant, QVariant)));
   p->attachSignal(this, SIGNAL(displayMsg(Message)));
   p->attachSignal(this, SIGNAL(displayStatusMsg(QString, QString)));
   p->attachSignal(this, SIGNAL(backlogData(BufferInfo, QVariantList, bool)));
   p->attachSignal(this, SIGNAL(bufferInfoUpdated(BufferInfo)));
-  p->attachSignal(storage, SIGNAL(bufferInfoUpdated(BufferInfo)));
-  p->attachSignal(this, SIGNAL(sessionDataChanged(const QString &, const QVariant &)), SIGNAL(coreSessionDataChanged(const QString &, const QVariant &)));
-  p->attachSlot(SIGNAL(clientSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &)));
 
   p->attachSignal(this, SIGNAL(identityCreated(const Identity &)));
   p->attachSignal(this, SIGNAL(identityRemoved(IdentityId)));
-  p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createOrUpdateIdentity(const Identity &)));
-  p->attachSlot(SIGNAL(updateIdentity(const Identity &)), this, SLOT(createOrUpdateIdentity(const Identity &)));
+  p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createIdentity(const Identity &)));
+  p->attachSlot(SIGNAL(updateIdentity(const Identity &)), this, SLOT(updateIdentity(const Identity &)));
   p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId)));
 
+  p->attachSignal(this, SIGNAL(networkCreated(NetworkId)));
+  p->attachSignal(this, SIGNAL(networkRemoved(NetworkId)));
+  p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &)));
+  p->attachSlot(SIGNAL(updateNetwork(const NetworkInfo &)), this, SLOT(updateNetwork(const NetworkInfo &)));
+  p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
+
+  loadSettings();
   initScriptEngine();
 
-  foreach(Identity *id, _identities.values()) {
-    p->synchronize(id);
-  }
+  // init BufferSyncer
+  QHash<BufferId, QDateTime> lastSeenHash = Core::bufferLastSeenDates(user());
+  foreach(BufferId id, lastSeenHash.keys()) _bufferSyncer->requestSetLastSeen(id, lastSeenHash[id]);
+  connect(_bufferSyncer, SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(storeBufferLastSeen(BufferId, const QDateTime &)));
+  p->synchronize(_bufferSyncer);
+
+  // Restore session state
+  if(restoreState) restoreSessionState();
+
+  emit initialized();
 }
 
 CoreSession::~CoreSession() {
+  saveSessionState();
+  foreach(NetworkConnection *conn, _connections.values()) {
+    delete conn;
+  }
+  foreach(Network *net, _networks.values()) {
+    delete net;
+  }
 }
 
-UserId CoreSession::userId() const {
-  return user;
+UserId CoreSession::user() const {
+  return _user;
 }
 
-QVariant CoreSession::state() const {
-  QVariantMap res;
-  QList<QVariant> conn;
-  foreach(Server *server, servers.values()) {
-    if(server->isConnected()) {
-      QVariantMap m;
-      m["Network"] = server->networkName();
-      m["State"] = server->state();
-      conn << m;
+Network *CoreSession::network(NetworkId id) const {
+  if(_networks.contains(id)) return _networks[id];
+  return 0;
+}
+
+NetworkConnection *CoreSession::networkConnection(NetworkId id) const {
+  if(_connections.contains(id)) return _connections[id];
+  return 0;
+}
+
+Identity *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() << QString("Invalid identity! Removing...");
+      s.removeIdentity(id);
+      delete i;
+      continue;
     }
+    if(_identities.contains(i->id())) {
+      qWarning() << "Duplicate identity, ignoring!";
+      delete i;
+      continue;
+    }
+    _identities[i->id()] = i;
+    signalProxy()->synchronize(i);
+  }
+  if(!_identities.count()) {
+    Identity i(1);
+    i.setToDefaults();
+    i.setIdentityName(tr("Default Identity"));
+    createIdentity(i);
   }
-  res["ConnectedServers"] = conn;
-  return res;
-}
-
-void CoreSession::restoreState(const QVariant &previousState) {
-  // Session restore
-  QVariantMap state = previousState.toMap();
-  if(state.contains("ConnectedServers")) {
-    foreach(QVariant v, state["ConnectedServers"].toList()) {
-      QVariantMap m = v.toMap();
-      QString net = m["Network"].toString();
-      if(!net.isEmpty()) connectToNetwork(net, m["State"]);
+
+
+  // migration to pure DB storage
+  QList<NetworkId> netIds = s.networkIds();
+  if(!netIds.isEmpty()) {
+    qDebug() << "Migrating Networksettings to DB Storage for User:" << user();
+    foreach(NetworkId id, netIds) {
+      NetworkInfo info = s.networkInfo(id);
+
+      // default new options
+      info.useRandomServer = false;
+      info.useAutoReconnect = true;
+      info.autoReconnectInterval = 60;
+      info.autoReconnectRetries = 20;
+      info.unlimitedReconnectRetries = false;
+      info.useAutoIdentify = false;
+      info.autoIdentifyService = "NickServ";
+      info.rejoinChannels = true;
+
+      Core::updateNetwork(user(), info);
+      s.removeNetworkInfo(id);
     }
   }
+
+  foreach(NetworkInfo info, Core::networks(user())) {
+    createNetwork(info);
+  }
 }
 
+void CoreSession::saveSessionState() const {
+  QVariantMap res;
+  QVariantList conn;
+  foreach(NetworkConnection *net, _connections.values()) {
+    QVariantMap m;
+    m["NetworkId"] = QVariant::fromValue<NetworkId>(net->networkId());
+    m["State"] = net->state();
+    conn << m;
+  }
+  res["CoreBuild"] = Global::quasselBuild;
+  res["ConnectedNetworks"] = conn;
+  CoreUserSettings s(user());
+  s.setSessionState(res);
+}
 
-void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
-  SessionSettings s(user);
-  mutex.lock();
-  s.setSessionValue(key, data);
-  sessionData[key] = data;
-  mutex.unlock();
-  emit sessionDataChanged(key, data);
-  emit sessionDataChanged(key);
+void CoreSession::restoreSessionState() {
+  CoreUserSettings s(user());
+  uint build = s.sessionState().toMap()["CoreBuild"].toUInt();
+  if(build < 362) {
+    qWarning() << qPrintable(tr("Session state does not exist or is too old!"));
+    return;
+  }
+  QVariantList conn = s.sessionState().toMap()["ConnectedNetworks"].toList();
+  foreach(QVariant v, conn) {
+    NetworkId id = v.toMap()["NetworkId"].value<NetworkId>();
+    if(_networks.keys().contains(id)) connectToNetwork(id, v.toMap()["State"]);
+  }
 }
 
-QVariant CoreSession::retrieveSessionData(const QString &key, const QVariant &def) {
-  QVariant data;
-  mutex.lock();
-  if(!sessionData.contains(key)) data = def;
-  else data = sessionData[key];
-  mutex.unlock();
-  return data;
+void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) {
+  if(uid == user()) emit bufferInfoUpdated(bufinfo);
 }
 
-// FIXME switch to NetworkIDs
-void CoreSession::connectToNetwork(QString network, const QVariant &previousState) {
-  uint networkid = getNetworkId(network);
-  if(networkid == 0) {
-    qWarning() << "unable to connect to Network" << network << "(User:" << userId() << "): unable to determine NetworkId";
+// FIXME remove
+void CoreSession::connectToNetwork(QString netname, const QVariant &previousState) {
+  Network *net = 0;
+  foreach(Network *n, _networks.values()) {
+    if(n->networkName() == netname) {
+      net = n; break;
+    }
+  }
+  if(!net) {
+    qWarning() << "Connect to unknown network requested, ignoring!";
     return;
   }
-  if(!servers.contains(networkid)) {
-    Server *server = new Server(userId(), networkid, network, previousState);
-    servers[networkid] = server;
-    attachServer(server);
-    server->start();
+  connectToNetwork(net->networkId(), previousState);
+}
+
+void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState) {
+  Network *net = network(id);
+  if(!net) {
+    qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();
+    return;
+  }
+
+  NetworkConnection *conn = networkConnection(id);
+  if(!conn) {
+    conn = new NetworkConnection(net, this, previousState);
+    _connections[id] = conn;
+    attachNetworkConnection(conn);
   }
-  emit connectToIrc(network);
+  conn->connectToIrc();
 }
 
-void CoreSession::attachServer(Server *server) {
-  connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString)));
-  connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString)));
-  connect(this, SIGNAL(msgFromGui(uint, QString, QString)), server, SLOT(userInput(uint, QString, QString)));
-  
-  connect(server, SIGNAL(connected(uint)), this, SLOT(serverConnected(uint)));
-  connect(server, SIGNAL(disconnected(uint)), this, SLOT(serverDisconnected(uint)));
-  connect(server, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8)));
-  connect(server, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
+void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
+  connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId)));
+  connect(conn, SIGNAL(quitRequested(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
+
+  // I guess we don't need these anymore, client-side can just connect the network's signals directly
+  //signalProxy()->attachSignal(conn, SIGNAL(connected(NetworkId)), SIGNAL(networkConnected(NetworkId)));
+  //signalProxy()->attachSignal(conn, SIGNAL(disconnected(NetworkId)), SIGNAL(networkDisconnected(NetworkId)));
+
+  connect(conn, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)),
+	  this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
+  connect(conn, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
 
-  // connect serversignals to proxy
-  signalProxy()->attachSignal(server, SIGNAL(serverState(QString, QVariantMap)), SIGNAL(networkState(QString, QVariantMap)));
-  signalProxy()->attachSignal(server, SIGNAL(connected(uint)), SIGNAL(networkConnected(uint)));
-  signalProxy()->attachSignal(server, SIGNAL(disconnected(uint)), SIGNAL(networkDisconnected(uint)));
-  // TODO add error handling
 }
 
-void CoreSession::serverStateRequested() {
+void CoreSession::disconnectFromNetwork(NetworkId id) {
+  if(!_connections.contains(id)) return;
+  _connections[id]->disconnectFromIrc();
 }
 
-void CoreSession::addClient(QIODevice *device) {
-  signalProxy()->addPeer(device);
+void CoreSession::networkStateRequested() {
+}
+
+void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it in signal connections
+  QIODevice *device = qobject_cast<QIODevice *>(dev);
+  if(!device) {
+    qWarning() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!";
+  } else {
+    signalProxy()->addPeer(device);
+    QVariantMap reply;
+    reply["MsgType"] = "SessionInit";
+    reply["SessionState"] = sessionState();
+    SignalProxy::writeDataToDevice(device, reply);
+  }
 }
 
 SignalProxy *CoreSession::signalProxy() const {
   return _signalProxy;
 }
 
-void CoreSession::serverConnected(uint networkid) {
-  storage->getBufferInfo(userId(), servers[networkid]->networkName()); // create status buffer
+// FIXME we need a sane way for creating buffers!
+void CoreSession::networkConnected(NetworkId networkid) {
+  Core::bufferInfo(user(), networkid, BufferInfo::StatusBuffer); // create status buffer
 }
 
-void CoreSession::serverDisconnected(uint networkid) {
-  Q_ASSERT(servers.contains(networkid));
-  servers.take(networkid)->deleteLater();
-  Q_ASSERT(!servers.contains(networkid));
+// called now only on /quit and requested disconnects, not on normal disconnects!
+void CoreSession::networkDisconnected(NetworkId networkid) {
+  if(_connections.contains(networkid)) _connections.take(networkid)->deleteLater();
 }
 
-void CoreSession::msgFromGui(BufferInfo bufid, QString msg) {
-  emit msgFromGui(bufid.networkId(), bufid.buffer(), msg);
+// FIXME switch to BufferId
+void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
+  NetworkConnection *conn = networkConnection(bufinfo.networkId());
+  if(conn) {
+    conn->userInput(bufinfo, msg);
+  } else {
+    qWarning() << "Trying to send to unconnected network!";
+  }
 }
 
 // ALL messages coming pass through these functions before going to the GUI.
 // So this is the perfect place for storing the backlog and log stuff.
-void CoreSession::recvMessageFromServer(Message::Type type, QString target, QString text, QString sender, quint8 flags) {
-  Server *s = qobject_cast<Server*>(this->sender());
-  Q_ASSERT(s);
-  BufferInfo buf;
-  if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
-    buf = storage->getBufferInfo(user, s->networkName(), nickFromMask(sender));
-  } else {
-    buf = storage->getBufferInfo(user, s->networkName(), target);
-  }
-  Message msg(buf, type, text, sender, flags);
-  msg.setMsgId(storage->logMessage(msg));
-  Q_ASSERT(msg.msgId());
+void CoreSession::recvMessageFromServer(Message::Type type, BufferInfo::Type bufferType, QString target, QString text, QString sender, quint8 flags) {
+  NetworkConnection *netCon = qobject_cast<NetworkConnection*>(this->sender());
+  Q_ASSERT(netCon);
+  
+  BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), bufferType, target);
+  Message msg(bufferInfo, type, text, sender, flags);
+  msg.setMsgId(Core::storeMessage(msg));
+  Q_ASSERT(msg.msgId() != 0);
   emit displayMsg(msg);
 }
 
 void CoreSession::recvStatusMsgFromServer(QString msg) {
-  Server *s = qobject_cast<Server*>(sender());
+  NetworkConnection *s = qobject_cast<NetworkConnection*>(sender());
   Q_ASSERT(s);
   emit displayStatusMsg(s->networkName(), msg);
 }
 
-
-uint CoreSession::getNetworkId(const QString &net) const {
-  return storage->getNetworkId(user, net);
-}
-
 QList<BufferInfo> CoreSession::buffers() const {
-  return storage->requestBuffers(user);
+  return Core::requestBuffers(user());
 }
 
 
@@ -255,27 +315,33 @@ QVariant CoreSession::sessionState() {
   QVariantMap v;
 
   QVariantList bufs;
-  foreach(BufferInfo id, storage->requestBuffers(user))
-    bufs.append(QVariant::fromValue(id));
-  v["Buffers"] = bufs;
-
-  mutex.lock();
-  v["SessionData"] = sessionData;
-  mutex.unlock();
-
-  QVariantList networks;
-  foreach(NetworkId networkid, servers.keys())
-    networks.append(QVariant(networkid));
-  v["Networks"] = QVariant(networks);
+  foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
+  v["BufferInfos"] = bufs;
+  QVariantList networkids;
+  foreach(NetworkId id, _networks.keys()) networkids << qVariantFromValue(id);
+  v["NetworkIds"] = networkids;
+
+  quint32 ircusercount = 0;
+  quint32 ircchannelcount = 0;
+  foreach(Network *net, _networks.values()) {
+    ircusercount += net->ircUserCount();
+    ircchannelcount += net->ircChannelCount();
+  }
+  v["IrcUserCount"] = ircusercount;
+  v["IrcChannelCount"] = ircchannelcount;
 
   QList<QVariant> idlist;
-  foreach(Identity *i, _identities.values()) idlist << QVariant::fromValue<Identity>(*i);
+  foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i);
   v["Identities"] = idlist;
 
-  // v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
+  //v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
   return v;
 }
 
+void CoreSession::storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen) {
+  Core::setBufferLastSeen(user(), buffer, lastSeen);
+}
+
 void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {
   QList<QVariant> log;
   QList<Message> msglist;
@@ -283,12 +349,12 @@ void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {
 
 
   } else {
-    msglist = storage->requestMsgs(id, v1.toInt(), v2.toInt());
+    msglist = Core::requestMsgs(id, v1.toInt(), v2.toInt());
   }
 
   // Send messages out in smaller packages - we don't want to make the signal data too large!
   for(int i = 0; i < msglist.count(); i++) {
-    log.append(QVariant::fromValue(msglist[i]));
+    log.append(qVariantFromValue(msglist[i]));
     if(log.count() >= 5) {
       emit backlogData(id, log, i >= msglist.count() - 1);
       log.clear();
@@ -301,37 +367,109 @@ void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {
 void CoreSession::initScriptEngine() {
   signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString)));
   signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString)));
-  
-  QScriptValue storage_ = scriptEngine->newQObject(storage);
-  scriptEngine->globalObject().setProperty("storage", storage_);
+
+  // FIXME
+  //QScriptValue storage_ = scriptEngine->newQObject(storage);
+  //scriptEngine->globalObject().setProperty("storage", storage_);
 }
 
 void CoreSession::scriptRequest(QString script) {
   emit scriptResult(scriptEngine->evaluate(script).toString());
 }
 
-void CoreSession::createOrUpdateIdentity(const Identity &id) {
+/*** 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);
+  emit identityCreated(*newId);
+}
+
+void CoreSession::updateIdentity(const Identity &id) {
   if(!_identities.contains(id.id())) {
-    // create new
-    _identities[id.id()] = new Identity(id, this);
-    signalProxy()->synchronize(_identities[id.id()]);
-    emit identityCreated(id.id());
-  } else {
-    // update
-    _identities[id.id()]->update(id);
+    qWarning() << "Update request for unknown identity received!";
+    return;
   }
-  Q_ASSERT(false); // FIX QSettings first!
-  QSettings s;  // FIXME don't use QSettings
-  s.beginGroup(QString("Identities/%1").arg(user));
-  s.setValue(QString::number(id.id()), QVariant::fromValue<Identity>(*_identities[id.id()]));
-  s.endGroup();
+  _identities[id.id()]->update(id);
+
+  CoreUserSettings s(user());
+  s.storeIdentity(id);
 }
 
 void CoreSession::removeIdentity(IdentityId id) {
   Identity *i = _identities.take(id);
   if(i) {
     emit identityRemoved(id);
+    CoreUserSettings s(user());
+    s.removeIdentity(id);
     i->deleteLater();
   }
 }
 
+/*** Network Handling ***/
+
+void CoreSession::createNetwork(const NetworkInfo &info_) {
+  NetworkInfo info = info_;
+  int id;
+
+  if(!info.networkId.isValid())
+    Core::createNetwork(user(), info);
+
+  Q_ASSERT(info.networkId.isValid());
+
+  id = info.networkId.toInt();
+  Q_ASSERT(!_networks.contains(id));
+  
+  Network *net = new Network(id, this);
+  connect(net, SIGNAL(connectRequested(NetworkId)), this, SLOT(connectToNetwork(NetworkId)));
+  connect(net, SIGNAL(disconnectRequested(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId)));
+  net->setNetworkInfo(info);
+  net->setProxy(signalProxy());
+  _networks[id] = net;
+  signalProxy()->synchronize(net);
+  emit networkCreated(id);
+}
+
+void CoreSession::updateNetwork(const NetworkInfo &info) {
+  if(!_networks.contains(info.networkId)) {
+    qWarning() << "Update request for unknown network received!";
+    return;
+  }
+  _networks[info.networkId]->setNetworkInfo(info);
+  Core::updateNetwork(user(), info);
+}
+
+void CoreSession::removeNetwork(NetworkId id) {
+  // Make sure the network is disconnected!
+  NetworkConnection *conn = _connections.value(id, 0);
+  if(conn) {
+    if(conn->connectionState() != Network::Disconnected) {
+      connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
+      conn->disconnectFromIrc();
+    } else {
+      _connections.take(id)->deleteLater();  // TODO make this saner
+      destroyNetwork(id);
+    }
+  } else {
+    destroyNetwork(id);
+  }
+}
+
+void CoreSession::destroyNetwork(NetworkId id) {
+  Q_ASSERT(!_connections.contains(id));
+  Network *net = _networks.take(id);
+  if(net && Core::removeNetwork(user(), id)) {
+    emit networkRemoved(id);
+    net->deleteLater();
+  }
+}