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 /Swift/Controllers/ShowProfileController.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 'Swift/Controllers/ShowProfileController.cpp')
| -rw-r--r-- | Swift/Controllers/ShowProfileController.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Swift/Controllers/ShowProfileController.cpp b/Swift/Controllers/ShowProfileController.cpp index 15b7b26..d13e5a1 100644 --- a/Swift/Controllers/ShowProfileController.cpp +++ b/Swift/Controllers/ShowProfileController.cpp @@ -1,74 +1,81 @@ /* * Copyright (c) 2012 Tobias Markmann * Licensed under the simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2014 Kevin Smith and Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + #include "ShowProfileController.h" #include <boost/bind.hpp> +#include <boost/date_time/posix_time/posix_time.hpp> #include <Swiften/Base/foreach.h> #include <Swiften/VCards/VCardManager.h> #include <Swift/Controllers/UIEvents/ShowProfileForRosterItemUIEvent.h> #include <Swift/Controllers/UIEvents/UIEventStream.h> #include <Swift/Controllers/UIInterfaces/ProfileWindowFactory.h> namespace Swift { ShowProfileController::ShowProfileController(VCardManager* vcardManager, ProfileWindowFactory* profileWindowFactory, UIEventStream* uiEventStream) : vcardManager(vcardManager), profileWindowFactory(profileWindowFactory), uiEventStream(uiEventStream) { uiEventStream->onUIEvent.connect(boost::bind(&ShowProfileController::handleUIEvent, this, _1)); vcardManager->onVCardChanged.connect(boost::bind(&ShowProfileController::handleVCardChanged, this, _1, _2)); } ShowProfileController::~ShowProfileController() { typedef std::pair<JID, ProfileWindow*> JIDProfileWindowPair; foreach(const JIDProfileWindowPair& jidWndPair, openedProfileWindows) { jidWndPair.second->onWindowAboutToBeClosed.disconnect(boost::bind(&ShowProfileController::handleProfileWindowAboutToBeClosed, this, _1)); delete jidWndPair.second; } vcardManager->onVCardChanged.disconnect(boost::bind(&ShowProfileController::handleVCardChanged, this, _1, _2)); uiEventStream->onUIEvent.disconnect(boost::bind(&ShowProfileController::handleUIEvent, this, _1)); } void ShowProfileController::handleUIEvent(UIEvent::ref event) { ShowProfileForRosterItemUIEvent::ref showProfileEvent = boost::dynamic_pointer_cast<ShowProfileForRosterItemUIEvent>(event); if (!showProfileEvent) { return; } if (openedProfileWindows.find(showProfileEvent->getJID()) == openedProfileWindows.end()) { ProfileWindow* newProfileWindow = profileWindowFactory->createProfileWindow(); newProfileWindow->setJID(showProfileEvent->getJID()); newProfileWindow->onWindowAboutToBeClosed.connect(boost::bind(&ShowProfileController::handleProfileWindowAboutToBeClosed, this, _1)); openedProfileWindows[showProfileEvent->getJID()] = newProfileWindow; - VCard::ref vcard = vcardManager->getVCardAndRequestWhenNeeded(showProfileEvent->getJID()); + VCard::ref vcard = vcardManager->getVCardAndRequestWhenNeeded(showProfileEvent->getJID(), boost::posix_time::minutes(5)); if (vcard) { newProfileWindow->setVCard(vcard); } else { newProfileWindow->setProcessing(true); } newProfileWindow->show(); } else { openedProfileWindows[showProfileEvent->getJID()]->show(); } } void ShowProfileController::handleVCardChanged(const JID& jid, VCard::ref vcard) { if (openedProfileWindows.find(jid) == openedProfileWindows.end()) { return; } ProfileWindow* profileWindow = openedProfileWindows[jid]; profileWindow->setVCard(vcard); profileWindow->setProcessing(false); profileWindow->show(); } void ShowProfileController::handleProfileWindowAboutToBeClosed(const JID& profileJid) { openedProfileWindows.erase(profileJid); } } |