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

Update the Service Terms modal from the latest Figma.

Browse Source 
Checkboxes have been removed from the individual policies.
Reverse flow so that the service terms are show before the contacts access popup.
Removes outOfContext from the modal as it will only be presented when requested.
Fixes second presentation on swipe to dismiss of the modal.
This commit is contained in:
Doug
2021-09-13 11:46:31 +01:00
parent bdf5aa3868
commit 4a4bf7d4dc
19 changed files with 364 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Contacts/ContactsTableViewController.m
+27 -63
View File
@@ -525,6 +525,28 @@
#pragma mark - RequestContactsAccessFooterViewDelegate
- (void)didRequestContactsAccess
{
// First check the identity if service terms have already been accepted
if (self->contactsDataSource.mxSession.identityService.areAllTermsAgreed)
{
// If they have we only require local contacts access.
[self checkAccessForContacts];
}
else
{
MXWeakify(self);
[self->contactsDataSource.mxSession prepareIdentityServiceForTermsWithDefault:RiotSettings.shared.identityServerUrlString
completion:^(MXSession *session, NSString *baseURL, NSString *accessToken) {
MXStrongifyAndReturnIfNil(self);
// Present the terms of the identity server.
[self presentIdentityServerTermsWithSession:session baseURL:baseURL andAccessToken:accessToken];
}];
}
}
- (void)checkAccessForContacts
{
MXWeakify(self);
@@ -538,50 +560,8 @@
if (granted)
{
// If granted and the identity service terms have already been accepted, show the local contacts.
if (self->contactsDataSource.mxSession.identityService.areAllTermsAgreed)
{
[self showLocalContacts];
}
else
{
// Otherwise, get a valid identity service.
MXSession *session = self->contactsDataSource.mxSession;
MXIdentityService *identityService = session.identityService;
if (!identityService)
{
NSString *baseURL = session.accountDataIdentityServer ?: RiotSettings.shared.identityServerUrlString;
identityService = [[MXIdentityService alloc] initWithIdentityServer:baseURL
accessToken:nil
andHomeserverRestClient:session.matrixRestClient];
}
// Get the identity service's access token.
[identityService accessTokenWithSuccess:^(NSString * _Nullable accessToken) {
MXWeakify(session);
// Set the identity server in the session and account data as this will be nil if
// the terms were previously declined. These will be reverted if declined once more.
[session setIdentityServer:identityService.identityServer andAccessToken:accessToken];
[session setAccountDataIdentityServer:identityService.identityServer success:^{
MXStrongifyAndReturnIfNil(session);
// Present the terms of the identity server.
[self presentIdentityServerTermsWithSession:session
baseURL:identityService.identityServer
andAccessToken:accessToken];
} failure:^(NSError *error) {
// Something went wrong setting the account data identity service
MXLogError(@"[ContactsTableViewController] Error preparing to display identity server terms: %@", error);
}];
} failure:^(NSError * _Nonnull error) {
// Something went wrong getting the identity service's access token.
MXLogError(@"[ContactsTableViewController] Error preparing to display identity server terms: %@", error);
}];
}
// When granted, local contacts can be shown.
[self showLocalContacts];
}
}];
}
@@ -592,7 +572,7 @@
MXKAppSettings.standardAppSettings.syncLocalContacts = YES;
self->contactsDataSource.showLocalContacts = YES;
// Attempt to refresh the contacts manager - triggers identity server if necessary.
// Attempt to refresh the contacts manager.
[self refreshLocalContacts];
// Hide the request access view.
@@ -611,7 +591,6 @@
ServiceTermsModalCoordinatorBridgePresenter *serviceTermsModalCoordinatorBridgePresenter = [[ServiceTermsModalCoordinatorBridgePresenter alloc] initWithSession:mxSession
baseUrl:baseURL
serviceType:MXServiceTypeIdentityService
outOfContext:YES
accessToken:accessToken];
serviceTermsModalCoordinatorBridgePresenter.delegate = self;
@@ -624,37 +603,22 @@
- (void)serviceTermsModalCoordinatorBridgePresenterDelegateDidAccept:(ServiceTermsModalCoordinatorBridgePresenter * _Nonnull)coordinatorBridgePresenter
{
[self showLocalContacts];
[coordinatorBridgePresenter dismissWithAnimated:YES completion:^{
[self checkAccessForContacts];
}];
self.serviceTermsModalCoordinatorBridgePresenter = nil;
}
- (void)serviceTermsModalCoordinatorBridgePresenterDelegateDidDecline:(ServiceTermsModalCoordinatorBridgePresenter *)coordinatorBridgePresenter session:(MXSession *)session
{
MXLogDebug(@"[ContactsTableViewController] IS Terms: User has declined the use of the default IS.");
// The user does not want to use the proposed IS.
// Disable IS feature on user's account
[session setIdentityServer:nil andAccessToken:nil];
[session setAccountDataIdentityServer:nil success:^{
} failure:^(NSError *error) {
MXLogDebug(@"[ContactsTableViewController] IS Terms: Error: %@", error);
}];
[coordinatorBridgePresenter dismissWithAnimated:YES completion:^{
}];
self.serviceTermsModalCoordinatorBridgePresenter = nil;
}
- (void)serviceTermsModalCoordinatorBridgePresenterDelegateDidCancel:(ServiceTermsModalCoordinatorBridgePresenter * _Nonnull)coordinatorBridgePresenter
- (void)serviceTermsModalCoordinatorBridgePresenterDelegateDidClose:(ServiceTermsModalCoordinatorBridgePresenter *)coordinatorBridgePresenter
{
[coordinatorBridgePresenter dismissWithAnimated:YES completion:^{
}];
self.serviceTermsModalCoordinatorBridgePresenter = nil;
}