From 8f55fe9130361349afaf9d6c2f741ca340c872e6 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Tue, 9 Nov 2021 13:32:35 +0100
Subject: [PATCH] Recent contacts in group chat creation : ignore GroupChat
 capability if no friends with it has been found.

---
 CHANGELOG.md                                  |  3 ++-
 .../components/timeline/TimelineListModel.cpp | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dc6b2dd3..70253f9d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## 4.4.0 - [Undefined]
 
-## 4.3.2
+## 4.3.2 - 2021-11-09
 
 ### Fixed
 
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Unblock secure group chat activation.
 - Unselect current contact if history call view is displayed.
 - Show chat actions in history view
+- Group chat creation : If no groupchat capabilities has been found in recent contacts, ignore test on capability and display them.
 
 ## 4.3.1 - 2021-11-04
 
diff --git a/linphone-app/src/components/timeline/TimelineListModel.cpp b/linphone-app/src/components/timeline/TimelineListModel.cpp
index 272e11b85..62964e68d 100644
--- a/linphone-app/src/components/timeline/TimelineListModel.cpp
+++ b/linphone-app/src/components/timeline/TimelineListModel.cpp
@@ -154,24 +154,27 @@ std::shared_ptr<TimelineModel> TimelineListModel::getTimeline(std::shared_ptr<li
 QVariantList TimelineListModel::getLastChatRooms(const int& maxCount) const{
 	QVariantList contacts;
 	QMultiMap<qint64, ChatRoomModel*> sortedData;
-	int count = 0;
-	
 	QDateTime currentDateTime = QDateTime::currentDateTime();
+	bool doTest = true;
 	
 	for(auto timeline : mTimelines){
 		auto chatRoom = timeline->getChatRoomModel();
-		if(chatRoom && chatRoom->isCurrentProxy() && !chatRoom->isGroupEnabled() && !chatRoom->haveEncryption()) {
+		if(chatRoom && chatRoom->isCurrentProxy() && chatRoom->isOneToOne() && !chatRoom->haveEncryption()) {
 			sortedData.insert(chatRoom->mLastUpdateTime.secsTo(currentDateTime),chatRoom);
 		}
 	}
-	for(auto contact : sortedData){
-		if(Utils::hasCapability(contact->getFullPeerAddress(),  LinphoneEnums::FriendCapabilityGroupChat)  ) {
-			++count;
-			contacts << QVariant::fromValue(contact);
-			if(count >= maxCount)
-				return contacts;
+	do{
+		int count = 0;
+		for(auto contact : sortedData){
+			if(!doTest || Utils::hasCapability(contact->getFullPeerAddress(),  LinphoneEnums::FriendCapabilityGroupChat)  ) {
+				++count;
+				contacts << QVariant::fromValue(contact);
+				if(count >= maxCount)
+					return contacts;
+			}
 		}
-	}
+		doTest = false;
+	}while( contacts.size() == 0 && sortedData.size() > 0);// no friends capability have been found : take contacts without testing capabilities.
 	
 	return contacts;
 }