From ed2b0fb272a9d16b96a3bdd77df99eb232c27b05 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 27 Jul 2015 15:34:19 +0200
Subject: [PATCH] b

---
 .../HistoryDetailsViewController.xib          |  6 +--
 Classes/HistoryTableViewController.m          | 45 +++----------------
 Classes/LinphoneUI/Base.lproj/UIStateBar.xib  |  4 +-
 Classes/PhoneMainView.h                       |  2 +-
 Classes/PhoneMainView.m                       |  2 +-
 5 files changed, 12 insertions(+), 47 deletions(-)

diff --git a/Classes/Base.lproj/HistoryDetailsViewController.xib b/Classes/Base.lproj/HistoryDetailsViewController.xib
index 7f6452a99..345f39f29 100644
--- a/Classes/Base.lproj/HistoryDetailsViewController.xib
+++ b/Classes/Base.lproj/HistoryDetailsViewController.xib
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
@@ -31,10 +32,6 @@
                     <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="toolsbar_background.png" id="8" userLabel="background">
-                            <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                        </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="9" userLabel="backButton" customClass="UIIconButton">
                             <rect key="frame" x="0.0" y="0.0" width="160" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -263,7 +260,6 @@
         <image name="history_details_add_over.png" width="320" height="88"/>
         <image name="history_details_back_default.png" width="320" height="88"/>
         <image name="history_details_back_over.png" width="320" height="88"/>
-        <image name="toolsbar_background.png" width="5" height="88"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/Classes/HistoryTableViewController.m b/Classes/HistoryTableViewController.m
index 236d8d71e..b5bdaef5a 100644
--- a/Classes/HistoryTableViewController.m
+++ b/Classes/HistoryTableViewController.m
@@ -140,46 +140,15 @@
 #pragma mark - UITableViewDelegate Functions
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-	[tableView deselectRowAtIndexPath:indexPath animated:NO];
-
 	LinphoneCallLog *callLog = [[callLogs objectAtIndex:[indexPath row]] pointerValue];
-	LinphoneAddress *addr;
-	if (linphone_call_log_get_dir(callLog) == LinphoneCallIncoming) {
-		addr = linphone_call_log_get_from(callLog);
-	} else {
-		addr = linphone_call_log_get_to(callLog);
-	}
-
-	NSString *displayName = nil;
-	NSString *address = nil;
-	if (addr != NULL) {
-		BOOL useLinphoneAddress = true;
-		// contact name
-		char *lAddress = linphone_address_as_string_uri_only(addr);
-		if (lAddress) {
-			address = [NSString stringWithUTF8String:lAddress];
-			NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:address];
-			ABRecordRef contact = [[[LinphoneManager instance] fastAddressBook] getContact:normalizedSipAddress];
-			if (contact) {
-				displayName = [FastAddressBook getContactDisplayName:contact];
-				useLinphoneAddress = false;
-			}
-			ms_free(lAddress);
-		}
-		if (useLinphoneAddress) {
-			const char *lDisplayName = linphone_address_get_display_name(addr);
-			if (lDisplayName)
-				displayName = [NSString stringWithUTF8String:lDisplayName];
-		}
-	}
-
-	if (address != nil) {
-		// Go to dialer view
-		DialerViewController *controller =
-			DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[DialerViewController compositeViewDescription]],
-						 DialerViewController);
+	if (callLog != NULL && linphone_call_log_get_call_id(callLog) != NULL) {
+		// Go to History details view
+		HistoryDetailsViewController *controller = DYNAMIC_CAST(
+			[[PhoneMainView instance] changeCurrentView:[HistoryDetailsViewController compositeViewDescription]
+												   push:TRUE],
+			HistoryDetailsViewController);
 		if (controller != nil) {
-			[controller call:address displayName:displayName];
+			[controller setCallLogId:[NSString stringWithUTF8String:linphone_call_log_get_call_id(callLog)]];
 		}
 	}
 }
diff --git a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
index 2a7067686..cf8bee260 100644
--- a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
@@ -72,7 +72,7 @@
                         </button>
                     </subviews>
                 </view>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Mhg-P6-RfU" userLabel="registrationState">
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Mhg-P6-RfU" userLabel="registrationState" customClass="UIIconButton">
                     <rect key="frame" x="40" y="0.0" width="200" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <inset key="titleEdgeInsets" minX="6" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -91,7 +91,7 @@
         <image name="call_quality_indicator_2.png" width="56" height="58"/>
         <image name="led_disconnected.png" width="35" height="35"/>
         <image name="menu.png" width="56" height="55"/>
-        <image name="security_ok.png" width="39" height="49"/>
+        <image name="security_ok.png" width="38" height="49"/>
         <image name="voicemail.png" width="76" height="36"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h
index 6152b2a5c..9e6403ccf 100644
--- a/Classes/PhoneMainView.h
+++ b/Classes/PhoneMainView.h
@@ -42,7 +42,7 @@
 #import "WizardViewController.h"
 #import "IncomingCallViewController.h"
 #import "ImageViewController.h"
-
+#import "OutgoingCallViewController.h"
 
 @class PhoneMainView;
 
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index a1e1b5b2c..fc00e8138 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -315,7 +315,7 @@ static RootViewManager *rootViewManagerInstance = nil;
 			break;
 		}
 		case LinphoneCallOutgoingInit: {
-			[self changeCurrentView:[InCallViewController compositeViewDescription]];
+			[self changeCurrentView:[OutgoingCallViewController compositeViewDescription]];
 			break;
 		}
 		case LinphoneCallPausedByRemote: