This commit is contained in:
Benjamin Reis 2017-12-11 09:36:16 +01:00
parent 392d206bfd
commit 4c5e4c1eec
3 changed files with 4 additions and 8 deletions

View file

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

View file

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

View file

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