From e8594c397c0ffe5eff4aab8a83028ff4b58371bf Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Thu, 25 May 2023 11:29:05 +0200 Subject: [PATCH] Fix only_show_sip_contacts_list and hide_sip_contacts_list config (RC) --- Classes/Base.lproj/ContactsListView.xib | 1 + Classes/ContactsListView.h | 1 + Classes/ContactsListView.m | 13 ++++++++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Classes/Base.lproj/ContactsListView.xib b/Classes/Base.lproj/ContactsListView.xib index ac7f39865..69ff91400 100644 --- a/Classes/Base.lproj/ContactsListView.xib +++ b/Classes/Base.lproj/ContactsListView.xib @@ -19,6 +19,7 @@ + diff --git a/Classes/ContactsListView.h b/Classes/ContactsListView.h index 999d74e7f..23835b8c8 100644 --- a/Classes/ContactsListView.h +++ b/Classes/ContactsListView.h @@ -50,6 +50,7 @@ typedef enum _ContactSelectionMode { ContactSelectionModeNone, ContactSelectionM @property(strong, nonatomic) IBOutlet ContactsListTableView *tableController; @property(strong, nonatomic) IBOutlet UIView *topBar; +@property(strong, nonatomic) IBOutlet UIView *switchView; @property(nonatomic, strong) IBOutlet UIButton *allButton; @property(nonatomic, strong) IBOutlet UIButton *linphoneButton; @property(nonatomic, strong) IBOutlet UIButton *addButton; diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m index 18f6b6c35..447d77694 100644 --- a/Classes/ContactsListView.m +++ b/Classes/ContactsListView.m @@ -97,7 +97,9 @@ static UICompositeViewDescription *compositeDescription = nil; if (![[PhoneMainView.instance getPreviousViewName] isEqualToString:@"ContactDetailsView"]) { _searchBar.text = @""; } - [self changeView:ContactsAll]; + if (![LinphoneManager.instance lpConfigBoolForKey:@"only_show_sip_contacts_list"] && ![LinphoneManager.instance lpConfigBoolForKey:@"hide_sip_contacts_list"]) { + [self changeView:ContactsAll]; + } UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self @@ -105,6 +107,15 @@ static UICompositeViewDescription *compositeDescription = nil; [tap setDelegate:self]; [self.view addGestureRecognizer:tap]; + + + if ([LinphoneManager.instance lpConfigBoolForKey:@"only_show_sip_contacts_list"]) { + _switchView.hidden = true; + [self changeView:ContactsLinphone]; + } else if ([LinphoneManager.instance lpConfigBoolForKey:@"hide_sip_contacts_list"]){ + _switchView.hidden = true; + [self changeView:ContactsAll]; + } } - (void)viewWillAppear:(BOOL)animated {