From caaf4640bbc58d9c57c1bb24e6fb43e0642d199e Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Thu, 14 Jul 2011 14:21:40 +0200
Subject: [PATCH] Send RIE only if client supports it

---
 include/transport/rostermanager.h |  2 ++
 src/rostermanager.cpp             | 40 ++++++++++++++++++++++++-------
 src/user.cpp                      |  2 +-
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/include/transport/rostermanager.h b/include/transport/rostermanager.h
index 10fe69b1..1d37a74f 100644
--- a/include/transport/rostermanager.h
+++ b/include/transport/rostermanager.h
@@ -84,6 +84,8 @@ class RosterManager {
 
 		void sendBuddyRosterPush(Buddy *buddy);
 
+		void sendBuddySubscribePresence(Buddy *buddy);
+
 		void sendCurrentPresences(const Swift::JID &to);
 
 		void sendUnavailablePresences(const Swift::JID &to);
diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index 72758adf..8bdb4ffb 100644
--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@@ -50,10 +50,6 @@ RosterManager::~RosterManager() {
 	m_setBuddyTimer->stop();
 	m_RIETimer->stop();
 	if (m_rosterStorage) {
-// 		for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
-// 			Buddy *buddy = (*it).second;
-// 			m_rosterStorage->storeBuddy(buddy);
-// 		}
 		m_rosterStorage->storeBuddies();
 	}
 
@@ -92,6 +88,15 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
 	request->send();
 }
 
+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::setBuddyCallback(Buddy *buddy) {
 	m_setBuddyTimer->onTick.disconnect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 
@@ -111,9 +116,15 @@ void RosterManager::setBuddyCallback(Buddy *buddy) {
 	else {
 		if (m_setBuddyTimer->onTick.empty()) {
 			m_setBuddyTimer->stop();
-			if (true /*&& rie_is_supported*/) {
+
+			// Send RIE only if there's resource which supports it.
+			Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
+			if (jidWithRIE.isValid()) {
 				m_RIETimer->start();
 			}
+			else {
+				sendBuddySubscribePresence(buddy);
+			}
 		}
 	}
 
@@ -147,9 +158,22 @@ Buddy *RosterManager::getBuddy(const std::string &name) {
 void RosterManager::sendRIE() {
 	m_RIETimer->stop();
 
-	Swift::Presence::ref highest = m_component->getPresenceOracle()->getHighestPriorityPresence(m_user->getJID().toBare());
+	// Check the feature, because proper resource could logout during RIETimer.
+	Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
 
-	LOG4CXX_INFO(logger, "Sending RIE stanza to " << highest->getFrom().toString());
+	// 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;
+	}
+
+	LOG4CXX_INFO(logger, "Sending RIE stanza to " << jidWithRIE.toString());
 
 	Swift::RosterItemExchangePayload::ref payload = Swift::RosterItemExchangePayload::ref(new Swift::RosterItemExchangePayload());
 	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
@@ -166,7 +190,7 @@ void RosterManager::sendRIE() {
 		payload->addItem(item);
 	}
 
-	boost::shared_ptr<Swift::GenericRequest<Swift::RosterItemExchangePayload> > request(new Swift::GenericRequest<Swift::RosterItemExchangePayload>(Swift::IQ::Set, highest->getFrom(), payload, m_component->getIQRouter()));
+	boost::shared_ptr<Swift::GenericRequest<Swift::RosterItemExchangePayload> > request(new Swift::GenericRequest<Swift::RosterItemExchangePayload>(Swift::IQ::Set, jidWithRIE, payload, m_component->getIQRouter()));
 	request->send();
 }
 
diff --git a/src/user.cpp b/src/user.cpp
index fcc53d67..c7d25428 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -79,7 +79,7 @@ Swift::JID User::getJIDWithFeature(const std::string &feature) {
 			continue;
 
 		Swift::DiscoInfo::ref discoInfo = m_entityCapsManager->getCaps(presence->getFrom());
-		if (discoInfo)
+		if (!discoInfo)
 			continue;
 
 		if (discoInfo->hasFeature(feature)) {