mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add text showing that resuming a call is possible by clicking on its row

Browse source 
+ fix potential crash
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-12-02 14:39:00 +01:00
parent 9d77b1bd28
commit 531e069354
1 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Classes/IncallViewController.m
View file

@ -520,7 +520,7 @@ int callCount(LinphoneCore* lc) {
} else {
switch (linphone_call_get_state(call)) {
case LinphoneCallPaused:
[ms appendFormat:@"%@", NSLocalizedString(@"Paused", nil), nil];
[ms appendFormat:@"%@", NSLocalizedString(@"Paused (tap to resume)", nil), nil];
break;
case LinphoneCallOutgoingProgress:
[ms appendFormat:@"%@...", NSLocalizedString(@"In progress", nil), nil];
@ -551,40 +551,24 @@ int callCount(LinphoneCore* lc) {
-(void) updateConferenceCell:(UITableViewCell*) cell at:(NSIndexPath*)indexPath {
[cell.textLabel setText:@"Conference"];
LinphoneCore* lc = [LinphoneManager getLc];
NSString* t= [NSString stringWithFormat:
NSLocalizedString(@"Conference", nil),
linphone_core_get_conference_size(lc) - linphone_core_is_in_conference(lc)];
[cell.textLabel setText:t];
[self updateActive:NO cell:cell];
cell.selected = NO;
[callTableView deselectRowAtIndexPath:indexPath animated:NO];
NSMutableString* ms = [[NSMutableString alloc] init ];
const MSList* calls = linphone_core_get_calls(lc);
bool isFirst = true;
while (calls) {
LinphoneCall* call = (LinphoneCall*)calls->data;
if (isInConference(call)) {
const LinphoneAddress* addr = linphone_call_get_remote_address(call);
const char* n = linphone_address_get_display_name(addr);
if (n)
[ms appendFormat:(isFirst?@"%s":@", %s"), n, nil];
else
[ms appendFormat:(isFirst?@"%s":@", %s"), linphone_address_get_username(addr), nil];
LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
if (call == selectedCall) {
[callTableView selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
cell.selected = YES;
}
isFirst = false;
}
calls = calls->next;
}
[cell.detailTextLabel setText:ms];
if (!linphone_core_is_in_conference(lc)) {
[cell.detailTextLabel setText:NSLocalizedString(@"(tap to enter conference)", nil)];
} else {
[cell.detailTextLabel setText:
[NSString stringWithFormat:NSLocalizedString(@"(me + %d participants)", nil), linphone_core_get_conference_size(lc) - linphone_core_is_in_conference(lc)]];
}
cell.imageView.image = nil;
}
@ -626,6 +610,8 @@ int callCount(LinphoneCore* lc) {
cell.accessoryView = b;
}
LinphoneCall* call = [IncallViewController retrieveCallAtIndex:indexPath.row inConference:NO];
if (call == nil)
return nil;
[IncallViewController updateCellImageView:cell.imageView Label:cell.textLabel DetailLabel:cell.detailTextLabel AndAccessoryView:(UIButton*)cell.accessoryView withCall:call];
if (linphone_core_get_current_call(lc) == call)
activeCallCell = cell;