4 files changed, 34 insertions, 4 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index 75c6c71..bf39216 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -131,8 +131,9 @@ void ChatControllerBase::handleSendMessageRequest(const std::string &body, bool
 		}
 	}
 	preSendMessageRequest(message);
+
+	boost::posix_time::ptime now = boost::posix_time::microsec_clock::universal_time();
 	if (useDelayForLatency_) {
-		boost::posix_time::ptime now = boost::posix_time::microsec_clock::universal_time();
 		message->addPayload(boost::make_shared<Delay>(now, selfJID_));
 	}
 	if (isCorrectionMessage) {
@@ -142,6 +143,9 @@ void ChatControllerBase::handleSendMessageRequest(const std::string &body, bool
 	stanzaChannel_->sendMessage(message);
 	postSendMessage(message->getBody(), boost::dynamic_pointer_cast<Stanza>(message));
 	onActivity(message->getBody());
+
+	// log message
+	historyController_->addMessage(getBaseJID(), selfJID_, toJID_, body, now);
 }
 
 void ChatControllerBase::handleSecurityLabelsCatalogResponse(boost::shared_ptr<SecurityLabelsCatalog> catalog, ErrorPayload::ref error) {
@@ -248,6 +252,8 @@ void ChatControllerBase::handleIncomingMessage(boost::shared_ptr<MessageEvent> m
 		}
 		else {
 			lastMessagesUIID_[from] = addMessage(body, senderDisplayNameFromMessage(from), isIncomingMessageFromMe(message), label, std::string(avatarManager_->getAvatarPath(from).string()), timeStamp);
+			// void HistoryController::addMessage(const JID& baseJID, const JID& fromJID, const JID& toJID, std::string messageBody, boost::posix_time::ptime timeStamp) {
+			historyController_->addMessage(getBaseJID(), from, message->getTo(), body, timeStamp);
 		}
 	}
 	chatWindow_->show();
diff --git a/Swift/Controllers/HistoryController.cpp b/Swift/Controllers/HistoryController.cpp
index f04fceb..a19e321 100644
--- a/Swift/Controllers/HistoryController.cpp
+++ b/Swift/Controllers/HistoryController.cpp
@@ -5,9 +5,20 @@
  */
 
 #include <Swift/Controllers/HistoryController.h>
-
-#include <Swift/Controllers/UIInterfaces/HistoryWindowFactory.h>
-#include <Swift/Controllers/UIEvents/RequestHistoryUIEvent.h>
+#include <Swiften/History/SQLiteHistoryManager.h>
 
 namespace Swift {
+	HistoryController::HistoryController() : remoteArchiveSupported_(false) {
+		std::string file("testDB.db");
+		localHistory_ = new SQLiteHistoryManager(file);
+	}
+
+	HistoryController::~HistoryController() {
+		delete localHistory_;
+	}
+
+	void HistoryController::addMessage(const JID& baseJID, const JID& fromJID, const JID& toJID, std::string messageBody, boost::posix_time::ptime timeStamp) {
+		std::cout << baseJID << " " << fromJID << " " << toJID << " " << messageBody << " " << to_simple_string(timeStamp);
+	}
+
 }
diff --git a/Swift/Controllers/HistoryController.h b/Swift/Controllers/HistoryController.h
index dedf840..9949c19 100644
--- a/Swift/Controllers/HistoryController.h
+++ b/Swift/Controllers/HistoryController.h
@@ -7,9 +7,21 @@
 #pragma once
 
 #include <Swiften/JID/JID.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
 
 namespace Swift {
+	class HistoryManager;
+	class JID;
 
 	class HistoryController {
+		public:
+			HistoryController();
+			~HistoryController();
+
+			void addMessage(const JID& baseJID, const JID& fromJID, const JID& toJID, std::string messageBody, boost::posix_time::ptime timeStamp);
+
+		private:
+			HistoryManager* localHistory_;
+			bool remoteArchiveSupported_;
 	};
 }
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 2011f63..295ad3e 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -198,6 +198,7 @@ MainController::~MainController() {
 	delete fileTransferListController_;
 	delete xmlConsoleController_;
 	delete historyController_;
+	delete historyViewController_;
 	delete xmppURIController_;
 	delete soundEventController_;
 	delete systemTrayController_;