From 1ecc1232a124a82afbcd3388523f538687729914 Mon Sep 17 00:00:00 2001
From: Benoit Martins <benoit.martins@belledonne-communications.com>
Date: Mon, 23 Jun 2025 11:56:34 +0200
Subject: [PATCH] Fix getChatRoomId and conference join/leave callbacks

---
 .../ViewModel/ConversationViewModel.swift     | 66 ++++---------------
 Linphone/Utils/LinphoneUtils.swift            |  3 +-
 2 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
index 67034a1a2..78a94ed36 100644
--- a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
+++ b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
@@ -123,50 +123,6 @@ class ConversationViewModel: ObservableObject {
         }
 	}
 	
-	func addConversationDelegate() {
-		coreContext.doOnCoreQueue { _ in
-			if let chatroom = self.sharedMainViewModel.displayedConversation?.chatRoom {
-				let chatRoomDelegate = ChatRoomDelegateStub( onIsComposingReceived: { (_: ChatRoom, _: Address, _: Bool) in
-					self.computeComposingLabel()
-				}, onChatMessagesReceived: { (_: ChatRoom, eventLogs: [EventLog]) in
-					self.getNewMessages(eventLogs: eventLogs)
-				}, onChatMessageSending: { (_: ChatRoom, eventLog: EventLog) in
-					self.getNewMessages(eventLogs: [eventLog])
-				}, onParticipantAdded: { (_: ChatRoom, eventLogs: EventLog) in
-					self.getNewMessages(eventLogs: [eventLogs])
-					self.getParticipantConversationModel()
-				}, onParticipantRemoved: { (_: ChatRoom, eventLogs: EventLog) in
-					self.getNewMessages(eventLogs: [eventLogs])
-					self.getParticipantConversationModel()
-				}, onParticipantAdminStatusChanged: { (_: ChatRoom, eventLogs: EventLog) in
-					self.getNewMessages(eventLogs: [eventLogs])
-					self.getParticipantConversationModel()
-				}, onSubjectChanged: { (_: ChatRoom, eventLogs: EventLog) in
-					self.getNewMessages(eventLogs: [eventLogs])
-				}, onConferenceJoined: {(_: ChatRoom, eventLog: EventLog) in
-					self.getNewMessages(eventLogs: [eventLog])
-					if self.sharedMainViewModel.displayedConversation != nil {
-						DispatchQueue.main.async {
-							self.sharedMainViewModel.displayedConversation!.isReadOnly = false
-						}
-					}
-				}, onConferenceLeft: {(_: ChatRoom, eventLog: EventLog) in
-					self.getNewMessages(eventLogs: [eventLog])
-					if self.sharedMainViewModel.displayedConversation != nil {
-						DispatchQueue.main.async {
-							self.sharedMainViewModel.displayedConversation!.isReadOnly = true
-						}
-					}
-				}, onEphemeralEvent: {(_: ChatRoom, eventLogs: EventLog) in
-					self.getNewMessages(eventLogs: [eventLogs])
-				}, onEphemeralMessageDeleted: {(_: ChatRoom, eventLog: EventLog) in
-					self.removeMessage(eventLog)
-				})
-				self.chatRoomDelegateHolder = ChatRoomDelegateHolder(chatroom: chatroom, delegate: chatRoomDelegate)
-			}
-		}
-	}
-	
 	func addConversationDelegate(chatRoom: ChatRoom) {
 		let chatRoomDelegate = ChatRoomDelegateStub( onIsComposingReceived: { (_: ChatRoom, _: Address, _: Bool) in
 			self.computeComposingLabel()
@@ -189,18 +145,24 @@ class ConversationViewModel: ObservableObject {
 			self.getParticipantConversationModel()
 		}, onSubjectChanged: { (_: ChatRoom, eventLog: EventLog) in
 			self.getEventMessage(eventLog: eventLog)
-		}, onConferenceJoined: {(_: ChatRoom, eventLog: EventLog) in
-			self.getEventMessage(eventLog: eventLog)
-			if self.sharedMainViewModel.displayedConversation != nil {
+		}, onConferenceJoined: {(chatRoom: ChatRoom, eventLog: EventLog) in
+			if let displayedConversation = self.sharedMainViewModel.displayedConversation {
+				if displayedConversation.isGroup {
+					self.getEventMessage(eventLog: eventLog)
+				}
+				let isReadOnly = chatRoom.isReadOnly
 				DispatchQueue.main.async {
-					self.sharedMainViewModel.displayedConversation!.isReadOnly = false
+					displayedConversation.isReadOnly = isReadOnly
 				}
 			}
-		}, onConferenceLeft: {(_: ChatRoom, eventLog: EventLog) in
-			self.getEventMessage(eventLog: eventLog)
-			if self.sharedMainViewModel.displayedConversation != nil {
+		}, onConferenceLeft: {(chatRoom: ChatRoom, eventLog: EventLog) in
+			if let displayedConversation = self.sharedMainViewModel.displayedConversation {
+				if displayedConversation.isGroup {
+					self.getEventMessage(eventLog: eventLog)
+				}
+				let isReadOnly = chatRoom.isReadOnly
 				DispatchQueue.main.async {
-					self.sharedMainViewModel.displayedConversation!.isReadOnly = true
+					displayedConversation.isReadOnly = isReadOnly
 				}
 			}
 		}, onEphemeralEvent: {(_: ChatRoom, eventLog: EventLog) in
diff --git a/Linphone/Utils/LinphoneUtils.swift b/Linphone/Utils/LinphoneUtils.swift
index b1265a110..5ff803c49 100644
--- a/Linphone/Utils/LinphoneUtils.swift
+++ b/Linphone/Utils/LinphoneUtils.swift
@@ -45,7 +45,8 @@ class LinphoneUtils: NSObject {
 	}
 	
 	public class func getChatRoomId(room: ChatRoom) -> String {
-		return getChatRoomId(localAddress: room.localAddress!, remoteAddress: room.peerAddress!)
+		return room.identifier ?? ""
+		//return getChatRoomId(localAddress: room.localAddress!, remoteAddress: room.peerAddress!)
 	}
 	
 	public class func getChatRoomId(localAddress: Address, remoteAddress: Address) -> String {