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

fix issues in UI

Browse source
This commit is contained in:
Benjamin Reis 2017-12-01 15:34:31 +01:00
parent 7461b45f61
commit ff4833b865
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Classes/ChatConversationCreateTableView.m
View file

@ -84,9 +84,8 @@
if (((filter.length == 0)
|| ([name.lowercaseString containsSubstring:filter.lowercaseString])
|| ([address.lowercaseString containsSubstring:filter.lowercaseString]))
&& add) {
_contacts[address] = name;
}
&& add)
[_contacts setObject:name forKey:address];
}];
// also add current entry, if not listed
NSString *nsuri = filter.lowercaseString;
@ -97,9 +96,8 @@
ms_free(uri);
linphone_address_destroy(addr);
}
if (nsuri.length > 0 && [_contacts valueForKey:nsuri] == nil) {
_contacts[nsuri] = filter;
}
if (nsuri.length > 0 && [_contacts valueForKey:nsuri] == nil)
[_contacts setObject:filter forKey:nsuri];
[self.tableView reloadData];
}
@ -121,16 +119,17 @@
cell = [[UIChatCreateCell alloc] initWithIdentifier:kCellId];
}
cell.displayNameLabel.text = [_contacts.allValues objectAtIndex:indexPath.row];
LinphoneAddress *addr = [LinphoneUtils normalizeSipOrPhoneAddress:[_contacts.allKeys objectAtIndex:indexPath.row]];
Contact *contact = [LinphoneManager.instance.fastAddressBook.addressBookMap objectForKey:[_contacts.allKeys objectAtIndex:indexPath.row]];
NSString *key = [_contacts.allKeys objectAtIndex:indexPath.row];
LinphoneAddress *addr = [LinphoneUtils normalizeSipOrPhoneAddress:key];
Contact *contact = [LinphoneManager.instance.fastAddressBook.addressBookMap objectForKey:key];
Boolean linphoneContact = [FastAddressBook contactHasValidSipDomain:contact]
|| (contact.friend && linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(contact.friend)) == LinphonePresenceBasicStatusOpen);
cell.linphoneImage.hidden = !linphoneContact;
if (addr) {
if (addr)
cell.addressLabel.text = [NSString stringWithUTF8String:linphone_address_as_string_uri_only(addr)];
} else {
cell.addressLabel.text = [_contacts.allKeys objectAtIndex:indexPath.row];
}
else
cell.addressLabel.text = key;
cell.selectedImage.hidden = ![_contactsGroup containsObject:cell.addressLabel.text];
return cell;

4
Classes/ChatConversationInfoView.m
View file

@ -112,6 +112,10 @@ static UICompositeViewDescription *compositeDescription = nil;
[_tableView reloadData];
}
- (void)viewWillDisappear:(BOOL)animated {
_room = NULL;
}
#pragma mark - next functions
- (void)onCreate {