From 08f164fc88a1db8b68b21e669d595271d23cec71 Mon Sep 17 00:00:00 2001
From: QuentinArguillere <quentin.arguillere@belledone-communications.com>
Date: Fri, 19 Apr 2024 16:42:45 +0200
Subject: [PATCH] Remove temporary participantmodel from meetingviewmodel

---
 Linphone/UI/Call/Model/ParticipantModel.swift | 23 ++++-------------
 .../Meetings/ViewModel/MeetingViewModel.swift | 25 -------------------
 2 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/Linphone/UI/Call/Model/ParticipantModel.swift b/Linphone/UI/Call/Model/ParticipantModel.swift
index 2f5c9786a..6f66617ef 100644
--- a/Linphone/UI/Call/Model/ParticipantModel.swift
+++ b/Linphone/UI/Call/Model/ParticipantModel.swift
@@ -32,31 +32,18 @@ class ParticipantModel: ObservableObject {
 	@Published var onPause: Bool
 	@Published var isMuted: Bool
 	
-	init(address: Address, isJoining: Bool, onPause: Bool, isMuted: Bool) {
+	init(address: Address, isJoining: Bool = false, onPause: Bool = false, isMuted: Bool = false) {
 		self.address = address
 		
 		self.sipUri = address.asStringUriOnly()
 		
-		let addressFriend = ContactsManager.shared.getFriendWithAddress(address: self.address)
-		
-		var nameTmp = ""
-		
-		if addressFriend != nil {
-			nameTmp = addressFriend!.name!
+		if let addressFriend = ContactsManager.shared.getFriendWithAddress(address: self.address) {
+			self.name = addressFriend.name!
 		} else {
-			nameTmp = address.displayName != nil
-			? address.displayName!
-			: address.username!
+			self.name = address.displayName != nil ? address.displayName! : address.username!
 		}
 		
-		self.name = nameTmp
-		
-		self.avatarModel = addressFriend != nil
-		? ContactsManager.shared.avatarListModel.first(where: {
-			$0.friend!.name == addressFriend!.name
-			&& $0.friend!.address!.asStringUriOnly() == address.asStringUriOnly()
-		}) ?? ContactAvatarModel(friend: nil, name: nameTmp, withPresence: false)
-		: ContactAvatarModel(friend: nil, name: nameTmp, withPresence: false)
+		self.avatarModel = ContactAvatarModel.getAvatarModelFromAddress(address: self.address)
 		
 		self.isJoining = isJoining
 		self.onPause = onPause
diff --git a/Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift b/Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift
index 6910d011f..12e16a223 100644
--- a/Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift
+++ b/Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift
@@ -20,31 +20,6 @@
 import Foundation
 import linphonesw
 
-// TODO: à merger avec le ParticipantModel de la branche de Benoit
-class ParticipantModel: ObservableObject {
-	
-	static let TAG = "[Participant Model]"
-	
-	let address: Address
-	@Published var sipUri: String
-	@Published var name: String
-	@Published var avatarModel: ContactAvatarModel
-	
-	init(address: Address) {
-		self.address = address
-		
-		self.sipUri = address.asStringUriOnly()
-
-		if let addressFriend = ContactsManager.shared.getFriendWithAddress(address: self.address) {
-			self.name = addressFriend.name!
-		} else {
-			self.name = address.displayName != nil ? address.displayName! : address.username!
-		}
-		
-		self.avatarModel = ContactAvatarModel.getAvatarModelFromAddress(address: self.address)
-	}
-}
-
 class MeetingViewModel: ObservableObject {
 	static let TAG = "[Meeting ViewModel]"