From a64137cf9d6a67589b3d60ba97bda726a2a42316 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 11 Sep 2015 16:18:44 +0200
Subject: [PATCH] inpause

---
 Classes/Base.lproj/CallView.xib       |  6 +++---
 Classes/CallPausedTableView.m         | 17 ++++++++++++-----
 Classes/LinphoneUI/UICallPausedCell.m |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index b1a673816..b7d1a4f6d 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -116,7 +116,7 @@
                                             </accessibility>
                                         </view>
                                         <view contentMode="scaleAspectFit" id="127" userLabel="preview">
-                                            <rect key="frame" x="253.99998625559141" y="355.00002002077525" width="113" height="140"/>
+                                            <rect key="frame" x="254" y="355" width="113" height="140"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
@@ -156,8 +156,8 @@
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         </view>
-                        <tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="106" userLabel="pausedCallsTableView">
-                            <rect key="frame" x="0.0" y="393" width="375" height="110"/>
+                        <tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" allowsSelection="NO" rowHeight="50" sectionHeaderHeight="1" sectionFooterHeight="1" id="106" userLabel="pausedCallsTableView">
+                            <rect key="frame" x="0.0" y="453" width="375" height="50"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <inset key="contentInset" minX="0.0" minY="10" maxX="0.0" maxY="25"/>
diff --git a/Classes/CallPausedTableView.m b/Classes/CallPausedTableView.m
index e2b3b15ed..6e7fd9e2c 100644
--- a/Classes/CallPausedTableView.m
+++ b/Classes/CallPausedTableView.m
@@ -45,10 +45,10 @@
 
 - (void)update {
 	[self.tableView reloadData];
-
 	CGRect newOrigin = self.tableView.frame;
 	newOrigin.size.height =
-		[self tableView:self.tableView heightForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+		[self tableView:self.tableView heightForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]] *
+		[self tableView:self.tableView numberOfRowsInSection:0];
 	newOrigin.origin.y = self.tableView.frame.origin.y + self.tableView.frame.size.height - newOrigin.size.height;
 	self.tableView.frame = newOrigin;
 }
@@ -56,7 +56,7 @@
 #pragma mark - UITableViewDataSource Functions
 - (LinphoneCall *)pausedCallForRow:(NSInteger)row {
 	const MSList *calls = linphone_core_get_calls([LinphoneManager getLc]);
-	return (row < ms_list_size(calls) /* - 1*/) ? ms_list_nth_data(calls, (int)row) : NULL;
+	return (row < ms_list_size(calls) - 1) ? ms_list_nth_data(calls, (int)row) : NULL;
 }
 
 #pragma mark - UITableViewDataSource Functions
@@ -67,12 +67,12 @@
 	if (cell == nil) {
 		cell = [[UICallPausedCell alloc] initWithIdentifier:kCellId];
 	}
-	cell.call = [self pausedCallForRow:indexPath.row];
+	[cell setCall:[self pausedCallForRow:indexPath.row]];
 	return cell;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-	return ms_list_size(linphone_core_get_calls([LinphoneManager getLc])) /* - 1*/;
+	return ms_list_size(linphone_core_get_calls([LinphoneManager getLc])) - 1;
 }
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -83,4 +83,11 @@
 	return [self tableView:tableView cellForRowAtIndexPath:indexPath].frame.size.height;
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+	return 1e-5;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+	return 1e-5;
+}
+
 @end
diff --git a/Classes/LinphoneUI/UICallPausedCell.m b/Classes/LinphoneUI/UICallPausedCell.m
index 235cd9217..5c39d0969 100644
--- a/Classes/LinphoneUI/UICallPausedCell.m
+++ b/Classes/LinphoneUI/UICallPausedCell.m
@@ -35,6 +35,7 @@
 
 	const LinphoneAddress *addr = linphone_call_get_remote_address(call);
 	[ContactDisplay setDisplayNameLabel:_nameLabel forAddress:addr];
+
 	_avatarImage.image =
 		[FastAddressBook getContactImage:[FastAddressBook getContactWithLinphoneAddress:addr] thumbnail:NO];