witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Remove temporary participantmodel from meetingviewmodel

Browse source
This commit is contained in:
QuentinArguillere 2024-04-19 16:42:45 +02:00
parent 924a7413fa
commit 08f164fc88
2 changed files with 5 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Linphone/UI/Call/Model/ParticipantModel.swift
View file

@ -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

25
Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift
View file

@ -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]"