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

Rename : “only_secure_chatrooms”=>”force_lime_chat_rooms” and “fetch_native_contacts”=>”enable_native_address_book” to match android

Browse source
This commit is contained in:
QuentinArguillere 2022-10-14 10:13:48 +02:00
parent d0f83d6d1d
commit 821f2e30b7
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classes/ChatConversationCreateView.m
View file

@ -85,7 +85,7 @@ static UICompositeViewDescription *compositeDescription = nil;
_allButton.frame = frame;
}
if ([LinphoneManager.instance lpConfigBoolForKey:@"only_secure_chatrooms"]) {
if ([LinphoneManager.instance lpConfigBoolForKey:@"force_lime_chat_rooms"]) {
_chiffreOptionView.hidden = true;
_isEncrypted = true;
_tableController.isEncrypted = true;
@ -121,7 +121,7 @@ static UICompositeViewDescription *compositeDescription = nil;
frame.origin.x = self.view.frame.size.width * 0.192;
}
_chiffreOptionView.frame = frame;
_isEncrypted = [LinphoneManager.instance lpConfigBoolForKey:@"only_secure_chatrooms"]; // false by default
_isEncrypted = [LinphoneManager.instance lpConfigBoolForKey:@"force_lime_chat_rooms"]; // false by default
CGRect buttonFrame = _chiffreButton.frame;
if (!_isEncrypted) {

5
Classes/ContactsListView.m
View file

@ -233,7 +233,7 @@ static UICompositeViewDescription *compositeDescription = nil;
}
- (void)refreshButtons {
[addButton setHidden:FALSE];
[addButton setHidden:![LinphoneManager.instance lpConfigBoolForKey:@"enable_native_address_book"]];
[self changeView:[ContactSelection getSipFilterEnabled] ? ContactsLinphone : ContactsAll];
}
@ -276,6 +276,9 @@ static UICompositeViewDescription *compositeDescription = nil;
- (IBAction)onEditionChangeClick:(id)sender {
allButton.hidden = linphoneButton.hidden = _selectedButtonImage.hidden = addButton.hidden = self.tableController.isEditing;
if ([LinphoneManager.instance lpConfigBoolForKey:@"enable_native_address_book"]) {
addButton.hidden = self.tableController.isEditing;
}
}
- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {

4
Classes/Utils/FastAddressBook.m
View file

@ -146,7 +146,7 @@
}
+ (BOOL)isAuthorized {
return ![LinphoneManager.instance lpConfigBoolForKey:@"fetch_native_contacts"] || [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts];
return ![LinphoneManager.instance lpConfigBoolForKey:@"enable_native_address_book"] || [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts];
}
- (FastAddressBook *)init {
@ -210,7 +210,7 @@
linphone_friend_list_add_friend(fl, testFriend);
const MSList *friends = linphone_friend_list_get_friends(fl);
if ([LinphoneManager.instance lpConfigBoolForKey:@"fetch_native_contacts"]) {
if ([LinphoneManager.instance lpConfigBoolForKey:@"enable_native_address_book"]) {
CNEntityType entityType = CNEntityTypeContacts;
[store requestAccessForEntityType:entityType completionHandler:^(BOOL granted, NSError *_Nullable error) {
BOOL success = FALSE;

4
Resources/linphonerc-factory
View file

@ -27,8 +27,8 @@ use_callkit=1
accept_early_media=0
only_secure_chatrooms=0
fetch_native_contacts=1
force_lime_chat_rooms=0
enable_native_address_book=1
[rtp]
accept_any_encryption=1