stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed old hack which cause crash in some situations

Browse source
This commit is contained in:
HanzZ 2011-08-21 22:52:05 +02:00
parent 0785badb98
commit 7b5810a410
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/rosterresponder.cpp
View file

@ -51,23 +51,9 @@ bool RosterResponder::handleGetRequest(const Swift::JID& from, const Swift::JID&
// For now we send empty reponse, but TODO: Get buddies from database and send proper stored roster.
User *user = m_userManager->getUser(from.toBare().toString());
if (!user) {
LOG4CXX_INFO(logger, from.toBare().toString() << ": Sending roster");
// Client can send jabber:iq:roster IQ before presence, so we do little hack here to
// trigger logging in.
// UserManager should create user now, if everything is OK.
Swift::Presence::ref response = Swift::Presence::create();
response->setTo(to);
response->setFrom(from);
response->setType(Swift::Presence::Available);
m_userManager->handlePresence(response);
// if it's not created, lets finish this get
user = m_userManager->getUser(from.toBare().toString());
if (!user) {
sendResponse(from, id, boost::shared_ptr<RosterPayload>(new RosterPayload()));
LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
return true;
}
sendResponse(from, id, boost::shared_ptr<RosterPayload>(new RosterPayload()));
LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
return true;
}
sendResponse(from, id, user->getRosterManager()->generateRosterPayload());
user->getRosterManager()->sendCurrentPresences(from);