7 files changed, 50 insertions, 10 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
@@ -5,7 +5,14 @@
  */
 
+/*
+ * 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>
@@ -45,5 +52,5 @@ void ShowProfileController::handleUIEvent(UIEvent::ref event) {
 		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);
diff --git a/Swift/Controllers/Storages/VCardFileStorage.cpp b/Swift/Controllers/Storages/VCardFileStorage.cpp
index b22e235..876d642 100644
--- a/Swift/Controllers/Storages/VCardFileStorage.cpp
+++ b/Swift/Controllers/Storages/VCardFileStorage.cpp
@@ -1,4 +1,4 @@
 /*
- * 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.
@@ -59,5 +59,15 @@ boost::shared_ptr<VCard> VCardFileStorage::getVCard(const JID& jid) const {
 }
 
+boost::posix_time::ptime VCardFileStorage::getVCardWriteTime(const JID& jid) const {
+	if (vcardWriteTimes.find(jid) == vcardWriteTimes.end()) {
+		return boost::posix_time::ptime();
+	}
+	else {
+		return vcardWriteTimes.at(jid);
+	}
+}
+
 void VCardFileStorage::setVCard(const JID& jid, VCard::ref v) {
+	vcardWriteTimes[jid] = boost::posix_time::second_clock::universal_time();
 	VCardPersister().savePayload(v, getVCardPath(jid));
 	getAndUpdatePhotoHash(jid, v);
diff --git a/Swift/Controllers/Storages/VCardFileStorage.h b/Swift/Controllers/Storages/VCardFileStorage.h
index 2c3af3d..8ba001e 100644
--- a/Swift/Controllers/Storages/VCardFileStorage.h
+++ b/Swift/Controllers/Storages/VCardFileStorage.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010-2013 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.
@@ -22,4 +22,5 @@ namespace Swift {
 
 			virtual VCard::ref getVCard(const JID& jid) const;
+			virtual boost::posix_time::ptime getVCardWriteTime(const JID& jid) const;
 			virtual void setVCard(const JID& jid, VCard::ref v);
 
@@ -38,4 +39,5 @@ namespace Swift {
 			typedef std::map<JID, std::string> PhotoHashMap;
 			mutable PhotoHashMap photoHashes;
+			std::map<JID, boost::posix_time::ptime> vcardWriteTimes;
 	};
 }
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,4 +1,4 @@
 /*
- * 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.
@@ -9,4 +9,5 @@
 #include <boost/bind.hpp>
 
+#include <Swiften/Base/Log.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/VCards/VCardStorage.h>
@@ -26,7 +27,9 @@ VCard::ref VCardManager::getVCard(const JID& jid) const {
 }
 
-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);
 	}
diff --git a/Swiften/VCards/VCardManager.h b/Swiften/VCards/VCardManager.h
index b7e3c32..78e0f3e 100644
--- a/Swiften/VCards/VCardManager.h
+++ b/Swiften/VCards/VCardManager.h
@@ -1,4 +1,4 @@
 /*
- * 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.
@@ -9,4 +9,6 @@
 #include <set>
 
+#include <boost/date_time/posix_time/posix_time.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/JID/JID.h>
@@ -27,5 +29,5 @@ namespace Swift {
 
 			VCard::ref getVCard(const JID& jid) const;
-			VCard::ref getVCardAndRequestWhenNeeded(const JID& jid);
+			VCard::ref getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge = boost::posix_time::time_duration(boost::date_time::pos_infin));
 			void requestVCard(const JID& jid);
 			void requestOwnVCard();
diff --git a/Swiften/VCards/VCardMemoryStorage.h b/Swiften/VCards/VCardMemoryStorage.h
index 86ae1b2..f538fc1 100644
--- a/Swiften/VCards/VCardMemoryStorage.h
+++ b/Swiften/VCards/VCardMemoryStorage.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010-2013 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.
@@ -8,4 +8,5 @@
 
 #include <boost/shared_ptr.hpp>
+
 #include <map>
 
@@ -28,11 +29,23 @@ namespace Swift {
 			}
 
+			virtual boost::posix_time::ptime getVCardWriteTime(const JID& jid) const {
+				if (vcardWriteTimes.find(jid) == vcardWriteTimes.end()) {
+					return boost::posix_time::ptime();
+				}
+				else {
+					return vcardWriteTimes.at(jid);
+				}
+			}
+
 			virtual void setVCard(const JID& jid, VCard::ref v) {
 				vcards[jid] = v;
+				vcardWriteTimes[jid] = boost::posix_time::second_clock::universal_time();
 			}
 
 		private:
 			typedef std::map<JID, VCard::ref> VCardMap;
+			typedef std::map<JID, boost::posix_time::ptime> VCardWriteTimeMap;
 			VCardMap vcards;
+			VCardWriteTimeMap vcardWriteTimes;
 	};
 }
diff --git a/Swiften/VCards/VCardStorage.h b/Swiften/VCards/VCardStorage.h
index 924204c..e6c84f4 100644
--- a/Swiften/VCards/VCardStorage.h
+++ b/Swiften/VCards/VCardStorage.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010-2013 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.
@@ -8,5 +8,7 @@
 
 #include <string>
+
 #include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <Swiften/Base/API.h>
@@ -23,4 +25,5 @@ namespace Swift {
 
 			virtual VCard::ref getVCard(const JID& jid) const = 0;
+			virtual boost::posix_time::ptime getVCardWriteTime(const JID& jid) const = 0;
 			virtual void setVCard(const JID&, VCard::ref) = 0;