1 files changed, 15 insertions, 1 deletions
diff --git a/Swift/Controllers/Roster/RosterController.cpp b/Swift/Controllers/Roster/RosterController.cpp
index ecca9fe..e823a1c 100644
--- a/Swift/Controllers/Roster/RosterController.cpp
+++ b/Swift/Controllers/Roster/RosterController.cpp
@@ -250,88 +250,102 @@ void RosterController::handleUIEvent(boost::shared_ptr<UIEvent> event) {
 		std::string group = renameGroupEvent->getGroup();
 		// FIXME: We should handle contacts groups specially to avoid clashes
 		if (group == QT_TRANSLATE_NOOP("", "Contacts")) {
 			group = "";
 		}
 		foreach(XMPPRosterItem& item, items) {
 			std::vector<std::string> groups = item.getGroups();
 			if ( (group.empty() && groups.empty()) || std::find(groups.begin(), groups.end(), group) != groups.end()) {
 				groups.erase(std::remove(groups.begin(), groups.end(), group), groups.end());
 				if (std::find(groups.begin(), groups.end(), renameGroupEvent->getNewName()) == groups.end()) {
 					groups.push_back(renameGroupEvent->getNewName());
 				}
 				item.setGroups(groups);
 				updateItem(item);
 			}
 		}
 	}
 	else if (boost::shared_ptr<SendFileUIEvent> sendFileEvent = boost::dynamic_pointer_cast<SendFileUIEvent>(event)) {
 		//TODO add send file dialog to ChatView of receipient jid
 		ftOverview_->sendFile(sendFileEvent->getJID(), sendFileEvent->getFilename());
 	}
 }
 
 void RosterController::setContactGroups(const JID& jid, const std::vector<std::string>& groups) {
 	updateItem(XMPPRosterItem(jid, xmppRoster_->getNameForJID(jid), groups, xmppRoster_->getSubscriptionStateForJID(jid)));
 }
 
 void RosterController::updateItem(const XMPPRosterItem& item) {
 	RosterItemPayload itemPayload(item.getJID(), item.getName(), item.getSubscription());
 	itemPayload.setGroups(item.getGroups());
 
 	RosterPayload::ref roster = boost::make_shared<RosterPayload>();
 	roster->addItem(itemPayload);
 
 	SetRosterRequest::ref request = SetRosterRequest::create(roster, iqRouter_);
-	request->onResponse.connect(boost::bind(&RosterController::handleRosterSetError, this, _1, roster));
+	request->onResponse.connect(boost::bind(&RosterController::handleRosterItemUpdated, this, _1, roster));
 	request->send();
 }
 
 void RosterController::initBlockingCommand() {
 	boost::shared_ptr<BlockList> blockList = clientBlockListManager_->getBlockList();
 
 	blockingOnStateChangedConnection_ = blockList->onStateChanged.connect(boost::bind(&RosterController::handleBlockingStateChanged, this));
 	blockingOnItemAddedConnection_ = blockList->onItemAdded.connect(boost::bind(&RosterController::handleBlockingItemAdded, this, _1));
 	blockingOnItemRemovedConnection_ = blockList->onItemRemoved.connect(boost::bind(&RosterController::handleBlockingItemRemoved, this, _1));
 	roster_->setBlockingSupported(true);
 	if (blockList->getState() == BlockList::Available) {
 		foreach(const JID& jid, blockList->getItems()) {
 			roster_->applyOnItems(SetBlockingState(jid, ContactRosterItem::IsBlocked));
 		}
 	}
 }
 
+void RosterController::handleRosterItemUpdated(ErrorPayload::ref error, boost::shared_ptr<RosterPayload> rosterPayload) {
+	if (!!error) {
+		handleRosterSetError(error, rosterPayload);
+	}
+	boost::shared_ptr<BlockList> blockList = clientBlockListManager_->getBlockList();
+	std::vector<RosterItemPayload> items = rosterPayload->getItems();
+	if (blockList->getState() == BlockList::Available && items.size() > 0) {
+		std::vector<JID> jids = blockList->getItems();
+		if (std::find(jids.begin(), jids.end(), items[0].getJID()) != jids.end()) {
+			roster_->applyOnItems(SetBlockingState(items[0].getJID(), ContactRosterItem::IsBlocked));
+		}
+	}
+}
+
 void RosterController::handleRosterSetError(ErrorPayload::ref error, boost::shared_ptr<RosterPayload> rosterPayload) {
 	if (!error) {
 		return;
 	}
 	std::string text = str(format(QT_TRANSLATE_NOOP("", "Server %1% rejected contact list change to item '%2%'")) % myJID_.getDomain() % rosterPayload->getItems()[0].getJID().toString());
 	if (!error->getText().empty()) {
 		text += ": " + error->getText();
 	}
 	boost::shared_ptr<ErrorEvent> errorEvent(new ErrorEvent(JID(myJID_.getDomain()), text));
 	eventController_->handleIncomingEvent(errorEvent);
 }
 
 void RosterController::handleIncomingPresence(Presence::ref newPresence) {
 	if (newPresence->getType() == Presence::Error) {
 		return;
 	}
 	roster_->applyOnItems(SetPresence(newPresence));
 }
 
 void RosterController::handleSubscriptionRequest(const JID& jid, const std::string& message) {
 	if (xmppRoster_->containsJID(jid) && (xmppRoster_->getSubscriptionStateForJID(jid) == RosterItemPayload::To || xmppRoster_->getSubscriptionStateForJID(jid) == RosterItemPayload::Both)) {
 		subscriptionManager_->confirmSubscription(jid);
 		return;
 	}
 	SubscriptionRequestEvent* eventPointer = new SubscriptionRequestEvent(jid, message);
 	eventPointer->onAccept.connect(boost::bind(&RosterController::handleSubscriptionRequestAccepted, this, eventPointer));
 	eventPointer->onDecline.connect(boost::bind(&RosterController::handleSubscriptionRequestDeclined, this, eventPointer));
 	boost::shared_ptr<StanzaEvent> event(eventPointer);
 	eventController_->handleIncomingEvent(event);
 }
 
 void RosterController::handleSubscriptionRequestAccepted(SubscriptionRequestEvent* event) {
 	subscriptionManager_->confirmSubscription(event->getJID());
 	if (!xmppRoster_->containsJID(event->getJID()) || xmppRoster_->getSubscriptionStateForJID(event->getJID()) == RosterItemPayload::None || xmppRoster_->getSubscriptionStateForJID(event->getJID()) == RosterItemPayload::From) {
 		subscriptionManager_->requestSubscription(event->getJID());