From 17c91784ad32c565e7a5d0edc8551568f5851ea4 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Fri, 29 Nov 2024 11:29:44 +0100 Subject: [PATCH] Simplify and clarify avatar handling logic with safer unwrapping --- .../ViewModel/ConversationViewModel.swift | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift index 8c10f7ab8..c863b5748 100644 --- a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift +++ b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift @@ -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 } } }