libtransport.git Changeset - fbfb07e8ba22

Changeset - fbfb07e8ba22

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 10 years ago 2016-02-19 15:14:49
jkaluza@redhat.com

Libtransport: Try to leave only MUC conversations when disconnecting the user

2 files changed with 24 insertions and 1 deletions:

libtransport/ConversationManager.cpp

tests/libtransport/user.cpp

0 comments (0 inline, 0 general)

libtransport/ConversationManager.cpp

➞

Show inline comments

 void ConversationManager::resetResources() {
 	for (std::map<std::string, Conversation *>::const_iterator it = m_convs.begin(); it != m_convs.end(); it++) {
 		if ((*it).second->isMUC()) {
 			continue;
+		}
 		(*it).second->setJID(m_user->getJID().toBare());
+	}
+}
 void ConversationManager::removeJID(const Swift::JID &jid) {
 	std::vector<std::string> toRemove;
 	for (std::map<std::string, Conversation *>::const_iterator it = m_convs.begin(); it != m_convs.end(); it++) {
 		if (it->first.empty() || !it->second) {
 			continue;
+		}
 		(*it).second->removeJID(jid);
 		if (it->second->getJIDs().empty()) {
+		if (it->second->getJIDs().empty() && (*it).second->isMUC()) {
 			toRemove.push_back(it->first);
+		}
+	}
 	if (m_user->getUserSetting("stay_connected") != "1") {
 		while(!toRemove.empty()) {
 			LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Leaving room " << toRemove.back() << ".");
 			m_user->leaveRoom(toRemove.back());
 			toRemove.pop_back();
+		}
+	}
+}

tests/libtransport/user.cpp

➞

Show inline comments

 	CPPUNIT_TEST(sendCurrentPresence);
     CPPUNIT_TEST(handlePresence);
 	CPPUNIT_TEST(handlePresenceJoinRoom);
 	CPPUNIT_TEST(handlePresenceJoinRoomTwoResources);
 // 	CPPUNIT_TEST(handlePresenceLeaveRoom); // tested as part of other tests
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResources);
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResourcesOneDisconnects);
 	CPPUNIT_TEST(handlePresenceLeaveRoomBouncer);
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResourcesBouncer);
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResourcesOneDisconnectsBouncer);
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResourcesAnotherOneDisconnects);
 	CPPUNIT_TEST(leaveJoinedRoom);
 	CPPUNIT_TEST(doNotLeaveNormalChat);
 	CPPUNIT_TEST(joinRoomBeforeConnected);
 	CPPUNIT_TEST(handleDisconnected);
 	CPPUNIT_TEST(handleDisconnectedReconnect);
 	CPPUNIT_TEST(joinRoomHandleDisconnectedRejoin);
 	CPPUNIT_TEST(joinRoomAfterFlagNotAuthorized);
 	CPPUNIT_TEST(requestVCard);
 	CPPUNIT_TEST_SUITE_END();
 	public:
 		std::string room;
 		std::string roomNickname;
 		std::string roomPassword;
 	void leaveJoinedRoom() {
 		User *user = userManager->getUser("user@localhost");
 		handlePresenceJoinRoom();
 		CPPUNIT_ASSERT(user->getConversationManager()->getConversation("room"));
 		received.clear();
 		handlePresenceLeaveRoom();
 		CPPUNIT_ASSERT(!user->getConversationManager()->getConversation("room"));
+	}
 	void doNotLeaveNormalChat() {
 		User *user = userManager->getUser("user@localhost");
 		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "buddy1@test");
 		user->getConversationManager()->addConversation(conv);
 		CPPUNIT_ASSERT_EQUAL(std::string(""), room);
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
 		user->getConversationManager()->removeJID("user@localhost/resource");
 		CPPUNIT_ASSERT_EQUAL(std::string(""), room);
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
 		Conversation *cv = user->getConversationManager()->getConversation("buddy1@test");
 		CPPUNIT_ASSERT(cv);
+	}
 	void handleDisconnected() {
 		User *user = userManager->getUser("user@localhost");
 		user->handleDisconnected("Connection error", Swift::SpectrumErrorPayload::CONNECTION_ERROR_AUTHENTICATION_FAILED);
 		loop->processEvents();
 		CPPUNIT_ASSERT(streamEnded);
 		user = userManager->getUser("user@localhost");
 		CPPUNIT_ASSERT(!user);
 		CPPUNIT_ASSERT_EQUAL(2, (int) received.size());
 		Swift::Message *m = dynamic_cast<Swift::Message *>(getStanza(received[0]));
 		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), m->getBody().get_value_or(""));

0 comments (0 inline, 0 general)