From 2c7fb8270841f18df2ab4c9321a01e7a0b2d680d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Jan 2016 12:52:40 +0800
Subject: [PATCH] fixed broken typing statuses, 0.9.18

---
 Telegram/SourceFiles/history.cpp | 24 +++++++++++-------------
 Telegram/SourceFiles/history.h   |  4 ++--
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
index aee3391aa..940688448 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -321,8 +321,7 @@ void History::clearLastKeyboard() {
 	lastKeyboardFrom = 0;
 }
 
-bool History::updateTyping(uint64 ms, uint32 dots, bool force) {
-	if (!ms) ms = getms(true);
+bool History::updateTyping(uint64 ms, bool force) {
 	bool changed = force;
 	for (TypingUsers::iterator i = typing.begin(), e = typing.end(); i != e;) {
 		if (ms >= i.value()) {
@@ -369,7 +368,7 @@ bool History::updateTyping(uint64 ms, uint32 dots, bool force) {
 		}
 	}
 	if (!typingStr.isEmpty()) {
-		if (typingText.lastDots(dots % 4)) {
+		if (typingText.lastDots(typingDots % 4)) {
 			changed = true;
 		}
 	}
@@ -1245,7 +1244,7 @@ void Histories::regSendAction(History *history, UserData *user, const MTPSendMes
 		return;
 	}
 
-	uint64 ms = getms(true);
+	uint64 ms = getms();
 	switch (action.type()) {
 	case mtpc_sendMessageTypingAction: history->typing[user] = ms + 6000; break;
 	case mtpc_sendMessageRecordVideoAction: history->sendActions.insert(user, SendAction(SendActionRecordVideo, ms + 6000)); break;
@@ -1264,17 +1263,16 @@ void Histories::regSendAction(History *history, UserData *user, const MTPSendMes
 	TypingHistories::const_iterator i = typing.find(history);
 	if (i == typing.cend()) {
 		typing.insert(history, ms);
-		history->typingFrame = 0;
+		history->typingDots = 0;
+		_a_typings.start();
 	}
-
-	history->updateTyping(ms, history->typingFrame, true);
-	_a_typings.start();
+	history->updateTyping(ms, true);
 }
 
 void Histories::step_typings(uint64 ms, bool timer) {
 	for (TypingHistories::iterator i = typing.begin(), e = typing.end(); i != e;) {
-		uint32 typingFrame = (ms - i.value()) / 150;
-		i.key()->updateTyping(ms, typingFrame);
+		i.key()->typingDots = (ms - i.value()) / 150;
+		i.key()->updateTyping(ms);
 		if (i.key()->typing.isEmpty() && i.key()->sendActions.isEmpty()) {
 			i = typing.erase(i);
 		} else {
@@ -1815,16 +1813,16 @@ void History::unregTyping(UserData *from) {
 	uint64 updateAtMs = 0;
 	TypingUsers::iterator i = typing.find(from);
 	if (i != typing.end()) {
-		updateAtMs = getms(true);
+		updateAtMs = getms();
 		i.value() = updateAtMs;
 	}
 	SendActionUsers::iterator j = sendActions.find(from);
 	if (j != sendActions.end()) {
-		if (!updateAtMs) updateAtMs = getms(true);
+		if (!updateAtMs) updateAtMs = getms();
 		j.value().until = updateAtMs;
 	}
 	if (updateAtMs) {
-		updateTyping(updateAtMs, 0, true);
+		updateTyping(updateAtMs, true);
 	}
 }
 
diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h
index b6a382169..063e4bf42 100644
--- a/Telegram/SourceFiles/history.h
+++ b/Telegram/SourceFiles/history.h
@@ -264,7 +264,7 @@ public:
 	}
 
 	void paintDialog(Painter &p, int32 w, bool sel) const;
-	bool updateTyping(uint64 ms = 0, uint32 dots = 0, bool force = false);
+	bool updateTyping(uint64 ms, bool force = false);
 	void clearLastKeyboard();
 
 	typedef QList<HistoryBlock*> Blocks;
@@ -310,7 +310,7 @@ public:
 	SendActionUsers sendActions;
 	QString typingStr;
 	Text typingText;
-	uint32 typingFrame;
+	uint32 typingDots;
 	QMap<SendActionType, uint64> mySendActions;
 
 	typedef QList<MsgId> MediaOverview;