1 files changed, 68 insertions, 44 deletions
diff --git a/Swiften/Chat/ChatStateNotifier.cpp b/Swiften/Chat/ChatStateNotifier.cpp
index d507c4d..48a65ab 100644
--- a/Swiften/Chat/ChatStateNotifier.cpp
+++ b/Swiften/Chat/ChatStateNotifier.cpp
@@ -1,93 +1,117 @@
 /*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <Swiften/Chat/ChatStateNotifier.h>
 
+#include <cassert>
+#include <memory>
+
 #include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/Elements/Message.h>
-#include <Swiften/Elements/ChatState.h>
 #include <Swiften/Client/StanzaChannel.h>
 #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) {
-	setContact(contact);
-	entityCapsManager_->onCapsChanged.connect(boost::bind(&ChatStateNotifier::handleCapsChanged, this, _1));
+
+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));
+    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) {
-	contactHasSentActive_ = false;
-	userIsTyping_ = false;
-	contactIsOnline_ = false;
-	contact_ = contact;
-	handleCapsChanged(contact_);
+    contactHasSentActive_ = false;
+    userIsTyping_ = false;
+    contactIsOnline_ = false;
+    contact_ = contact;
+    handleCapsChanged(contact_);
 }
 
 void ChatStateNotifier::setContactIsOnline(bool online) {
-	contactIsOnline_ = online;
+    contactIsOnline_ = online;
 }
 
 void ChatStateNotifier::setUserIsTyping() {
-	bool should = contactShouldReceiveStates();
-	if (should && !userIsTyping_) {
-		userIsTyping_ = true;
-		changeState(ChatState::Composing);
-	}
+    idleTimer_->stop();
+    bool should = contactShouldReceiveStates();
+    if (should && !userIsTyping_) {
+        userIsTyping_ = true;
+        changeState(ChatState::Composing);
+    }
+    if (should) {
+        idleTimer_->start();
+    }
 }
 
 void ChatStateNotifier::userSentMessage() {
-	userIsTyping_ = false;
+    idleTimer_->stop();
+    userIsTyping_ = false;
 }
 
 void ChatStateNotifier::userCancelledNewMessage() {
-	if (userIsTyping_) {
-		userIsTyping_ = false;
-		changeState(ChatState::Active);
-	}
+    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;
+    contactHasSentActive_ = hasActiveElement;
 }
 
 bool ChatStateNotifier::contactShouldReceiveStates() {
-	/* So, yes, the XEP says to look at caps, but it also says that once you've
-		 heard from the contact, the active state overrides this.
-		 *HOWEVER* it says that the MUST NOT send csn if you haven't received
-		 active is OPTIONAL behaviour for if you haven't got caps.*/
-	return contactIsOnline_ && (contactHasSentActive_ || contactHas85Caps_);
+    /* So, yes, the XEP says to look at caps, but it also says that once you've
+         heard from the contact, the active state overrides this.
+         *HOWEVER* it says that the MUST NOT send csn if you haven't received
+         active is OPTIONAL behaviour for if you haven't got caps.*/
+    return contactIsOnline_ && (contactHasSentActive_ || contactHas85Caps_);
 }
 
 void ChatStateNotifier::changeState(ChatState::ChatStateType state) {
-	boost::shared_ptr<Message> message(boost::make_shared<Message>());
-	message->setTo(contact_);
-	message->addPayload(boost::make_shared<ChatState>(state));
-	stanzaChannel_->sendMessage(message);
+    std::shared_ptr<Message> message(std::make_shared<Message>());
+    message->setTo(contact_);
+    message->addPayload(std::make_shared<ChatState>(state));
+    stanzaChannel_->sendMessage(message);
 }
 
 void ChatStateNotifier::addChatStateRequest(Message::ref message) {
-	if (contactShouldReceiveStates()) {
-		message->addPayload(boost::make_shared<ChatState>(ChatState::Active));
-	}
+    if (contactShouldReceiveStates()) {
+        message->addPayload(std::make_shared<ChatState>(ChatState::Active));
+    }
 }
 
 
 void ChatStateNotifier::handleCapsChanged(const JID& jid) {
-	if (jid == contact_) {
-		DiscoInfo::ref caps = entityCapsManager_->getCaps(contact_);
-		bool hasCSN = caps && caps->hasFeature(DiscoInfo::ChatStatesFeature);
-		contactHas85Caps_ = hasCSN;
-	}
+    if (jid == contact_) {
+        DiscoInfo::ref caps = entityCapsManager_->getCaps(contact_);
+        bool hasCSN = caps && caps->hasFeature(DiscoInfo::ChatStatesFeature);
+        contactHas85Caps_ = hasCSN;
+    }
 }
 
 }