9 files changed, 506 insertions, 226 deletions
diff --git a/Swiften/History/HistoryManager.cpp b/Swiften/History/HistoryManager.cpp
deleted file mode 100644
index 7eb66ab..0000000
--- a/Swiften/History/HistoryManager.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#include <Swiften/History/HistoryManager.h>
-
-namespace Swift {
-
-HistoryManager::~HistoryManager() {
-}
-
-}
diff --git a/Swiften/History/HistoryManager.h b/Swiften/History/HistoryManager.h
deleted file mode 100644
index 7a4324b..0000000
--- a/Swiften/History/HistoryManager.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#pragma once
-
-#include <vector>
-#include <Swiften/JID/JID.h>
-#include <Swiften/History/HistoryMessage.h>
-
-namespace Swift {
-	class HistoryManager {
-		public:
-			virtual ~HistoryManager();
-
-			virtual void addMessage(const HistoryMessage& message) = 0;
-
-			virtual std::vector<HistoryMessage> getMessages() const = 0;
-	};
-}
diff --git a/Swiften/History/HistoryMessage.h b/Swiften/History/HistoryMessage.h
index 461f5de..b3d977f 100644
--- a/Swiften/History/HistoryMessage.h
+++ b/Swiften/History/HistoryMessage.h
@@ -12,33 +12,61 @@
 namespace Swift {
 	class HistoryMessage {
 		public:
-			HistoryMessage(const std::string& message, const JID& from, const JID& to, const boost::posix_time::ptime time) : message_(message), from_(from), to_(to), time_(time) {
+			enum Type {
+				Chat = 0,
+				Groupchat = 1,
+				PrivateMessage = 2
+			};
+
+			HistoryMessage(
+				const std::string& message,
+				const JID& fromJID,
+				const JID& toJID,
+				Type type,
+				const boost::posix_time::ptime& time,
+				int utcOffset = 0) :
+					message_(message),
+					fromJID_(fromJID),
+					toJID_(toJID),
+					type_(type),
+					time_(time),
+					utcOffset_(utcOffset) {
 			}
 
 			const std::string& getMessage() const {
 				return message_;
 			}
 
-			const JID& getFrom() const {
-				return from_;
+			const JID& getFromJID() const {
+				return fromJID_;
+			}
+
+			const JID& getToJID() const {
+				return toJID_;
 			}
 
-			const JID& getTo() const {
-				return to_;
+			Type getType() const {
+				return type_;
 			}
 
 			boost::posix_time::ptime getTime() const {
 				return time_;
 			}
 
+			int getOffset() const {
+				return utcOffset_;
+			}
+
 			bool operator==(const HistoryMessage& o) const {
-				return message_ == o.message_ && from_ == o.from_ && to_ == o.to_ && time_ == o.time_;
+				return message_ == o.message_ && fromJID_ == o.fromJID_ && toJID_ == o.toJID_ && type_ == o.type_ && time_ == o.time_;
 			}
 
 		private:
 			std::string message_;
-			JID from_;
-			JID to_;
+			JID fromJID_;
+			JID toJID_;
+			Type type_;
 			boost::posix_time::ptime time_;
+			int utcOffset_;
 	};
 }
diff --git a/Swiften/History/HistoryStorage.h b/Swiften/History/HistoryStorage.h
new file mode 100644
index 0000000..fcf28b5
--- /dev/null
+++ b/Swiften/History/HistoryStorage.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <set>
+#include <map>
+#include <vector>
+#include <Swiften/JID/JID.h>
+#include <Swiften/History/HistoryMessage.h>
+#include <boost/date_time/gregorian/gregorian_types.hpp>
+
+namespace Swift {
+	typedef std::map<JID, std::set<boost::gregorian::date> > ContactsMap;
+
+	class HistoryStorage {
+		/**
+		 * Messages are stored using localtime timestamps.
+		 */
+		public:
+			virtual ~HistoryStorage() {};
+
+			virtual void addMessage(const HistoryMessage& message) = 0;
+			virtual std::vector<HistoryMessage> getMessagesFromDate(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date) const = 0;
+			virtual std::vector<HistoryMessage> getMessagesFromNextDate(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date) const = 0;
+			virtual std::vector<HistoryMessage> getMessagesFromPreviousDate(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date) const = 0;
+			virtual ContactsMap getContacts(const JID& selfJID, HistoryMessage::Type type, const std::string& keyword) const = 0;
+			virtual boost::posix_time::ptime getLastTimeStampFromMUC(const JID& selfJID, const JID& mucJID) const = 0;
+	};
+}
diff --git a/Swiften/History/SConscript b/Swiften/History/SConscript
index 9c2a9d6..bc0d64c 100644
--- a/Swiften/History/SConscript
+++ b/Swiften/History/SConscript
@@ -1,11 +1,10 @@
 Import("swiften_env")
 
-#myenv = swiften_env.Clone()
-#if myenv["target"] == "native":
-#   myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS", {}))
-#
-#objects = myenv.SwiftenObject([
-#			"HistoryManager.cpp",
-#			"SQLiteHistoryManager.cpp",
-#		])
-#swiften_env.Append(SWIFTEN_OBJECTS = [objects])
+myenv = swiften_env.Clone()
+if myenv["target"] == "native":
+   myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS", {}))
+
+objects = myenv.SwiftenObject([
+			"SQLiteHistoryStorage.cpp",
+		])
+swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/History/SQLiteHistoryManager.cpp b/Swiften/History/SQLiteHistoryManager.cpp
deleted file mode 100644
index 3b65f62..0000000
--- a/Swiften/History/SQLiteHistoryManager.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#include <iostream>
-#include <boost/lexical_cast.hpp>
-
-#include <sqlite3.h>
-#include <Swiften/History/SQLiteHistoryManager.h>
-
-namespace {
-
-inline Swift::std::string getEscapedString(const Swift::std::string& s) {
-	Swift::std::string result(s);
-	result.replaceAll('\'', Swift::std::string("\\'"));
-	return result;
-}
-
-}
-
-
-namespace Swift {
-
-SQLiteHistoryManager::SQLiteHistoryManager(const std::string& file) : db_(0) {
-	sqlite3_open(file.c_str(), &db_);
-	if (!db_) {
-		std::cerr << "Error opening database " << file << std::endl; // FIXME
-	}
-
-	char* errorMessage;
-	int result = sqlite3_exec(db_, "CREATE TABLE IF NOT EXISTS messages('from' INTEGER, 'to' INTEGER, 'message' STRING, 'time' INTEGER)", 0, 0, &errorMessage);
-	if (result != SQLITE_OK) {
-		std::cerr << "SQL Error: " << errorMessage << std::endl;
-		sqlite3_free(errorMessage);
-	}
-
-	result = sqlite3_exec(db_, "CREATE TABLE IF NOT EXISTS jids('id' INTEGER PRIMARY KEY ASC AUTOINCREMENT, 'jid' STRING UNIQUE NOT NULL)", 0, 0, &errorMessage);
-	if (result != SQLITE_OK) {
-		std::cerr << "SQL Error: " << errorMessage << std::endl;
-		sqlite3_free(errorMessage);
-	}
-}
-
-SQLiteHistoryManager::~SQLiteHistoryManager() {
-	sqlite3_close(db_);
-}
-
-void SQLiteHistoryManager::addMessage(const HistoryMessage& message) {
-	int secondsSinceEpoch = (message.getTime() - boost::posix_time::ptime(boost::gregorian::date(1970, 1, 1))).total_seconds();
-	std::string statement = std::string("INSERT INTO messages('from', 'to', 'message', 'time') VALUES(") + boost::lexical_cast<std::string>(getIDForJID(message.getFrom())) + ", " + boost::lexical_cast<std::string>(getIDForJID(message.getTo())) + ", '" + getEscapedString(message.getMessage()) + "', " + boost::lexical_cast<std::string>(secondsSinceEpoch) + ")";
-	char* errorMessage;
-	int result = sqlite3_exec(db_, statement.c_str(), 0, 0, &errorMessage);
-	if (result != SQLITE_OK) {
-		std::cerr << "SQL Error: " << errorMessage << std::endl;
-		sqlite3_free(errorMessage);
-	}
-}
-
-std::vector<HistoryMessage> SQLiteHistoryManager::getMessages() const {
-	std::vector<HistoryMessage> result;
-	sqlite3_stmt* selectStatement;
-	std::string selectQuery("SELECT messages.'from', messages.'to', messages.'message', messages.'time' FROM messages");
-	int r = sqlite3_prepare(db_, selectQuery.c_str(), selectQuery.size(), &selectStatement, NULL);
-	if (r != SQLITE_OK) {
-		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
-	}
-	r = sqlite3_step(selectStatement);
-	while (r == SQLITE_ROW) {
-		boost::optional<JID> from(getJIDFromID(sqlite3_column_int(selectStatement, 0)));
-		boost::optional<JID> to(getJIDFromID(sqlite3_column_int(selectStatement, 1)));
-		std::string message(reinterpret_cast<const char*>(sqlite3_column_text(selectStatement, 2)));
-		int secondsSinceEpoch(sqlite3_column_int(selectStatement, 3));
-		boost::posix_time::ptime time(boost::gregorian::date(1970, 1, 1), boost::posix_time::seconds(secondsSinceEpoch));
-
-		result.push_back(HistoryMessage(message, (from ? *from : JID()), (to ? *to : JID()), time));
-		r = sqlite3_step(selectStatement);
-	}
-	if (r != SQLITE_DONE) {
-		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
-	}
-	sqlite3_finalize(selectStatement);
-	return result;
-}
-
-int SQLiteHistoryManager::getIDForJID(const JID& jid) {
-	boost::optional<int> id = getIDFromJID(jid);
-	if (id) {
-		return *id;
-	}
-	else {
-		return addJID(jid);
-	}
-}
-
-int SQLiteHistoryManager::addJID(const JID& jid) {
-	std::string statement = std::string("INSERT INTO jids('jid') VALUES('") + getEscapedString(jid.toString()) + "')";
-	char* errorMessage;
-	int result = sqlite3_exec(db_, statement.c_str(), 0, 0, &errorMessage);
-	if (result != SQLITE_OK) {
-		std::cerr << "SQL Error: " << errorMessage << std::endl;
-		sqlite3_free(errorMessage);
-	}
-	return sqlite3_last_insert_rowid(db_);
-}
-
-boost::optional<JID> SQLiteHistoryManager::getJIDFromID(int id) const {
-	boost::optional<JID> result;
-	sqlite3_stmt* selectStatement;
-	std::string selectQuery("SELECT jid FROM jids WHERE id=" + boost::lexical_cast<std::string>(id));
-	int r = sqlite3_prepare(db_, selectQuery.c_str(), selectQuery.size(), &selectStatement, NULL);
-	if (r != SQLITE_OK) {
-		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
-	}
-	r = sqlite3_step(selectStatement);
-	if (r == SQLITE_ROW) {
-		result = boost::optional<JID>(reinterpret_cast<const char*>(sqlite3_column_text(selectStatement, 0)));
-	}
-	sqlite3_finalize(selectStatement);
-	return result;
-}
-
-boost::optional<int> SQLiteHistoryManager::getIDFromJID(const JID& jid) const {
-	boost::optional<int> result;
-	sqlite3_stmt* selectStatement;
-	std::string selectQuery("SELECT id FROM jids WHERE jid='" + jid.toString() + "'");
-	int r = sqlite3_prepare(db_, selectQuery.c_str(), selectQuery.size(), &selectStatement, NULL);
-	if (r != SQLITE_OK) {
-		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
-	}
-	r = sqlite3_step(selectStatement);
-	if (r == SQLITE_ROW) {
-		result = boost::optional<int>(sqlite3_column_int(selectStatement, 0));
-	}
-	sqlite3_finalize(selectStatement);
-	return result;
-}
-
-}
diff --git a/Swiften/History/SQLiteHistoryManager.h b/Swiften/History/SQLiteHistoryManager.h
deleted file mode 100644
index ffd9492..0000000
--- a/Swiften/History/SQLiteHistoryManager.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#pragma once
-
-#include <boost/optional.hpp>
-
-#include <Swiften/History/HistoryManager.h>
-
-struct sqlite3;
-
-namespace Swift {
-	class SQLiteHistoryManager : public HistoryManager {
-		public:
-			SQLiteHistoryManager(const std::string& file);
-			~SQLiteHistoryManager();
-
-			virtual void addMessage(const HistoryMessage& message);
-			virtual std::vector<HistoryMessage> getMessages() const;
-
-			int getIDForJID(const JID&);
-			int addJID(const JID&);
-
-			boost::optional<JID> getJIDFromID(int id) const;
-			boost::optional<int> getIDFromJID(const JID& jid) const;
-
-		private:
-			sqlite3* db_;
-	};
-}
diff --git a/Swiften/History/SQLiteHistoryStorage.cpp b/Swiften/History/SQLiteHistoryStorage.cpp
new file mode 100644
index 0000000..ed0d6a3
--- /dev/null
+++ b/Swiften/History/SQLiteHistoryStorage.cpp
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <iostream>
+#include <boost/lexical_cast.hpp>
+
+#include <sqlite3.h>
+#include <3rdParty/SQLite/sqlite3async.h>
+#include <Swiften/History/SQLiteHistoryStorage.h>
+#include <boost/date_time/gregorian/gregorian.hpp>
+
+inline std::string getEscapedString(const std::string& s) {
+	std::string result(s);
+
+	size_t pos = result.find('\'');
+	while (pos != std::string::npos) {
+		result.insert(pos, "'");
+		pos = result.find('\'', pos + 2);
+	}
+	return result;
+}
+
+namespace Swift {
+
+SQLiteHistoryStorage::SQLiteHistoryStorage(const std::string& file) : db_(0) {
+	sqlite3_vfs vfs;
+
+	sqlite3async_initialize(NULL, true);
+	sqlite3_vfs_register(&vfs, false);
+
+	thread_ = new boost::thread(boost::bind(&SQLiteHistoryStorage::run, this));
+
+	sqlite3_open_v2(file.c_str(), &db_, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, "sqlite3async");
+	if (!db_) {
+		std::cerr << "Error opening database " << file << std::endl;
+	}
+
+	char* errorMessage;
+	int result = sqlite3_exec(db_, "CREATE TABLE IF NOT EXISTS messages('message' STRING, 'fromBare' INTEGER, 'fromResource' STRING, 'toBare' INTEGER, 'toResource' STRING, 'type' INTEGER, 'time' INTEGER, 'offset' INTEGER)", 0, 0, &errorMessage);
+	if (result != SQLITE_OK) {
+		std::cerr << "SQL Error: " << errorMessage << std::endl;
+		sqlite3_free(errorMessage);
+	}
+
+	result = sqlite3_exec(db_, "CREATE TABLE IF NOT EXISTS jids('id' INTEGER PRIMARY KEY ASC AUTOINCREMENT, 'jid' STRING UNIQUE NOT NULL)", 0, 0, &errorMessage);
+	if (result != SQLITE_OK) {
+		std::cerr << "SQL Error: " << errorMessage << std::endl;
+		sqlite3_free(errorMessage);
+	}
+}
+
+SQLiteHistoryStorage::~SQLiteHistoryStorage() {
+	sqlite3async_shutdown();
+	sqlite3_close(db_);
+	delete thread_;
+}
+
+void SQLiteHistoryStorage::addMessage(const HistoryMessage& message) {
+	int secondsSinceEpoch = (message.getTime() - boost::posix_time::ptime(boost::gregorian::date(1970, 1, 1))).total_seconds();
+
+	std::string statement = std::string("INSERT INTO messages('message', 'fromBare', 'fromResource', 'toBare', 'toResource', 'type', 'time', 'offset') VALUES(") +
+					"'" + getEscapedString(message.getMessage()) + "', " +
+					boost::lexical_cast<std::string>(getIDForJID(message.getFromJID().toBare())) + ", '" +
+					getEscapedString(message.getFromJID().getResource()) + "', " +
+					boost::lexical_cast<std::string>(getIDForJID(message.getToJID().toBare())) + ", '" +
+					getEscapedString(message.getToJID().getResource()) + "', " +
+					boost::lexical_cast<std::string>(message.getType()) + ", " +
+					boost::lexical_cast<std::string>(secondsSinceEpoch) + ", " +
+					boost::lexical_cast<std::string>(message.getOffset()) + ")";
+	char* errorMessage;
+	int result = sqlite3_exec(db_, statement.c_str(), 0, 0, &errorMessage);
+	if (result != SQLITE_OK) {
+		std::cerr << "SQL Error: " << errorMessage << std::endl;
+		sqlite3_free(errorMessage);
+	}
+}
+
+std::vector<HistoryMessage> SQLiteHistoryStorage::getMessagesFromDate(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date) const {
+	sqlite3_stmt* selectStatement;
+
+	boost::optional<int> selfID = getIDFromJID(selfJID.toBare());
+	boost::optional<int> contactID = getIDFromJID(contactJID.toBare());
+
+	if (!selfID || !contactID) {
+		// JIDs missing from the database
+		return std::vector<HistoryMessage>();
+	}
+
+	std::string selectQuery = "SELECT * FROM messages WHERE (type=" + boost::lexical_cast<std::string>(type);
+	if (contactJID.isBare()) {
+		// match only bare jid
+		selectQuery += " AND ((fromBare=" + boost::lexical_cast<std::string>(*selfID) + " AND toBare=" +
+				boost::lexical_cast<std::string>(*contactID) + ") OR (fromBare=" +
+				boost::lexical_cast<std::string>(*contactID) + " AND toBare=" + boost::lexical_cast<std::string>(*selfID) + ")))";
+	}
+	else {
+		// match resource too
+		selectQuery += " AND ((fromBare=" + boost::lexical_cast<std::string>(*selfID) + " AND (toBare=" +
+				boost::lexical_cast<std::string>(*contactID) +" AND toResource='" +
+				getEscapedString(contactJID.getResource()) + "')) OR ((fromBare=" +
+				boost::lexical_cast<std::string>(*contactID) + " AND fromResource='" +
+				getEscapedString(contactJID.getResource()) + "') AND toBare=" +
+				boost::lexical_cast<std::string>(*selfID) + ")))";
+	}
+
+	if (!date.is_not_a_date()) {
+		int lowerBound = (boost::posix_time::ptime(date) - boost::posix_time::ptime(boost::gregorian::date(1970, 1, 1))).total_seconds();
+		int upperBound = lowerBound + 86400;
+
+		selectQuery += " AND (time>=" + boost::lexical_cast<std::string>(lowerBound) +
+				" AND time<" + boost::lexical_cast<std::string>(upperBound) + ")";
+	}
+
+	int r = sqlite3_prepare(db_, selectQuery.c_str(), selectQuery.size(), &selectStatement, NULL);
+	if (r != SQLITE_OK) {
+		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
+	}
+	r = sqlite3_step(selectStatement);
+
+	// Retrieve result
+	std::vector<HistoryMessage> result;
+	while (r == SQLITE_ROW) {
+		std::string message(reinterpret_cast<const char*>(sqlite3_column_text(selectStatement, 0)));
+
+		// fromJID
+		boost::optional<JID> fromJID(getJIDFromID(sqlite3_column_int(selectStatement, 1)));
+		std::string fromResource(reinterpret_cast<const char*>(sqlite3_column_text(selectStatement, 2)));
+		if (fromJID) {
+			fromJID = boost::optional<JID>(JID(fromJID->getNode(), fromJID->getDomain(), fromResource));
+		}
+
+		// toJID
+		boost::optional<JID> toJID(getJIDFromID(sqlite3_column_int(selectStatement, 3)));
+		std::string toResource(reinterpret_cast<const char*>(sqlite3_column_text(selectStatement, 4)));
+		if (toJID) {
+			toJID = boost::optional<JID>(JID(toJID->getNode(), toJID->getDomain(), toResource));
+		}
+
+		// message type
+		HistoryMessage::Type type = static_cast<HistoryMessage::Type>(sqlite3_column_int(selectStatement, 5));
+
+		// timestamp
+		int secondsSinceEpoch(sqlite3_column_int(selectStatement, 6));
+		boost::posix_time::ptime time(boost::gregorian::date(1970, 1, 1), boost::posix_time::seconds(secondsSinceEpoch));
+
+		// offset from utc
+		int offset = sqlite3_column_int(selectStatement, 7);
+
+		result.push_back(HistoryMessage(message, (fromJID ? *fromJID : JID()), (toJID ? *toJID : JID()), type, time, offset));
+		r = sqlite3_step(selectStatement);
+	}
+	if (r != SQLITE_DONE) {
+		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
+	}
+	sqlite3_finalize(selectStatement);
+
+	return result;
+}
+
+int SQLiteHistoryStorage::getIDForJID(const JID& jid) {
+	boost::optional<int> id = getIDFromJID(jid);
+	if (id) {
+		return *id;
+	}
+	else {
+		return addJID(jid);
+	}
+}
+
+int SQLiteHistoryStorage::addJID(const JID& jid) {
+	std::string statement = std::string("INSERT INTO jids('jid') VALUES('") + getEscapedString(jid.toString()) + "')";
+	char* errorMessage;
+	int result = sqlite3_exec(db_, statement.c_str(), 0, 0, &errorMessage);
+	if (result != SQLITE_OK) {
+		std::cerr << "SQL Error: " << errorMessage << std::endl;
+		sqlite3_free(errorMessage);
+	}
+	return sqlite3_last_insert_rowid(db_);
+}
+
+boost::optional<JID> SQLiteHistoryStorage::getJIDFromID(int id) const {
+	boost::optional<JID> result;
+	sqlite3_stmt* selectStatement;
+	std::string selectQuery("SELECT jid FROM jids WHERE id=" + boost::lexical_cast<std::string>(id));
+	int r = sqlite3_prepare(db_, selectQuery.c_str(), selectQuery.size(), &selectStatement, NULL);
+	if (r != SQLITE_OK) {
+		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
+	}
+	r = sqlite3_step(selectStatement);
+	if (r == SQLITE_ROW) {
+		result = boost::optional<JID>(reinterpret_cast<const char*>(sqlite3_column_text(selectStatement, 0)));
+	}
+	sqlite3_finalize(selectStatement);
+	return result;
+}
+
+boost::optional<int> SQLiteHistoryStorage::getIDFromJID(const JID& jid) const {
+	boost::optional<int> result;
+	sqlite3_stmt* selectStatement;
+	std::string selectQuery("SELECT id FROM jids WHERE jid='" + jid.toString() + "'");
+	int r = sqlite3_prepare(db_, selectQuery.c_str(), selectQuery.size(), &selectStatement, NULL);
+	if (r != SQLITE_OK) {
+		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
+	}
+	r = sqlite3_step(selectStatement);
+	if (r == SQLITE_ROW) {
+		result = boost::optional<int>(sqlite3_column_int(selectStatement, 0));
+	}
+	sqlite3_finalize(selectStatement);
+	return result;
+}
+
+ContactsMap SQLiteHistoryStorage::getContacts(const JID& selfJID, HistoryMessage::Type type, const std::string& keyword) const {
+	ContactsMap result;
+	sqlite3_stmt* selectStatement;
+
+	// get id
+	boost::optional<int> id = getIDFromJID(selfJID);
+	if (!id) {
+		return result;
+	}
+
+	// get contacts
+	std::string query = "SELECT DISTINCT messages.'fromBare', messages.'fromResource', messages.'toBare', messages.'toResource', messages.'time' "
+		"FROM messages WHERE (type="
+		+ boost::lexical_cast<std::string>(type) + " AND (toBare="
+		+ boost::lexical_cast<std::string>(*id) + " OR fromBare=" + boost::lexical_cast<std::string>(*id) + "))";
+
+	// match keyword
+	if (getEscapedString(keyword).length()) {
+		query += " AND message LIKE '%" + getEscapedString(keyword) + "%'";
+	}
+
+	int r = sqlite3_prepare(db_, query.c_str(), query.size(), &selectStatement, NULL);
+	if (r != SQLITE_OK) {
+		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
+	}
+
+	r = sqlite3_step(selectStatement);
+	while (r == SQLITE_ROW) {
+		int fromBareID = sqlite3_column_int(selectStatement, 0);
+		std::string fromResource(reinterpret_cast<const char*>(sqlite3_column_text(selectStatement, 1)));
+		int toBareID = sqlite3_column_int(selectStatement, 2);
+		std::string toResource(reinterpret_cast<const char*>(sqlite3_column_text(selectStatement, 3)));
+		std::string resource;
+
+		int secondsSinceEpoch(sqlite3_column_int(selectStatement, 4));
+		boost::posix_time::ptime time(boost::gregorian::date(1970, 1, 1), boost::posix_time::seconds(secondsSinceEpoch));
+
+		boost::optional<JID> contactJID;
+
+		if (fromBareID == *id) {
+			contactJID = getJIDFromID(toBareID);
+			resource = toResource;
+		}
+		else {
+			contactJID = getJIDFromID(fromBareID);
+			resource = fromResource;
+		}
+
+		// check if it is a MUC contact (from a private conversation)
+		if (type == HistoryMessage::PrivateMessage) {
+			contactJID = boost::optional<JID>(JID(contactJID->getNode(), contactJID->getDomain(), resource));
+		}
+
+		if (contactJID) {
+			result[*contactJID].insert(time.date());
+		}
+
+		r = sqlite3_step(selectStatement);
+	}
+
+	if (r != SQLITE_DONE) {
+		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
+	}
+	sqlite3_finalize(selectStatement);
+
+	return result;
+}
+
+boost::gregorian::date SQLiteHistoryStorage::getNextDateWithLogs(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date, bool reverseOrder) const {
+	sqlite3_stmt* selectStatement;
+	boost::optional<int> selfID = getIDFromJID(selfJID.toBare());
+	boost::optional<int> contactID = getIDFromJID(contactJID.toBare());
+
+	if (!selfID || !contactID) {
+		// JIDs missing from the database
+		return boost::gregorian::date(boost::gregorian::not_a_date_time);
+	}
+
+	std::string selectQuery = "SELECT time FROM messages WHERE (type=" + boost::lexical_cast<std::string>(type);
+	if (contactJID.isBare()) {
+		// match only bare jid
+		selectQuery += " AND ((fromBare=" + boost::lexical_cast<std::string>(*selfID) + " AND toBare=" +
+				boost::lexical_cast<std::string>(*contactID) + ") OR (fromBare=" +
+				boost::lexical_cast<std::string>(*contactID) + " AND toBare=" + boost::lexical_cast<std::string>(*selfID) + ")))";
+	}
+	else {
+		// match resource too
+		selectQuery += " AND ((fromBare=" + boost::lexical_cast<std::string>(*selfID) + " AND (toBare=" +
+				boost::lexical_cast<std::string>(*contactID) +" AND toResource='" +
+				getEscapedString(contactJID.getResource()) + "')) OR ((fromBare=" +
+				boost::lexical_cast<std::string>(*contactID) + " AND fromResource='" +
+				getEscapedString(contactJID.getResource()) + "') AND toBare=" +
+				boost::lexical_cast<std::string>(*selfID) + ")))";
+	}
+
+	int timeStamp = (boost::posix_time::ptime(date) - boost::posix_time::ptime(boost::gregorian::date(1970, 1, 1))).total_seconds() + (reverseOrder ? 0 : 86400);
+
+	selectQuery += " AND time" + (reverseOrder ? std::string("<") : std::string(">")) + boost::lexical_cast<std::string>(timeStamp);
+	selectQuery += " ORDER BY time " + (reverseOrder ? std::string("DESC") : std::string("ASC")) + " LIMIT 1";
+
+	int r = sqlite3_prepare(db_, selectQuery.c_str(), selectQuery.size(), &selectStatement, NULL);
+	if (r != SQLITE_OK) {
+		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
+	}
+
+	r = sqlite3_step(selectStatement);
+	if (r == SQLITE_ROW) {
+		int secondsSinceEpoch(sqlite3_column_int(selectStatement, 0));
+		boost::posix_time::ptime time(boost::gregorian::date(1970, 1, 1), boost::posix_time::seconds(secondsSinceEpoch));
+		std::cout << "next day is: " << time.date() << "\n";
+		return time.date();
+	}
+
+	return boost::gregorian::date(boost::gregorian::not_a_date_time);
+}
+
+std::vector<HistoryMessage> SQLiteHistoryStorage::getMessagesFromNextDate(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date) const {
+	boost::gregorian::date nextDate = getNextDateWithLogs(selfJID, contactJID, type, date, false);
+
+	if (nextDate.is_not_a_date()) {
+		return std::vector<HistoryMessage>();
+	}
+
+	return getMessagesFromDate(selfJID, contactJID, type, nextDate);
+}
+
+std::vector<HistoryMessage> SQLiteHistoryStorage::getMessagesFromPreviousDate(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date) const {
+	boost::gregorian::date previousDate = getNextDateWithLogs(selfJID, contactJID, type, date, true);
+
+	if (previousDate.is_not_a_date()) {
+		return std::vector<HistoryMessage>();
+	}
+
+	return getMessagesFromDate(selfJID, contactJID, type, previousDate);
+}
+
+boost::posix_time::ptime SQLiteHistoryStorage::getLastTimeStampFromMUC(const JID& selfJID, const JID& mucJID) const {
+	boost::optional<int> selfID = getIDFromJID(selfJID.toBare());
+	boost::optional<int> mucID = getIDFromJID(mucJID.toBare());
+
+	if (!selfID || !mucID) {
+		// JIDs missing from the database
+		return boost::posix_time::ptime(boost::posix_time::not_a_date_time);
+	}
+
+
+	sqlite3_stmt* selectStatement;
+	std::string selectQuery = "SELECT messages.'time', messages.'offset' from messages WHERE type=1 AND (toBare=" +
+				boost::lexical_cast<std::string>(*selfID) + " AND fromBare=" +
+				boost::lexical_cast<std::string>(*mucID) + ") ORDER BY time DESC LIMIT 1";
+
+	int r = sqlite3_prepare(db_, selectQuery.c_str(), selectQuery.size(), &selectStatement, NULL);
+	if (r != SQLITE_OK) {
+		std::cout << "Error: " << sqlite3_errmsg(db_) << std::endl;
+	}
+
+	r = sqlite3_step(selectStatement);
+	if (r == SQLITE_ROW) {
+		int secondsSinceEpoch(sqlite3_column_int(selectStatement, 0));
+		boost::posix_time::ptime time(boost::gregorian::date(1970, 1, 1), boost::posix_time::seconds(secondsSinceEpoch));
+		int offset = sqlite3_column_int(selectStatement, 1);
+
+		return time - boost::posix_time::hours(offset);
+	}
+
+	return boost::posix_time::ptime(boost::posix_time::not_a_date_time);
+}
+
+void SQLiteHistoryStorage::run() {
+	sqlite3async_run();
+}
+
+}
diff --git a/Swiften/History/SQLiteHistoryStorage.h b/Swiften/History/SQLiteHistoryStorage.h
new file mode 100644
index 0000000..782334a
--- /dev/null
+++ b/Swiften/History/SQLiteHistoryStorage.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <boost/optional.hpp>
+
+#include <Swiften/History/HistoryStorage.h>
+#include <boost/thread.hpp>
+
+struct sqlite3;
+
+namespace Swift {
+	class SQLiteHistoryStorage : public HistoryStorage {
+		public:
+			SQLiteHistoryStorage(const std::string& file);
+			~SQLiteHistoryStorage();
+
+			void addMessage(const HistoryMessage& message);
+			ContactsMap getContacts(const JID& selfJID, HistoryMessage::Type type, const std::string& keyword) const;
+			std::vector<HistoryMessage> getMessagesFromDate(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date) const;
+			std::vector<HistoryMessage> getMessagesFromNextDate(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date) const;
+			std::vector<HistoryMessage> getMessagesFromPreviousDate(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date) const;
+			boost::posix_time::ptime getLastTimeStampFromMUC(const JID& selfJID, const JID& mucJID) const;
+
+		private:
+			void run();
+			boost::gregorian::date getNextDateWithLogs(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type, const boost::gregorian::date& date, bool reverseOrder) const;
+			int getIDForJID(const JID&);
+			int addJID(const JID&);
+
+			boost::optional<JID> getJIDFromID(int id) const;
+			boost::optional<int> getIDFromJID(const JID& jid) const;
+
+			sqlite3* db_;
+			boost::thread* thread_;
+	};
+}