libtransport.git Changeset - 4100b4caf8af

Changeset - 4100b4caf8af

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Jan Kaluza - 13 years ago 2012-09-25 12:48:30
hanzz.k@gmail.com

Remove resource from room when the client disconnects without disconnecting the rooms

4 files changed with 35 insertions and 0 deletions:

include/transport/conversationmanager.h

src/conversationmanager.cpp

src/tests/user.cpp

src/user.cpp

0 comments (0 inline, 0 general)

include/transport/conversationmanager.h

➞

Show inline comments

@@ @@ -70,6 +70,7 @@ class ConversationManager { @@
 		void removeConversation(Conversation *conv);
 		void resetResources();
 		void removeJID(const Swift::JID &jid);
 	private:
 		void handleMessageReceived(Swift::Message::ref message);

src/conversationmanager.cpp

➞

Show inline comments

@@ @@ -89,6 +89,12 @@ void ConversationManager::resetResources() { @@
+	}
+}
 void ConversationManager::removeJID(const Swift::JID &jid) {
 	for (std::map<std::string, Conversation *>::const_iterator it = m_convs.begin(); it != m_convs.end(); it++) {
 		(*it).second->removeJID(jid);
+	}
+}
 void ConversationManager::handleMessageReceived(Swift::Message::ref message) {
 // 	std::string name = message->getTo().getUnescapedNode();
 // 	if (name.find_last_of("%") != std::string::npos) { // OK when commented

src/tests/user.cpp

➞

Show inline comments

 	CPPUNIT_TEST(handlePresenceJoinRoomTwoResources);
 	CPPUNIT_TEST(handlePresenceLeaveRoom);
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResources);
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResourcesOneDisconnects);
 	CPPUNIT_TEST(leaveJoinedRoom);
 	CPPUNIT_TEST(handleDisconnected);
 	CPPUNIT_TEST(handleDisconnectedReconnect);
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
+	}
 	void handlePresenceLeaveRoomTwoResourcesOneDisconnects() {
 		handlePresenceJoinRoomTwoResources();
 		received.clear();
 		User *user = userManager->getUser("user@localhost");
 		// User is still connected from resource2, so he should not leave the room
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo("localhost/hanzz");
 		response->setFrom("user@localhost/resource");
 		response->setType(Swift::Presence::Unavailable);
 		injectPresence(response);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(std::string(""), room);
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
 		Conversation *conv = user->getConversationManager()->getConversation("#room");
 		CPPUNIT_ASSERT_EQUAL(1, (int) conv->getJIDs().size());
 		CPPUNIT_ASSERT_EQUAL(Swift::JID("user@localhost/resource2"), conv->getJIDs().front());
+	}
 	void leaveJoinedRoom() {
 		User *user = userManager->getUser("user@localhost");
 		handlePresenceJoinRoom();

src/user.cpp

➞

Show inline comments

@@ @@ -263,6 +263,10 @@ void User::handlePresence(Swift::Presence::ref presence) { @@
+		}
 		return;
+	}
 	if (presence->getType() == Swift::Presence::Unavailable) {
 		m_conversationManager->removeJID(presence->getFrom());
+	}
 	// User wants to disconnect this resource

0 comments (0 inline, 0 general)