From 4c5e4c1eece19137350d9c31f5132cad96447a2a Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Mon, 11 Dec 2017 09:36:16 +0100 Subject: [PATCH] ui fix --- Classes/AssistantView.m | 2 +- Classes/ChatConversationCreateTableView.m | 7 ++----- Classes/ChatConversationCreateView.m | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 3b91398ad..45d6f8dd2 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -1133,7 +1133,7 @@ void assistant_is_account_activated(LinphoneAccountCreator *creator, LinphoneAcc linphone_account_creator_recover_account(creator); } } else { - // TO DO : Re send email ? + // TODO : Re send email ? [thiz showErrorPopup:"ERROR_ACCOUNT_ALREADY_IN_USE"]; [thiz findButton:ViewElement_NextButton].enabled = NO; } diff --git a/Classes/ChatConversationCreateTableView.m b/Classes/ChatConversationCreateTableView.m index aa688e8da..2ad701535 100644 --- a/Classes/ChatConversationCreateTableView.m +++ b/Classes/ChatConversationCreateTableView.m @@ -71,6 +71,7 @@ } - (void)reloadDataWithFilter:(NSString *)filter { + _allContacts = [[NSDictionary alloc] initWithDictionary:LinphoneManager.instance.fastAddressBook.addressBookMap]; if (_contacts) [_contacts removeAllObjects]; else @@ -123,15 +124,11 @@ } cell.displayNameLabel.text = [_contacts.allValues 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) - cell.addressLabel.text = [NSString stringWithUTF8String:linphone_address_as_string_uri_only(addr)]; - else - cell.addressLabel.text = key; + cell.addressLabel.text = key; cell.selectedImage.hidden = ![_contactsGroup containsObject:cell.addressLabel.text]; diff --git a/Classes/ChatConversationCreateView.m b/Classes/ChatConversationCreateView.m index bb777e3b4..7f310993c 100644 --- a/Classes/ChatConversationCreateView.m +++ b/Classes/ChatConversationCreateView.m @@ -69,9 +69,8 @@ static UICompositeViewDescription *compositeDescription = nil; _tableController.tableView.frame.size.height + _collectionView.frame.size.height); } [_collectionView reloadData]; - [self changeView:ContactsAll]; - [_tableController loadData]; _tableController.isForEditing = _isForEditing; + [self changeView:ContactsAll]; } #pragma mark - Chat room functions