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

Simplify and clarify avatar handling logic with safer unwrapping

Browse source
This commit is contained in:
Benoit Martins 2024-11-29 11:29:44 +01:00
parent 9f796aa412
commit 17c91784ad
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
View file

@ -469,21 +469,17 @@ class ConversationViewModel: ObservableObject {
}
}
if self.displayedConversation!.chatRoom.me != nil {
ContactAvatarModel.getAvatarModelFromAddress(address: self.displayedConversation!.chatRoom.me!.address!) { avatarResult in
if let currentUser = self.displayedConversation?.chatRoom.me,
let address = currentUser.address {
ContactAvatarModel.getAvatarModelFromAddress(address: address) { avatarResult in
let avatarModelTmp = avatarResult
if self.displayedConversation!.chatRoom.me!.isAdmin {
DispatchQueue.main.async {
DispatchQueue.main.async {
if currentUser.isAdmin {
self.isUserAdmin = true
self.participantConversationModelAdmin.append(avatarModelTmp)
self.participantConversationModel.append(avatarModelTmp)
self.myParticipantConversationModel = avatarModelTmp
}
} else {
DispatchQueue.main.async {
self.participantConversationModel.append(avatarModelTmp)
self.myParticipantConversationModel = avatarModelTmp
}
self.participantConversationModel.append(avatarModelTmp)
self.myParticipantConversationModel = avatarModelTmp
}
}
}