From 4bdf3f78f5ddec619418b1f5ad19056167ac1198 Mon Sep 17 00:00:00 2001 From: Brieuc Viel Date: Mon, 27 Nov 2017 12:10:38 +0100 Subject: [PATCH] [Contacts] fix sip filtered list in contactListView --- Classes/ContactsListTableView.m | 6 +++--- Classes/ContactsListView.m | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/ContactsListTableView.m b/Classes/ContactsListTableView.m index 3eb1d684e..294443400 100644 --- a/Classes/ContactsListTableView.m +++ b/Classes/ContactsListTableView.m @@ -119,9 +119,9 @@ static int ms_strcmpfuz(const char *fuzzy_word, const char *sentence) { // Sort contacts by first letter. We need to translate the name to ASCII first, because of UTF-8 // issues. For instance expected order would be: Alberta(A tilde) before ASylvano. - /* NSData *name2ASCIIdata = [name dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]; + NSData *name2ASCIIdata = [name dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]; NSString *name2ASCII = [[NSString alloc] initWithData:name2ASCIIdata encoding:NSASCIIStringEncoding]; - */ return name; + return name2ASCII; } } return nil; @@ -133,7 +133,7 @@ static int ms_strcmpfuz(const char *fuzzy_word, const char *sentence) { NSString* previous = [PhoneMainView.instance getPreviousViewName]; addressBookMap = [LinphoneManager.instance getLinphoneManagerAddressBookMap]; BOOL updated = [LinphoneManager.instance getContactsUpdated]; - if(([previous isEqualToString:@"ContactsDetailsView"] && updated)|| [addressBookMap count] == 0){ + if(([previous isEqualToString:@"ContactsDetailsView"] && updated) || updated || [addressBookMap count] == 0){ [LinphoneManager.instance setContactsUpdated:FALSE]; @synchronized(addressBookMap) { //Set all contacts from ContactCell to nil diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m index a102d74b9..3a988b632 100644 --- a/Classes/ContactsListView.m +++ b/Classes/ContactsListView.m @@ -165,6 +165,7 @@ static UICompositeViewDescription *compositeDescription = nil; linphoneButton.selected = FALSE; [tableController loadData]; } else if (view == ContactsLinphone && !linphoneButton.selected) { + [LinphoneManager.instance setContactsUpdated:TRUE]; frame.origin.x = linphoneButton.frame.origin.x; [ContactSelection setSipFilter:LinphoneManager.instance.contactFilter]; [ContactSelection enableEmailFilter:FALSE];