From de3ca02b6a43d86fb778c30a8a21d4d68149ca65 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Fri, 29 Nov 2019 16:21:03 +0100 Subject: [PATCH] Fix terms appearing twice on cancel in IntegrationManagerViewController. --- .../IntegrationManagerViewController.m | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Riot/Modules/Integrations/IntegrationManagerViewController.m b/Riot/Modules/Integrations/IntegrationManagerViewController.m index 809f280b8..ea29bdb7d 100644 --- a/Riot/Modules/Integrations/IntegrationManagerViewController.m +++ b/Riot/Modules/Integrations/IntegrationManagerViewController.m @@ -38,6 +38,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ"; } @property (nonatomic, strong) ServiceTermsModalCoordinatorBridgePresenter *serviceTermsModalCoordinatorBridgePresenter; +@property (nonatomic) BOOL isViewAppearedOnce; @end @@ -72,8 +73,12 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ"; - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - - [self loadData]; + + if (!self.isViewAppearedOnce) + { + self.isViewAppearedOnce = YES; + [self loadData]; + } } - (void)loadData @@ -766,4 +771,12 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ"; self.serviceTermsModalCoordinatorBridgePresenter = nil; } +- (void)serviceTermsModalCoordinatorBridgePresenterDelegateDidDecline:(ServiceTermsModalCoordinatorBridgePresenter * _Nonnull)coordinatorBridgePresenter session:(MXSession * _Nonnull)session +{ + [coordinatorBridgePresenter dismissWithAnimated:YES completion:^{ + [self withdrawViewControllerAnimated:YES completion:nil]; + }]; + self.serviceTermsModalCoordinatorBridgePresenter = nil; +} + @end