From b36b90eba6079b514b214da1468e8a44c60e59b5 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Wed, 1 Jun 2022 15:24:57 +0200
Subject: [PATCH] Revert receiving time message ordering and fix crashes on
 wasapi.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab78ef7ea..74d46c899 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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
diff --git a/linphone-app/src/components/chat-events/ChatMessageModel.cpp b/linphone-app/src/components/chat-events/ChatMessageModel.cpp
index f6fdd6ced..bdbb5160b 100644
--- a/linphone-app/src/components/chat-events/ChatMessageModel.cpp
+++ b/linphone-app/src/components/chat-events/ChatMessageModel.cpp
@@ -139,11 +139,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;
 
@@ -271,12 +268,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 fa88004b2..2b30ecd3a 100644
--- a/linphone-app/src/components/chat-room/ChatRoomModel.cpp
+++ b/linphone-app/src/components/chat-room/ChatRoomModel.cpp
@@ -1277,11 +1277,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 b4e189b0b..5d6c9b7fb 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit b4e189b0ba02138c268bad1030f6c9ebd72f1f29
+Subproject commit 5d6c9b7fbeefee625027c750cd796a682f2c97ba