From aa543d66bd83ce0dc4ddbd129b2c4f83b0db8637 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Wed, 1 Jun 2022 15:42:28 +0200
Subject: [PATCH] Revert receiving time message ordering.

---
 CHANGELOG.md                                  | 26 +++++++++++++++++--
 .../chat-events/ChatMessageModel.cpp          | 13 ++--------
 .../components/chat-room/ChatRoomModel.cpp    |  7 ++---
 linphone-sdk                                  |  2 +-
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fc140ef4..892af3ba3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## 4.4.2 - [undefined]
+## 4.5.0 - [undefined]
 
 ### Added
-- Based on LinphoneSDK 5.1.34
+- Video conference.
+
+### Fixed
+- Crash on exit.
+- Memory stability.
+
+## 4.4.4 - 2022-06-01
+
+### Fixed
+- Revert ordering messages from receiving time.
+- Some crashes on Wasapi.
+- Update SDK to 5.1.41
+
+## 4.4.3 - 2022-05-30
+
+### Fixed
+- Crash on searchs with special characters
+- Update SDK to 5.1.38
+
+## 4.4.2 - 2022-05-25
+
+### Added
+- Based on LinphoneSDK 5.1.36
 - Add Sanitizer build.
 - Version types selection for version checker.
 
diff --git a/linphone-app/src/components/chat-events/ChatMessageModel.cpp b/linphone-app/src/components/chat-events/ChatMessageModel.cpp
index 9183e5209..0fb334ae5 100644
--- a/linphone-app/src/components/chat-events/ChatMessageModel.cpp
+++ b/linphone-app/src/components/chat-events/ChatMessageModel.cpp
@@ -107,11 +107,8 @@ ChatMessageModel::ChatMessageModel ( std::shared_ptr<linphone::ChatMessage> chat
 				txt += content->getUtf8Text().c_str();
 		}
 		mContent = txt;
-		auto appData = AppDataManager(QString::fromStdString(getChatMessage()->getAppdata()));
-		if(appData.mData.contains("timestamp"))
-			mTimestamp = QDateTime::fromMSecsSinceEpoch(appData.mData["timestamp"].toLongLong());
-		else
-			mTimestamp = QDateTime::fromMSecsSinceEpoch(chatMessage->getTime() * 1000);
+		
+		mTimestamp = QDateTime::fromMSecsSinceEpoch(chatMessage->getTime() * 1000);
 	}
 	mWasDownloaded = false;
 
@@ -236,12 +233,6 @@ void ChatMessageModel::setWasDownloaded(bool wasDownloaded){
 
 void ChatMessageModel::setTimestamp(const QDateTime& timestamp) {
 	mTimestamp = timestamp;
-	auto timeT = timestamp.toMSecsSinceEpoch();
-	auto appData = AppDataManager(QString::fromStdString(getChatMessage()->getAppdata()));
-	if(appData.mData["timestamp"].toLongLong() != timeT) {
-		appData.mData["timestamp"] = QString::number(timeT);
-		getChatMessage()->setAppdata(appData.toString().toStdString());
-	}
 }
 
 //-----------------------------------------------------------------------------------------------------------------------
diff --git a/linphone-app/src/components/chat-room/ChatRoomModel.cpp b/linphone-app/src/components/chat-room/ChatRoomModel.cpp
index 665da52d8..444f96154 100644
--- a/linphone-app/src/components/chat-room/ChatRoomModel.cpp
+++ b/linphone-app/src/components/chat-room/ChatRoomModel.cpp
@@ -1173,11 +1173,8 @@ void ChatRoomModel::onNewEvent(const std::shared_ptr<linphone::ChatRoom> & chatR
 void ChatRoomModel::onChatMessageReceived(const std::shared_ptr<linphone::ChatRoom> & chatRoom, const std::shared_ptr<const linphone::EventLog> & eventLog) {
 	auto message = eventLog->getChatMessage();
 	if(message){
-		auto messageModel = insertMessageAtEnd(message);
-		if(messageModel){
-			messageModel->setTimestamp();
-			updateLastUpdateTime();
-		}
+		insertMessageAtEnd(message);
+		updateLastUpdateTime();
 		emit messageReceived(message);
 	}
 }
diff --git a/linphone-sdk b/linphone-sdk
index 4c963f642..d87b868c2 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 4c963f6421cefa2f5819146c752c4abd2977854e
+Subproject commit d87b868c2ebdeb9a634dfdfd2325412ff9604100