1 files changed, 24 insertions, 1 deletions
diff --git a/Swiften/Chat/ChatStateNotifier.cpp b/Swiften/Chat/ChatStateNotifier.cpp
index cbb9b0b..48a65ab 100644
--- a/Swiften/Chat/ChatStateNotifier.cpp
+++ b/Swiften/Chat/ChatStateNotifier.cpp
@@ -6,6 +6,7 @@
 
 #include <Swiften/Chat/ChatStateNotifier.h>
 
+#include <cassert>
 #include <memory>
 
 #include <boost/bind.hpp>
@@ -14,16 +15,26 @@
 #include <Swiften/Disco/EntityCapsProvider.h>
 #include <Swiften/Elements/ChatState.h>
 #include <Swiften/Elements/Message.h>
+#include <Swiften/Network/Timer.h>
+#include <Swiften/Network/TimerFactory.h>
+
 
 namespace Swift {
 
-ChatStateNotifier::ChatStateNotifier(StanzaChannel* stanzaChannel, const JID& contact, EntityCapsProvider* entityCapsManager) : stanzaChannel_(stanzaChannel), entityCapsManager_(entityCapsManager), contact_(contact) {
+
+ChatStateNotifier::ChatStateNotifier(StanzaChannel* stanzaChannel, const JID& contact, EntityCapsProvider* entityCapsManager, TimerFactory* timerFactory, int idleTimeInMilliSecs) : stanzaChannel_(stanzaChannel), entityCapsManager_(entityCapsManager), contact_(contact) {
     setContact(contact);
     entityCapsManager_->onCapsChanged.connect(boost::bind(&ChatStateNotifier::handleCapsChanged, this, _1));
+    assert(timerFactory);
+    idleTimer_ = timerFactory->createTimer(idleTimeInMilliSecs);
+    assert(!!idleTimer_);
+    idleTimer_->onTick.connect(boost::bind(&ChatStateNotifier::userBecameIdleWhileTyping, this));
 }
 
 ChatStateNotifier::~ChatStateNotifier() {
     entityCapsManager_->onCapsChanged.disconnect(boost::bind(&ChatStateNotifier::handleCapsChanged, this, _1));
+    idleTimer_->stop();
+    idleTimer_->onTick.disconnect(boost::bind(&ChatStateNotifier::userBecameIdleWhileTyping, this));
 }
 
 void ChatStateNotifier::setContact(const JID& contact) {
@@ -39,24 +50,36 @@ void ChatStateNotifier::setContactIsOnline(bool online) {
 }
 
 void ChatStateNotifier::setUserIsTyping() {
+    idleTimer_->stop();
     bool should = contactShouldReceiveStates();
     if (should && !userIsTyping_) {
         userIsTyping_ = true;
         changeState(ChatState::Composing);
     }
+    if (should) {
+        idleTimer_->start();
+    }
 }
 
 void ChatStateNotifier::userSentMessage() {
+    idleTimer_->stop();
     userIsTyping_ = false;
 }
 
 void ChatStateNotifier::userCancelledNewMessage() {
+    idleTimer_->stop();
     if (userIsTyping_) {
         userIsTyping_ = false;
         changeState(ChatState::Active);
     }
 }
 
+void ChatStateNotifier::userBecameIdleWhileTyping() {
+    // For now we are returning to active state. When support for the Paused, Inactive and Gone states
+    // is implemeted, this function should Implement the Pause/Inactive functionality.
+    userCancelledNewMessage();
+}
+
 void ChatStateNotifier::receivedMessageFromContact(bool hasActiveElement) {
     contactHasSentActive_ = hasActiveElement;
 }