X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=dfadf321664c7a728d8b496d62008d591d17dc21;hb=4ed404c7a72dd21bb06b003274ae544ab5ca1ad7;hp=afc1e162ce17d03b07419faa5ac1cab6cc07d361;hpb=d1b6499b0b848d4287efae89107576548533502c;p=quassel.git
diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index afc1e162..dfadf321 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -42,7 +42,6 @@ ClientSyncer::~ClientSyncer() {
}
-
void ClientSyncer::coreHasData() {
QVariant item;
while(SignalProxy::readDataFromDevice(socket, blockSize, item)) {
@@ -60,6 +59,10 @@ void ClientSyncer::coreHasData() {
emit connectionError(msg["Error"].toString());
disconnectFromCore();
return;
+ } else if(msg["MsgType"] == "CoreSetupAck") {
+ emit coreSetupSuccess();
+ } else if(msg["MsgType"] == "CoreSetupReject") {
+ emit coreSetupFailed(msg["Error"].toString());
} else if(msg["MsgType"] == "ClientLoginReject") {
emit loginFailed(msg["Error"].toString());
} else if(msg["MsgType"] == "ClientLoginAck") {
@@ -69,23 +72,12 @@ void ClientSyncer::coreHasData() {
emit loginSuccess();
} else if(msg["MsgType"] == "SessionInit") {
sessionStateReceived(msg["SessionState"].toMap());
+ break; // this is definitively the last message we process here!
} else {
emit connectionError(tr("Invalid data received from core!
Disconnecting."));
disconnectFromCore();
return;
}
- /*
- if (!msg["StartWizard"].toBool()) {
- recvCoreState(msg["Reply"]);
- } else {
- qWarning("Core not configured!");
- qDebug() << "Available storage providers: " << msg["StorageProviders"].toStringList();
- emit showConfigWizard(msg);
- }
- blockSize = 0;
- return;
- }
- */
}
if(blockSize > 0) {
emit recvPartialItem(socket->bytesAvailable(), blockSize);
@@ -108,7 +100,6 @@ void ClientSyncer::connectToCore(const QVariantMap &conn) {
// emit coreConnectionError(tr("Already connected to Core!"));
// return;
// }
-
if(socket != 0) {
socket->deleteLater();
socket = 0;
@@ -170,16 +161,26 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
// Core has accepted our version info and sent its own. Let's see if we accept it as well...
if(msg["CoreBuild"].toUInt() < Global::coreBuildNeeded) {
emit connectionError(tr("The Quassel Core you are trying to connect to is too old!
"
- "Need at least a Core Version %1 (Build >= %2) to connect.").arg(Global::quasselVersion).arg(Global::quasselBuild));
+ "Need at least a Core Version %1 (Build >= %2) to connect.").arg(Global::quasselVersion).arg(Global::coreBuildNeeded));
disconnectFromCore();
return;
}
emit connectionMsg(msg["CoreInfo"].toString());
- if(msg["LoginEnabled"].toBool()) {
+ if(!msg["Configured"].toBool()) {
+ // start wizard
+ emit startCoreSetup(msg["StorageBackends"].toList());
+ } else if(msg["LoginEnabled"].toBool()) {
emit startLogin();
}
}
+void ClientSyncer::doCoreSetup(const QVariant &setupData) {
+ QVariantMap setup;
+ setup["MsgType"] = "CoreSetupData";
+ setup["SetupData"] = setupData;
+ SignalProxy::writeDataToDevice(socket, setup);
+}
+
void ClientSyncer::loginToCore(const QString &user, const QString &passwd) {
emit connectionMsg(tr("Logging in..."));
QVariantMap clientLogin;
@@ -194,16 +195,12 @@ void ClientSyncer::sessionStateReceived(const QVariantMap &state) {
disconnect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(sessionProgress(quint32, quint32)));
disconnect(socket, 0, this, 0); // rest of communication happens through SignalProxy
//Client::signalProxy()->addPeer(socket);
- Client::instance()->setConnectedToCore(socket);
+ Client::instance()->setConnectedToCore(socket, coreConnectionInfo["AccountId"].value());
syncToCore(state);
}
void ClientSyncer::syncToCore(const QVariantMap &sessionState) {
- // store sessionData
- QVariantMap sessData = sessionState["SessionData"].toMap();
- foreach(QString key, sessData.keys()) Client::instance()->recvSessionData(key, sessData[key]);
-
// create identities
foreach(QVariant vid, sessionState["Identities"].toList()) {
Client::instance()->coreIdentityCreated(vid.value());
@@ -238,6 +235,7 @@ void ClientSyncer::syncToCore(const QVariantMap &sessionState) {
connect(net, SIGNAL(ircChannelRemoved(QObject *)), this, SLOT(ircChannelRemoved(QObject *)));
Client::addNetwork(net);
}
+ checkSyncState();
}
void ClientSyncer::networkInitDone() {