diff options
Diffstat (limited to 'Swiften/VCards/VCardManager.cpp')
| -rw-r--r-- | Swiften/VCards/VCardManager.cpp | 80 | 
1 files changed, 40 insertions, 40 deletions
| diff --git a/Swiften/VCards/VCardManager.cpp b/Swiften/VCards/VCardManager.cpp index 347cc3d..95b96fa 100644 --- a/Swiften/VCards/VCardManager.cpp +++ b/Swiften/VCards/VCardManager.cpp @@ -22,71 +22,71 @@ VCardManager::~VCardManager() {  }  VCard::ref VCardManager::getVCard(const JID& jid) const { -	return storage->getVCard(jid); +    return storage->getVCard(jid);  }  VCard::ref VCardManager::getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge) { -	VCard::ref vcard = storage->getVCard(jid); -	boost::posix_time::ptime vcardFetchedTime = storage->getVCardWriteTime(jid); -	bool vcardTooOld = vcard && (vcardFetchedTime.is_special() || ((boost::posix_time::second_clock::universal_time() - vcardFetchedTime) > allowedAge)); -	if (!vcard || vcardTooOld) { -		requestVCard(jid); -	} -	return vcard; +    VCard::ref vcard = storage->getVCard(jid); +    boost::posix_time::ptime vcardFetchedTime = storage->getVCardWriteTime(jid); +    bool vcardTooOld = vcard && (vcardFetchedTime.is_special() || ((boost::posix_time::second_clock::universal_time() - vcardFetchedTime) > allowedAge)); +    if (!vcard || vcardTooOld) { +        requestVCard(jid); +    } +    return vcard;  }  void VCardManager::requestVCard(const JID& requestedJID) { -	JID jid = requestedJID.equals(ownJID, JID::WithoutResource) ? JID() : requestedJID; -	if (requestedVCards.find(jid) != requestedVCards.end()) { -		return; -	} -	GetVCardRequest::ref request = GetVCardRequest::create(jid, iqRouter); -	request->onResponse.connect(boost::bind(&VCardManager::handleVCardReceived, this, jid, _1, _2)); -	request->send(); -	requestedVCards.insert(jid); +    JID jid = requestedJID.equals(ownJID, JID::WithoutResource) ? JID() : requestedJID; +    if (requestedVCards.find(jid) != requestedVCards.end()) { +        return; +    } +    GetVCardRequest::ref request = GetVCardRequest::create(jid, iqRouter); +    request->onResponse.connect(boost::bind(&VCardManager::handleVCardReceived, this, jid, _1, _2)); +    request->send(); +    requestedVCards.insert(jid);  }  void VCardManager::requestOwnVCard() { -	requestVCard(JID()); +    requestVCard(JID());  }  void VCardManager::handleVCardReceived(const JID& actualJID, VCard::ref vcard, ErrorPayload::ref error) { -	requestedVCards.erase(actualJID); -	if (!error) { -		if (!vcard) { -			vcard = VCard::ref(new VCard()); -		} -		JID jid = actualJID.isValid() ? actualJID : ownJID.toBare(); -		setVCard(jid, vcard); -	} -	else { -		onVCardRetrievalError(actualJID, error); -	} +    requestedVCards.erase(actualJID); +    if (!error) { +        if (!vcard) { +            vcard = VCard::ref(new VCard()); +        } +        JID jid = actualJID.isValid() ? actualJID : ownJID.toBare(); +        setVCard(jid, vcard); +    } +    else { +        onVCardRetrievalError(actualJID, error); +    }  }  SetVCardRequest::ref VCardManager::createSetVCardRequest(VCard::ref vcard) { -	SetVCardRequest::ref request = SetVCardRequest::create(vcard, iqRouter); -	request->onResponse.connect(boost::bind(&VCardManager::handleSetVCardResponse, this, vcard, _2)); -	return request; +    SetVCardRequest::ref request = SetVCardRequest::create(vcard, iqRouter); +    request->onResponse.connect(boost::bind(&VCardManager::handleSetVCardResponse, this, vcard, _2)); +    return request;  }  void VCardManager::handleSetVCardResponse(VCard::ref vcard, ErrorPayload::ref error) { -	if (!error) { -		setVCard(ownJID.toBare(), vcard); -	} +    if (!error) { +        setVCard(ownJID.toBare(), vcard); +    }  }  void VCardManager::setVCard(const JID& jid, VCard::ref vcard) { -	storage->setVCard(jid, vcard); -	onVCardChanged(jid, vcard); -	if (jid.compare(ownJID, JID::WithoutResource) == 0) { -		onOwnVCardChanged(vcard); -	} +    storage->setVCard(jid, vcard); +    onVCardChanged(jid, vcard); +    if (jid.compare(ownJID, JID::WithoutResource) == 0) { +        onOwnVCardChanged(vcard); +    }  }  std::string VCardManager::getPhotoHash(const JID& jid) const { -	return storage->getPhotoHash(jid); +    return storage->getPhotoHash(jid);  }  } | 
 Swift
 Swift