From 3a33cd63b0bef19b70b7e531ec113e69fc4c981a Mon Sep 17 00:00:00 2001
From: Benoit Martins <benoit.martins@belledonne-communications.com>
Date: Thu, 20 Jul 2023 10:22:16 +0200
Subject: [PATCH] Revert "Check if contactAddress.friend is not nil"

This reverts commit f457c3b6a6e55369c7f6228cee9ffbae3e6e08e9.
---
 Classes/Swift/Voip/Widgets/Avatar.swift | 30 +++++++++++++------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/Classes/Swift/Voip/Widgets/Avatar.swift b/Classes/Swift/Voip/Widgets/Avatar.swift
index a684c8519..c3d2837ac 100644
--- a/Classes/Swift/Voip/Widgets/Avatar.swift
+++ b/Classes/Swift/Voip/Widgets/Avatar.swift
@@ -147,21 +147,19 @@ class Avatar : UIView {
 			}
 		}
 		if delegatePresence == false {
-			if contactAddress.friend != nil {
-				friend.append(Friend.getSwiftObject(cObject: (contactAddress.friend)!))
-				let newFriendDelegate = FriendDelegateStub(
-					onPresenceReceived: { (linphoneFriend: Friend) -> Void in
-						if (linphoneFriend.address?.asStringUriOnly()) != nil {
-							let presenceModel = linphoneFriend.getPresenceModelForUriOrTel(uriOrTel: (linphoneFriend.address?.asStringUriOnly())!)
-							if(presenceModel != nil && presenceModel?.consolidatedPresence != nil){
-								NotificationCenter.default.post(name: Notification.Name("LinphoneFriendPresenceUpdate"), object: nil, userInfo: ["friend": linphoneFriend.address?.asStringUriOnly() ?? "", "isOnline": presenceModel!.consolidatedPresence.rawValue == LinphoneConsolidatedPresenceOnline.rawValue])
-							}
+			friend.append(Friend.getSwiftObject(cObject: (contactAddress.friend)!))
+			let newFriendDelegate = FriendDelegateStub(
+				onPresenceReceived: { (linphoneFriend: Friend) -> Void in
+                    if (linphoneFriend.address?.asStringUriOnly()) != nil {
+                        let presenceModel = linphoneFriend.getPresenceModelForUriOrTel(uriOrTel: (linphoneFriend.address?.asStringUriOnly())!)
+						if(presenceModel != nil && presenceModel?.consolidatedPresence != nil){
+							NotificationCenter.default.post(name: Notification.Name("LinphoneFriendPresenceUpdate"), object: nil, userInfo: ["friend": linphoneFriend.address?.asStringUriOnly() ?? "", "isOnline": presenceModel!.consolidatedPresence.rawValue == LinphoneConsolidatedPresenceOnline.rawValue])
 						}
-					}
-				)
-				friendDelegate.append(newFriendDelegate)
-				friend.last?.addDelegate(delegate: friendDelegate.last!)
-			}
+                    }
+				}
+			)
+			friendDelegate.append(newFriendDelegate)
+			friend.last?.addDelegate(delegate: friendDelegate.last!)
 		}
 	}
     
@@ -204,8 +202,12 @@ class Avatar : UIView {
         let contactAddress = Address.getSwiftObject(cObject: address).contact()
         var iconPresenceView = UIImageView()
         if (contactAddress != nil) {
+            
+			
 			shared?.addDelegate(contactAddress: contactAddress!)
+			
 			iconPresenceView = updatePresenceImage(contact: contactAddress!)
+			
 			avatarWithPresence.addSubview(avatarImageWihtoutPresence)
 			avatarWithPresence.addSubview(iconPresenceView)
 			iconPresenceView.frame = CGRect(x: 36, y: 36, width: 14, height: 14)