diff --git a/Classes/ChatsListTableView.m b/Classes/ChatsListTableView.m index f295c77e3..33b970598 100644 --- a/Classes/ChatsListTableView.m +++ b/Classes/ChatsListTableView.m @@ -95,9 +95,11 @@ [super viewDidAppear:animated]; // we cannot do that in viewWillAppear because we will change view while previous transition // was not finished, leading to "[CALayer retain]: message sent to deallocated instance" error msg + /* if (IPAD && [self totalNumberOfItems] > 0) { [PhoneMainView.instance changeCurrentView:ChatConversationView.compositeViewDescription]; } + */ } - (void)viewWillDisappear:(BOOL)animated { @@ -158,6 +160,7 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo _data = [self sortChatRooms]; [super loadData]; + /* if (IPAD) { int idx = bctbx_list_index(_data, VIEW(ChatConversationView).chatRoom); // if conversation view is using a chatroom that does not exist anymore, update it @@ -175,6 +178,7 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo [PhoneMainView.instance changeCurrentView:view.compositeViewDescription]; } } + */ } - (void)updateEventEntry:(LinphoneChatMessage *)msg { @@ -190,10 +194,12 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo - (void)markCellAsRead:(LinphoneChatRoom *)chatRoom { int idx = bctbx_list_index(_data, VIEW(ChatConversationView).chatRoom); NSIndexPath *indexPath = [NSIndexPath indexPathForRow:idx inSection:0]; + /* if (IPAD) { UIChatCell *cell = (UIChatCell *)[self.tableView cellForRowAtIndexPath:indexPath]; [cell updateUnreadBadge]; } + */ } #pragma mark - UITableViewDataSource Functions diff --git a/Classes/ChatsListView.m b/Classes/ChatsListView.m index aa5ab1340..812809e08 100644 --- a/Classes/ChatsListView.m +++ b/Classes/ChatsListView.m @@ -156,8 +156,8 @@ static UICompositeViewDescription *compositeDescription = nil; - (IBAction)onAddGroupChatClick:(id)event { [self newChatCreate:TRUE]; - if (IPAD) - [NSNotificationCenter.defaultCenter postNotificationName:kLinphoneChatCreateViewChange object:VIEW(ChatConversationCreateView) userInfo:nil]; + //if (IPAD) + //[NSNotificationCenter.defaultCenter postNotificationName:kLinphoneChatCreateViewChange object:VIEW(ChatConversationCreateView) userInfo:nil]; } - (IBAction)onChatRoomSwiftClick:(id)event { @@ -166,8 +166,8 @@ static UICompositeViewDescription *compositeDescription = nil; - (IBAction)onAddClick:(id)event { [self newChatCreate:FALSE]; - if (IPAD) - [NSNotificationCenter.defaultCenter postNotificationName:kLinphoneChatCreateViewChange object:VIEW(ChatConversationCreateView) userInfo:nil]; + //if (IPAD) + //[NSNotificationCenter.defaultCenter postNotificationName:kLinphoneChatCreateViewChange object:VIEW(ChatConversationCreateView) userInfo:nil]; } - (IBAction)onEditionChangeClick:(id)sender { diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index 6ebaa08a8..1fc2639d5 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -153,7 +153,7 @@ } + (BOOL)isAuthorized { - return ![LinphoneManager.instance lpConfigBoolForKey:@"enable_native_address_book"] || [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts]; + return ![LinphoneManager.instance lpConfigBoolForKey:@"enable_native_address_book"] || [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts] == CNAuthorizationStatusAuthorized; } - (FastAddressBook *)init { diff --git a/Podfile b/Podfile index e20fff848..d8ea8cd47 100644 --- a/Podfile +++ b/Podfile @@ -29,8 +29,10 @@ target 'linphone' do pod 'SnapKit', '~> 5.6.0' pod 'DropDown' pod 'IQKeyboardManager' - pod 'SwipeCellKit' #License: https://github.com/SwipeCellKit/SwipeCellKit/blob/develop/LICENSE + pod 'SwipeCellKit' + #License: https://github.com/SwipeCellKit/SwipeCellKit/blob/develop/LICENSE pod 'EmojiPicker', :git => 'https://github.com/htmlprogrammist/EmojiPicker' + #License: https://github.com/htmlprogrammist/EmojiPicker/blob/main/LICENSE all_pods end