Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-03 13:48:37 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-08 07:37:33 (GMT) |
| commit | 3e40b302af0e2abde3c002c7f25ec5276f68f230 (patch) | |
| tree | cb73311e851d00364d22de1da978e45553b43912 /Swiften/VCards/VCardManager.cpp | |
| parent | b67aba2e28e5fd716c18bef9c2826b482ef832ad (diff) | |
| download | swift-contrib-3e40b302af0e2abde3c002c7f25ec5276f68f230.zip swift-contrib-3e40b302af0e2abde3c002c7f25ec5276f68f230.tar.bz2 | |
Update vCard cache on 'Show Profile' if cached vCard is older than 5 minutes.
Store last write time in memory in VCardStorage. VCardManager::getVCardAndRequestWhenNeeded
will check an optional parameter and the last write time to determine if the
cached vCard is fresh enough.
Test-Information:
ALl unit tests still run fine and tested that it fetches the vCard again when you
open the 'Show Profile' dialog after 5 minutes.
Change-Id: I27d7f931188a43aa090348014bcdbdf6d534c5a0
Diffstat (limited to 'Swiften/VCards/VCardManager.cpp')
| -rw-r--r-- | Swiften/VCards/VCardManager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Swiften/VCards/VCardManager.cpp b/Swiften/VCards/VCardManager.cpp index 52447a1..5a65dcd 100644 --- a/Swiften/VCards/VCardManager.cpp +++ b/Swiften/VCards/VCardManager.cpp @@ -1,65 +1,68 @@ /* - * Copyright (c) 2010 Remko Tronçon + * Copyright (c) 2010-2014 Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #include <Swiften/VCards/VCardManager.h> #include <boost/bind.hpp> +#include <Swiften/Base/Log.h> #include <Swiften/JID/JID.h> #include <Swiften/VCards/VCardStorage.h> #include <Swiften/VCards/GetVCardRequest.h> namespace Swift { VCardManager::VCardManager(const JID& ownJID, IQRouter* iqRouter, VCardStorage* vcardStorage) : ownJID(ownJID), iqRouter(iqRouter), storage(vcardStorage) { } VCardManager::~VCardManager() { } VCard::ref VCardManager::getVCard(const JID& jid) const { return storage->getVCard(jid); } -VCard::ref VCardManager::getVCardAndRequestWhenNeeded(const JID& jid) { +VCard::ref VCardManager::getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge) { VCard::ref vcard = storage->getVCard(jid); - if (!vcard) { + 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); } void VCardManager::requestOwnVCard() { requestVCard(JID()); } void VCardManager::handleVCardReceived(const JID& actualJID, VCard::ref vcard, ErrorPayload::ref error) { if (error || !vcard) { vcard = VCard::ref(new VCard()); } requestedVCards.erase(actualJID); JID jid = actualJID.isValid() ? actualJID : ownJID.toBare(); setVCard(jid, vcard); } 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; } |