From cf774e9b6d46ade2ea8130a7710d9aab679688e7 Mon Sep 17 00:00:00 2001
From: Benjamin Reis <benjamin.reis@belledonne-communications.com>
Date: Thu, 9 Nov 2017 15:03:38 +0100
Subject: [PATCH] display avatar in chat room info view

---
 Classes/ChatConversationInfoView.m                  |  1 +
 .../UIChatConversationInfoTableViewCell.h           |  1 +
 .../UIChatConversationInfoTableViewCell.xib         | 13 +++++++------
 submodules/linphone                                 |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Classes/ChatConversationInfoView.m b/Classes/ChatConversationInfoView.m
index 2f39690b1..81542ab86 100644
--- a/Classes/ChatConversationInfoView.m
+++ b/Classes/ChatConversationInfoView.m
@@ -236,6 +236,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	cell.uri = _contacts.allKeys[indexPath.row];
 	LinphoneAddress *addr = linphone_address_new(cell.uri.UTF8String);
 	cell.nameLabel.text = [FastAddressBook displayNameForAddress:addr];
+	[cell.avatarImage setImage:[FastAddressBook imageForAddress:addr] bordered:YES withRoundedRadius:YES];
 	cell.controllerView = self;
 	if(![_admins containsObject:cell.uri]) {
 		cell.adminLabel.enabled	= FALSE;
diff --git a/Classes/LinphoneUI/UIChatConversationInfoTableViewCell.h b/Classes/LinphoneUI/UIChatConversationInfoTableViewCell.h
index 275ace4dd..8d5d1d24e 100644
--- a/Classes/LinphoneUI/UIChatConversationInfoTableViewCell.h
+++ b/Classes/LinphoneUI/UIChatConversationInfoTableViewCell.h
@@ -10,6 +10,7 @@
 
 @interface UIChatConversationInfoTableViewCell : UITableViewCell <UIGestureRecognizerDelegate>
 
+@property (weak, nonatomic) IBOutlet UIRoundedImageView *avatarImage;
 @property (weak, nonatomic) IBOutlet UIIconButton *removeButton;
 @property (weak, nonatomic) IBOutlet UIView *adminButton;
 @property (weak, nonatomic) IBOutlet UILabel *adminLabel;
diff --git a/Classes/LinphoneUI/UIChatConversationInfoTableViewCell.xib b/Classes/LinphoneUI/UIChatConversationInfoTableViewCell.xib
index acf1ca654..25e079f18 100644
--- a/Classes/LinphoneUI/UIChatConversationInfoTableViewCell.xib
+++ b/Classes/LinphoneUI/UIChatConversationInfoTableViewCell.xib
@@ -19,18 +19,14 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="John Doe" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rrT-f7-NQO" userLabel="displayNameLabel">
-                        <rect key="frame" x="46" y="10" width="184" height="20"/>
+                        <rect key="frame" x="51" y="11" width="199" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="avatar.png" translatesAutoresizingMaskIntoConstraints="NO" id="Zsv-H9-9Dv" userLabel="avatarImage" customClass="UIRoundedImageView">
-                        <rect key="frame" x="0.0" y="7" width="43" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    </imageView>
                     <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PbQ-SL-kUk">
-                        <rect key="frame" x="213" y="1" width="98" height="39"/>
+                        <rect key="frame" x="229" y="2" width="98" height="39"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" image="check_selected.png" translatesAutoresizingMaskIntoConstraints="NO" id="FOh-C4-1Is" userLabel="adminImage">
@@ -68,12 +64,17 @@
                             <action selector="onDelete:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="gSd-t2-eDY"/>
                         </connections>
                     </button>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="avatar.png" translatesAutoresizingMaskIntoConstraints="NO" id="Zsv-H9-9Dv" userLabel="avatarImage" customClass="UIRoundedImageView">
+                        <rect key="frame" x="8" y="0.0" width="35" height="42"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    </imageView>
                 </subviews>
             </tableViewCellContentView>
             <connections>
                 <outlet property="adminButton" destination="PbQ-SL-kUk" id="Fgj-Oc-VhO"/>
                 <outlet property="adminImage" destination="FOh-C4-1Is" id="g51-C3-Ua8"/>
                 <outlet property="adminLabel" destination="DYS-vK-7Ol" id="OCp-Sw-hSc"/>
+                <outlet property="avatarImage" destination="Zsv-H9-9Dv" id="fAg-vm-e5o"/>
                 <outlet property="nameLabel" destination="rrT-f7-NQO" id="iwZ-ou-jVQ"/>
                 <outlet property="removeButton" destination="JPd-hQ-On6" id="Kfw-by-wbR"/>
             </connections>
diff --git a/submodules/linphone b/submodules/linphone
index 5c857c2db..43f0d8636 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 5c857c2db1d466824f7d1357fdf3177691703fdd
+Subproject commit 43f0d863693911f6c73b614077ddd16504013d8f