felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-19 16:13:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move RequestContactsAccessFooterView into ContactsTableViewController.

Browse Source 
Remove automatic triggering of contacts access.
This commit is contained in:
Doug
2021-08-05 17:34:09 +01:00
parent 262ce2a545
commit 19f3bbd78b
12 changed files with 178 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/StartChat/StartChatViewController.m
+1 -81
View File
@@ -20,7 +20,7 @@
#import "Riot-Swift.h"
#import "MXSession+Riot.h"
@interface StartChatViewController () <UITableViewDataSource, UISearchBarDelegate, ContactsTableViewControllerDelegate, InviteFriendsHeaderViewDelegate, RequestContactsAccessFooterViewDelegate>
@interface StartChatViewController () <UITableViewDataSource, UISearchBarDelegate, ContactsTableViewControllerDelegate, InviteFriendsHeaderViewDelegate>
{
// The contact used to describe the current user.
MXKContact *userContact;
@@ -49,8 +49,6 @@
@property (nonatomic, strong) InviteFriendsPresenter *inviteFriendsPresenter;
@property (nonatomic, weak) InviteFriendsHeaderView *inviteFriendsHeaderView;
@property (nonatomic, strong) RequestContactsAccessFooterView *requestContactsAccessFooterView;
@end
@implementation StartChatViewController
@@ -160,25 +158,6 @@
}
}
- (void)updateFooterView
{
if (!RiotSettings.shared.allowInviteExernalUsers
|| [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts] == CNAuthorizationStatusAuthorized
|| self.contactsTableView.numberOfSections > 0)
{
// Hide line separators of empty cells
// FIXME: Store this?
self.contactsTableView.tableFooterView = [[UIView alloc] init];
return;
}
RequestContactsAccessFooterView *contactsAccessView = self.requestContactsAccessFooterView ?: [RequestContactsAccessFooterView instantiate];
contactsAccessView.delegate = self;
self.contactsTableView.tableFooterView = contactsAccessView;
self.requestContactsAccessFooterView = contactsAccessView;
}
- (void)userInterfaceThemeDidChange
{
[super userInterfaceThemeDidChange];
@@ -247,8 +226,6 @@
// Refresh display
[self refreshContactsTable];
}
[self updateFooterView];
}
- (void)viewDidDisappear:(BOOL)animated
@@ -263,36 +240,6 @@
{
[super viewDidLayoutSubviews];
[self.contactsTableView vc_relayoutHeaderView];
[self updateRequestContactsAccessFooterViewHeight];
}
- (void)updateRequestContactsAccessFooterViewHeight
{
if (self.requestContactsAccessFooterView && self.requestContactsAccessFooterView == self.contactsTableView.tableFooterView)
{
CGSize footerSize = [self.requestContactsAccessFooterView systemLayoutSizeFittingSize:UILayoutFittingCompressedSize];
CGFloat gapHeight = self.contactsTableView.bounds.size.height - self.contactsTableView.adjustedContentInset.top - self.contactsTableView.adjustedContentInset.bottom;
if (self.contactsTableView.tableHeaderView)
{
gapHeight -= self.contactsTableView.tableHeaderView.frame.size.height;
}
if (gapHeight > footerSize.height)
{
self.requestContactsAccessFooterView.frame = CGRectMake(self.requestContactsAccessFooterView.frame.origin.x,
self.requestContactsAccessFooterView.frame.origin.y,
self.requestContactsAccessFooterView.frame.size.width,
gapHeight);
}
else
{
self.requestContactsAccessFooterView.frame = CGRectMake(self.requestContactsAccessFooterView.frame.origin.x,
self.requestContactsAccessFooterView.frame.origin.y,
self.requestContactsAccessFooterView.frame.size.width,
footerSize.height);
}
}
}
#pragma mark -
@@ -765,11 +712,6 @@
return YES;
}
- (void)searchBarTextDidBeginEditing:(UISearchBar *)searchBar
{
[self updateFooterView];
}
- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
{
searchBar.text = nil;
@@ -782,11 +724,6 @@
[searchBar resignFirstResponder];
}
- (void)searchBarTextDidEndEditing:(UISearchBar *)searchBar
{
[self updateFooterView];
}
#pragma mark - ContactsTableViewControllerDelegate
- (void)contactsTableViewController:(ContactsTableViewController *)contactsTableViewController didSelectContact:(MXKContact*)contact
@@ -841,21 +778,4 @@
[self showInviteFriendsFromSourceView:button];
}
#pragma mark - RequestContactsAccessFooterViewDelegate
- (void)didRequestContactsAccess
{
[MXKTools checkAccessForContacts:@"Contacts access has been disabled in the Settings app." showPopUpInViewController:self completionHandler:^(BOOL granted) {
if (granted)
{
// Hide the request access view.
[self updateFooterView];
// Enable sync local contacts and refresh the contacts manager.
MXKAppSettings.standardAppSettings.syncLocalContacts = YES;
[MXKContactManager.sharedManager refreshLocalContacts];
}
}];
}
@end