libtransport.git Changeset - ec3606e8f6f8

Changeset - ec3606e8f6f8

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 14 years ago 2011-08-31 19:37:58
hanzz.k@gmail.com

remove remaining SetRosterRequests in user destructor

2 files changed with 14 insertions and 3 deletions:

include/transport/rostermanager.h

src/rostermanager.cpp

0 comments (0 inline, 0 general)

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -79,35 +79,36 @@ class RosterManager { @@
 		boost::signal<void (Buddy *buddy)> onBuddyUnset;
 		boost::signal<void (Buddy *buddy)> onBuddyAdded;
 		boost::signal<void (Buddy *buddy)> onBuddyRemoved;
 		void handleBuddyChanged(Buddy *buddy);
 		void handleSubscription(Swift::Presence::ref presence);
 		void sendBuddyRosterPush(Buddy *buddy);
 		void sendBuddySubscribePresence(Buddy *buddy);
 		void sendCurrentPresences(const Swift::JID &to);
 		void sendCurrentPresence(const Swift::JID &from, const Swift::JID &to);
 		void sendUnavailablePresences(const Swift::JID &to);
 	private:
 		void setBuddyCallback(Buddy *buddy);
 		void sendRIE();
 		void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key);
+		void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, Swift::SetRosterRequest::ref request, const std::string &key);
 		std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > > m_buddies;
 		Component *m_component;
 		RosterStorage *m_rosterStorage;
 		User *m_user;
 		Swift::Timer::ref m_setBuddyTimer;
 		Swift::Timer::ref m_RIETimer;
 		std::list <Swift::SetRosterRequest::ref> m_requests;
 };
+}

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -9,109 +9,116 @@ @@
  * (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/rostermanager.h"
 #include "transport/rosterstorage.h"
 #include "transport/storagebackend.h"
 #include "transport/buddy.h"
 #include "transport/usermanager.h"
 #include "transport/buddy.h"
 #include "transport/user.h"
 #include "Swiften/Roster/SetRosterRequest.h"
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Elements/RosterItemPayload.h"
 #include "Swiften/Elements/RosterItemExchangePayload.h"
 #include "log4cxx/logger.h"
 #include <boost/foreach.hpp>
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("RosterManager");
 RosterManager::RosterManager(User *user, Component *component){
 	m_rosterStorage = NULL;
 	m_user = user;
 	m_component = component;
 	m_setBuddyTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(1000);
 	m_RIETimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(5000);
 	m_RIETimer->onTick.connect(boost::bind(&RosterManager::sendRIE, this));
+}
 RosterManager::~RosterManager() {
 	m_setBuddyTimer->stop();
 	m_RIETimer->stop();
 	if (m_rosterStorage) {
 		m_rosterStorage->storeBuddies();
+	}
 	sendUnavailablePresences(m_user->getJID().toBare());
 	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		delete buddy;
+	}
 	BOOST_FOREACH(Swift::SetRosterRequest::ref request, m_requests) {
 		request->onResponse.disconnect_all_slots();
+	}
 	m_requests.clear();
 	boost::singleton_pool<boost::pool_allocator_tag, sizeof(unsigned int)>::release_memory();
 	if (m_rosterStorage)
 		delete m_rosterStorage;
+}
 void RosterManager::setBuddy(Buddy *buddy) {
 // 	m_setBuddyTimer->onTick.connect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 // 	m_setBuddyTimer->start();
 	setBuddyCallback(buddy);
+}
 void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
 	if (!m_user->isConnected())
 		return;
 	Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 	Swift::RosterItemPayload item;
 	item.setJID(buddy->getJID().toBare());
 	item.setName(buddy->getAlias());
 	item.setGroups(buddy->getGroups());
 	item.setSubscription(Swift::RosterItemPayload::Both);
 	payload->addItem(item);
 	Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, m_user->getJID().toBare(), m_component->getIQRouter());
 	request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, buddy->getName()));
+	request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, request, buddy->getName()));
 	request->send();
 	m_requests.push_back(request);
+}
 void RosterManager::sendBuddySubscribePresence(Buddy *buddy) {
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(m_user->getJID());
 	response->setFrom(buddy->getJID());
 	response->setType(Swift::Presence::Subscribe);
 // 	TODO: NICKNAME
 	m_component->getStanzaChannel()->sendPresence(response);
+}
 void RosterManager::handleBuddyChanged(Buddy *buddy) {
 	if (m_rosterStorage) {
 		m_rosterStorage->storeBuddy(buddy);
+	}
+}
 void RosterManager::setBuddyCallback(Buddy *buddy) {
 	m_setBuddyTimer->onTick.disconnect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 	LOG4CXX_INFO(logger, "Associating buddy " << buddy->getName() << " with " << m_user->getJID().toString());
 	m_buddies[buddy->getName()] = buddy;
 	onBuddySet(buddy);
@@ @@ -131,52 +138,55 @@ void RosterManager::setBuddyCallback(Buddy *buddy) { @@
+			}
 			else {
 				sendBuddySubscribePresence(buddy);
+			}
+		}
+	}
 	if (m_rosterStorage)
 		m_rosterStorage->storeBuddy(buddy);
+}
 void RosterManager::unsetBuddy(Buddy *buddy) {
 	m_buddies.erase(buddy->getName());
 	if (m_rosterStorage)
 		m_rosterStorage->removeBuddyFromQueue(buddy);
 	onBuddyUnset(buddy);
+}
 void RosterManager::storeBuddy(Buddy *buddy) {
 	if (m_rosterStorage) {
 		m_rosterStorage->storeBuddy(buddy);
+	}
+}
 void RosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key) {
+void RosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, Swift::SetRosterRequest::ref request, const std::string &key) {
 	if (m_buddies[key] != NULL) {
 		m_buddies[key]->handleBuddyChanged();
+	}
 	m_requests.remove(request);
 	request->onResponse.disconnect_all_slots();
+}
 Buddy *RosterManager::getBuddy(const std::string &name) {
 	return m_buddies[name];
+}
 void RosterManager::sendRIE() {
 	m_RIETimer->stop();
 	// Check the feature, because proper resource could logout during RIETimer.
 	Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
 	// fallback to normal subscribe
 	if (!jidWithRIE.isValid()) {
 		for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 			Buddy *buddy = (*it).second;
 			if (!buddy) {
 				continue;
+			}
 			sendBuddySubscribePresence(buddy);
+		}
 		return;
+	}

0 comments (0 inline, 0 general)