From fd985d9ef346c23a7391828bf35bba588595a8d4 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 12 Feb 2014 11:53:25 +0100
Subject: [PATCH] Implement bis, long due!

---
 Classes/Base.lproj/DialerViewController.xib   |  2 +-
 .../Base.lproj/DialerViewController~ipad.xib  |  2 +-
 Classes/DialerViewController.m                |  4 +--
 Classes/LinphoneUI/UICallButton.m             | 26 ++++++++++++++++---
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Classes/Base.lproj/DialerViewController.xib b/Classes/Base.lproj/DialerViewController.xib
index bcc2af4a3..ceb6a1a52 100644
--- a/Classes/Base.lproj/DialerViewController.xib
+++ b/Classes/Base.lproj/DialerViewController.xib
@@ -255,7 +255,7 @@
                                 <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="233"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="224" userLabel="callButton" customClass="UICallButton">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="224" userLabel="callButton" customClass="UICallButton">
                             <rect key="frame" x="106" y="0.0" width="108" height="69"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Call"/>
diff --git a/Classes/Base.lproj/DialerViewController~ipad.xib b/Classes/Base.lproj/DialerViewController~ipad.xib
index 8ed47f2fc..aa317beaf 100644
--- a/Classes/Base.lproj/DialerViewController~ipad.xib
+++ b/Classes/Base.lproj/DialerViewController~ipad.xib
@@ -308,7 +308,7 @@
                                 <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="68"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="21" userLabel="callButton" customClass="UICallButton">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="21" userLabel="callButton" customClass="UICallButton">
                             <rect key="frame" x="126" y="0.0" width="186" height="85"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Call"/>
diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m
index b9582aac0..43dd35d55 100644
--- a/Classes/DialerViewController.m
+++ b/Classes/DialerViewController.m
@@ -141,7 +141,7 @@ static UICompositeViewDescription *compositeDescription = nil;
         LinphoneCall* call = linphone_core_get_current_call(lc);
         LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0;
         [self callUpdate:call state:state];
-        
+
         if([LinphoneManager runningOnIpad]) {
             if(linphone_core_video_enabled(lc) && linphone_core_video_preview_enabled(lc)) {
                 linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview);
@@ -344,13 +344,11 @@ static UICompositeViewDescription *compositeDescription = nil;
     if([[addressField text] length] > 0) {
         [addContactButton setEnabled:TRUE];
         [eraseButton setEnabled:TRUE];
-        [callButton setEnabled:TRUE];
         [addCallButton setEnabled:TRUE];
         [transferButton setEnabled:TRUE];
     } else {
         [addContactButton setEnabled:FALSE];
         [eraseButton setEnabled:FALSE];
-        [callButton setEnabled:FALSE];
         [addCallButton setEnabled:FALSE];
         [transferButton setEnabled:FALSE];
     }
diff --git a/Classes/LinphoneUI/UICallButton.m b/Classes/LinphoneUI/UICallButton.m
index 48bd02962..0b4dbf721 100644
--- a/Classes/LinphoneUI/UICallButton.m
+++ b/Classes/LinphoneUI/UICallButton.m
@@ -69,11 +69,29 @@
 - (void)touchUp:(id) sender {
     NSString *address = [addressField text];
     NSString *displayName = nil;
-    ABRecordRef contact = [[[LinphoneManager instance] fastAddressBook] getContact:address];
-    if(contact) {
-        displayName = [FastAddressBook getContactDisplayName:contact];
+
+    if( [address length] == 0){
+        const MSList* logs = linphone_core_get_call_logs([LinphoneManager getLc]);
+        while( logs ){
+            LinphoneCallLog* log = logs->data;
+            if( linphone_call_log_get_dir(log) == LinphoneCallOutgoing ){
+                LinphoneAddress* to = linphone_call_log_get_to(log);
+                [addressField setText:[NSString stringWithUTF8String:linphone_address_as_string(to)]];
+                address = [addressField text];
+                // only fill thge address, let the user confirm the call by pressing again
+                return;
+            }
+            logs = ms_list_next(logs);
+        }
+    }
+
+    if( [address length] > 0){
+        ABRecordRef contact = [[[LinphoneManager instance] fastAddressBook] getContact:address];
+        if(contact) {
+            displayName = [FastAddressBook getContactDisplayName:contact];
+        }
+        [[LinphoneManager instance] call:address displayName:displayName transfer:FALSE];
     }
-    [[LinphoneManager instance] call:address displayName:displayName transfer:FALSE];
 }
 
 @end