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

[CNContact] fix filter + speedup nav + gsu

Browse source
This commit is contained in:
Brieuc Viel 2017-12-06 09:58:39 +01:00
parent 8b31a23379
commit bdcc313831
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Classes/ContactDetailsView.m
View file

@ -473,6 +473,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (IBAction)onEditClick:(id)event { - (IBAction)onEditClick:(id)event {
if (_tableController.isEditing) { if (_tableController.isEditing) {
[LinphoneManager.instance setContactsUpdated:TRUE];
if(![self hasDuplicateContactOf:_contact]){ if(![self hasDuplicateContactOf:_contact]){
[self setEditing:FALSE]; [self setEditing:FALSE];
[self saveData]; [self saveData];

5
Classes/ContactsListView.m
View file

@ -158,7 +158,6 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)changeView:(ContactsCategory)view { - (void)changeView:(ContactsCategory)view {
CGRect frame = _selectedButtonImage.frame; CGRect frame = _selectedButtonImage.frame;
if (view == ContactsAll && !allButton.selected) { if (view == ContactsAll && !allButton.selected) {
[LinphoneManager.instance setContactsUpdated:TRUE];
frame.origin.x = allButton.frame.origin.x; frame.origin.x = allButton.frame.origin.x;
[ContactSelection setSipFilter:nil]; [ContactSelection setSipFilter:nil];
[ContactSelection enableEmailFilter:FALSE]; [ContactSelection enableEmailFilter:FALSE];
@ -166,13 +165,14 @@ static UICompositeViewDescription *compositeDescription = nil;
linphoneButton.selected = FALSE; linphoneButton.selected = FALSE;
[tableController loadData]; [tableController loadData];
} else if (view == ContactsLinphone && !linphoneButton.selected) { } else if (view == ContactsLinphone && !linphoneButton.selected) {
[LinphoneManager.instance setContactsUpdated:TRUE];
frame.origin.x = linphoneButton.frame.origin.x; frame.origin.x = linphoneButton.frame.origin.x;
[ContactSelection setSipFilter:LinphoneManager.instance.contactFilter]; [ContactSelection setSipFilter:LinphoneManager.instance.contactFilter];
[ContactSelection enableEmailFilter:FALSE]; [ContactSelection enableEmailFilter:FALSE];
linphoneButton.selected = TRUE; linphoneButton.selected = TRUE;
allButton.selected = FALSE; allButton.selected = FALSE;
[tableController loadData]; [tableController loadData];
//REQUIRED TO RELOAD WITH FILTER
[LinphoneManager.instance setContactsUpdated:TRUE];
} }
_selectedButtonImage.frame = frame; _selectedButtonImage.frame = frame;
} }
@ -205,6 +205,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (IBAction)onDeleteClick:(id)sender { - (IBAction)onDeleteClick:(id)sender {
NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete selected contacts?", nil)]; NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete selected contacts?", nil)];
[LinphoneManager.instance setContactsUpdated:TRUE];
[UIConfirmationDialog ShowWithMessage:msg [UIConfirmationDialog ShowWithMessage:msg
cancelMessage:nil cancelMessage:nil
confirmMessage:nil confirmMessage:nil

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2b3d4ae3cfaf82e286fe16d8ae0bac57d7abf1a7 Subproject commit 20efb4ad41357daf700fa393dbcae9fdb3ab2730

2
submodules/mediastreamer2

@ -1 +1 @@
Subproject commit 16ee1217a9725bcde21ee5cd375da769b0177e38 Subproject commit 3f94be991d4d7cf1f2e869e457c1a95eb9d518a5