mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

b

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-07-27 15:34:19 +02:00
parent 20ed941884
commit ed2b0fb272
5 changed files with 12 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/Base.lproj/HistoryDetailsViewController.xib
View file

@ -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"/>

45
Classes/HistoryTableViewController.m
View file

@ -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)]];
}
}
}

4
Classes/LinphoneUI/Base.lproj/UIStateBar.xib
View file

@ -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">

2
Classes/PhoneMainView.h
View file

@ -42,7 +42,7 @@
#import "WizardViewController.h"
#import "IncomingCallViewController.h"
#import "ImageViewController.h"
#import "OutgoingCallViewController.h"
@class PhoneMainView;

2
Classes/PhoneMainView.m
View file

@ -315,7 +315,7 @@ static RootViewManager *rootViewManagerInstance = nil;
break;
}
case LinphoneCallOutgoingInit: {
[self changeCurrentView:[InCallViewController compositeViewDescription]];
[self changeCurrentView:[OutgoingCallViewController compositeViewDescription]];
break;
}
case LinphoneCallPausedByRemote: