diff --git a/Classes/Base.lproj/ChatRoomViewController.xib b/Classes/Base.lproj/ChatRoomViewController.xib index 0b48698bc..fd1d1b6eb 100644 --- a/Classes/Base.lproj/ChatRoomViewController.xib +++ b/Classes/Base.lproj/ChatRoomViewController.xib @@ -105,7 +105,7 @@ - + @@ -115,7 +115,7 @@ - + - + - + @@ -155,7 +155,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + @@ -444,30 +455,15 @@ - - - + - - - - - - - - - - - - - - - + + + + - - diff --git a/Classes/HistoryTableViewController.m b/Classes/HistoryTableViewController.m index b5bdaef5a..eee487911 100644 --- a/Classes/HistoryTableViewController.m +++ b/Classes/HistoryTableViewController.m @@ -142,14 +142,18 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { LinphoneCallLog *callLog = [[callLogs objectAtIndex:[indexPath row]] pointerValue]; 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); + LinphoneAddress *addr = linphone_call_log_get_remote_address(callLog); + char *uri = linphone_address_as_string(addr); + + // Go to dialer view + DialerViewController *controller = + DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[DialerViewController compositeViewDescription]], + DialerViewController); if (controller != nil) { - [controller setCallLogId:[NSString stringWithUTF8String:linphone_call_log_get_call_id(callLog)]]; + [controller call:[NSString stringWithUTF8String:uri] + displayName:[FastAddressBook displayNameForAddress:addr]]; } + ms_free(uri); } } diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index 48c556836..9de7e4f21 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -78,9 +78,9 @@ static UICompositeViewDescription *compositeDescription = nil; compositeDescription = [[UICompositeViewDescription alloc] init:@"InCall" content:@"InCallViewController" stateBar:@"UIStateBar" - tabBar:@"UICallBar" + tabBar:nil fullscreen:false - landscapeMode:true + landscapeMode:false portraitMode:true]; compositeDescription.darkBackground = true; } diff --git a/Classes/LinphoneUI/Base.lproj/UICallCell.xib b/Classes/LinphoneUI/Base.lproj/UICallCell.xib index 3461ec37d..178e0a6d4 100644 --- a/Classes/LinphoneUI/Base.lproj/UICallCell.xib +++ b/Classes/LinphoneUI/Base.lproj/UICallCell.xib @@ -1,6 +1,7 @@ + @@ -55,7 +56,7 @@ - + @@ -449,7 +450,7 @@ - + diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 6c464bd23..39299f014 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -350,7 +350,18 @@ static RootViewManager *rootViewManagerInstance = nil; } break; } - default: + case LinphoneCallEarlyUpdatedByRemote: + case LinphoneCallEarlyUpdating: + case LinphoneCallIdle: + case LinphoneCallOutgoingEarlyMedia: + case LinphoneCallOutgoingProgress: + case LinphoneCallOutgoingRinging: + case LinphoneCallPaused: + case LinphoneCallPausing: + case LinphoneCallRefered: + case LinphoneCallReleased: + case LinphoneCallResuming: + case LinphoneCallUpdating: break; } [self updateApplicationBadgeNumber];