From 96bbd326c30f5dc24581b4d55fa9eeb5ffb6de65 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Sun, 7 Feb 2021 19:55:36 +0300 Subject: [PATCH] Rename CallService to CallPresenter --- Riot.xcodeproj/project.pbxproj | 16 +++--- ...{CallService.swift => CallPresenter.swift} | 24 ++++----- .../Managers/Call/CallPresenterDelegate.swift | 49 +++++++++++++++++++ Riot/Managers/Call/CallServiceDelegate.swift | 49 ------------------- .../Operations/CallBarDismissOperation.swift | 8 +-- .../Operations/CallBarPresentOperation.swift | 8 +-- .../Operations/CallVCDismissOperation.swift | 8 +-- .../Operations/CallVCEnterPipOperation.swift | 8 +-- .../Operations/CallVCExitPipOperation.swift | 8 +-- .../Operations/CallVCPresentOperation.swift | 8 +-- Riot/Modules/Application/LegacyAppDelegate.m | 30 ++++++------ 11 files changed, 108 insertions(+), 108 deletions(-) rename Riot/Managers/Call/{CallService.swift => CallPresenter.swift} (94%) create mode 100644 Riot/Managers/Call/CallPresenterDelegate.swift delete mode 100644 Riot/Managers/Call/CallServiceDelegate.swift diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj index bc4edbad4..a69f4b97c 100644 --- a/Riot.xcodeproj/project.pbxproj +++ b/Riot.xcodeproj/project.pbxproj @@ -934,7 +934,7 @@ EC9E9B0A2575AF8A0007C0A0 /* CallBarPresentOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9E9B092575AF8A0007C0A0 /* CallBarPresentOperation.swift */; }; EC9E9B0C2575AF9B0007C0A0 /* CallBarDismissOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9E9B0B2575AF9B0007C0A0 /* CallBarDismissOperation.swift */; }; EC9E9B0E2575AFB80007C0A0 /* AsyncOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9E9B0D2575AFB80007C0A0 /* AsyncOperation.swift */; }; - EC9E9B102575B33E0007C0A0 /* CallServiceDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9E9B0F2575B33E0007C0A0 /* CallServiceDelegate.swift */; }; + EC9E9B102575B33E0007C0A0 /* CallPresenterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9E9B0F2575B33E0007C0A0 /* CallPresenterDelegate.swift */; }; EC9E9B112575B3960007C0A0 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DB4F0A223131600065DBFA /* String.swift */; }; EC9E9B122575B3A70007C0A0 /* Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DB4F05223015080065DBFA /* Character.swift */; }; EC9E9B1425767C460007C0A0 /* CallBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9E9B1325767C460007C0A0 /* CallBar.swift */; }; @@ -950,7 +950,7 @@ ECB101362477D00700CF8C11 /* UniversalLink.m in Sources */ = {isa = PBXBuildFile; fileRef = ECB101352477D00700CF8C11 /* UniversalLink.m */; }; ECB5D98F255420F8000AD89C /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECB5D98E255420F8000AD89C /* Keychain.swift */; }; ECB5D9902554221F000AD89C /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECB5D98E255420F8000AD89C /* Keychain.swift */; }; - ECC4C82F256FA7520010BA44 /* CallService.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECC4C82E256FA7520010BA44 /* CallService.swift */; }; + ECC4C82F256FA7520010BA44 /* CallPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECC4C82E256FA7520010BA44 /* CallPresenter.swift */; }; ECDC15F224AF41D2003437CF /* FormattedBodyParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECDC15F124AF41D2003437CF /* FormattedBodyParser.swift */; }; ECF57A4425090C23004BBF9D /* CreateRoomCoordinatorBridgePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECF57A3825090C23004BBF9D /* CreateRoomCoordinatorBridgePresenter.swift */; }; ECF57A4525090C23004BBF9D /* CreateRoomCoordinatorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECF57A3925090C23004BBF9D /* CreateRoomCoordinatorType.swift */; }; @@ -2212,7 +2212,7 @@ EC9E9B092575AF8A0007C0A0 /* CallBarPresentOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallBarPresentOperation.swift; sourceTree = ""; }; EC9E9B0B2575AF9B0007C0A0 /* CallBarDismissOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallBarDismissOperation.swift; sourceTree = ""; }; EC9E9B0D2575AFB80007C0A0 /* AsyncOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncOperation.swift; sourceTree = ""; }; - EC9E9B0F2575B33E0007C0A0 /* CallServiceDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallServiceDelegate.swift; sourceTree = ""; }; + EC9E9B0F2575B33E0007C0A0 /* CallPresenterDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallPresenterDelegate.swift; sourceTree = ""; }; EC9E9B1325767C460007C0A0 /* CallBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallBar.swift; sourceTree = ""; }; EC9E9B1625767D4B0007C0A0 /* CallBar.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CallBar.xib; sourceTree = ""; }; ECAE7AE424EC0E01002FA813 /* TableViewSections.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewSections.swift; sourceTree = ""; }; @@ -2226,7 +2226,7 @@ ECB101342477D00700CF8C11 /* UniversalLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniversalLink.h; sourceTree = ""; }; ECB101352477D00700CF8C11 /* UniversalLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UniversalLink.m; sourceTree = ""; }; ECB5D98E255420F8000AD89C /* Keychain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keychain.swift; sourceTree = ""; }; - ECC4C82E256FA7520010BA44 /* CallService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallService.swift; sourceTree = ""; }; + ECC4C82E256FA7520010BA44 /* CallPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallPresenter.swift; sourceTree = ""; }; ECDC15F124AF41D2003437CF /* FormattedBodyParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormattedBodyParser.swift; sourceTree = ""; }; ECF57A3825090C23004BBF9D /* CreateRoomCoordinatorBridgePresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CreateRoomCoordinatorBridgePresenter.swift; sourceTree = ""; }; ECF57A3925090C23004BBF9D /* CreateRoomCoordinatorType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CreateRoomCoordinatorType.swift; sourceTree = ""; }; @@ -5364,8 +5364,8 @@ ECC4C82D256FA73E0010BA44 /* Call */ = { isa = PBXGroup; children = ( - ECC4C82E256FA7520010BA44 /* CallService.swift */, - EC9E9B0F2575B33E0007C0A0 /* CallServiceDelegate.swift */, + ECC4C82E256FA7520010BA44 /* CallPresenter.swift */, + EC9E9B0F2575B33E0007C0A0 /* CallPresenterDelegate.swift */, EC9E9B0D2575AFB80007C0A0 /* AsyncOperation.swift */, EC7749CC25A48F6100AB1295 /* PiPAnimator.swift */, EC7749D025A5C58000AB1295 /* PiPView.swift */, @@ -6715,7 +6715,7 @@ B157FAA623264AE900EBFBD4 /* SettingsDiscoveryThreePidDetailsViewController.swift in Sources */, B126768A2523E4D100BE6B98 /* SecretsResetViewModel.swift in Sources */, B1DCC62422E60CA900625807 /* EmojiPickerCategoryViewData.swift in Sources */, - ECC4C82F256FA7520010BA44 /* CallService.swift in Sources */, + ECC4C82F256FA7520010BA44 /* CallPresenter.swift in Sources */, EC7749D125A5C58000AB1295 /* PiPView.swift in Sources */, B1550FCB2420E8F500CE097B /* QRCodeReaderViewController.swift in Sources */, B124BBD725645F3F0028996D /* RoomIdComponents.swift in Sources */, @@ -6875,7 +6875,7 @@ EC1CA89624C9C9A200DE9EBF /* SetupBiometricsCoordinator.swift in Sources */, EC711B9024A63B37008F830C /* SecretsRecoveryWithKeyCoordinator.swift in Sources */, B1A6C10723881EF2002882FD /* SlidingModalPresenter.swift in Sources */, - EC9E9B102575B33E0007C0A0 /* CallServiceDelegate.swift in Sources */, + EC9E9B102575B33E0007C0A0 /* CallPresenterDelegate.swift in Sources */, B1B5573520EE6C4D00210D55 /* GroupDetailsViewController.m in Sources */, B12D7A0223E2462200FACEDC /* UserVerificationStartViewAction.swift in Sources */, EC85D7372477DD97002C44C9 /* LocalContactsSectionHeaderContainerView.m in Sources */, diff --git a/Riot/Managers/Call/CallService.swift b/Riot/Managers/Call/CallPresenter.swift similarity index 94% rename from Riot/Managers/Call/CallService.swift rename to Riot/Managers/Call/CallPresenter.swift index de06b8d79..8c52c7b02 100644 --- a/Riot/Managers/Call/CallService.swift +++ b/Riot/Managers/Call/CallPresenter.swift @@ -19,7 +19,7 @@ import MatrixKit @objcMembers /// Service to manage call screens and call bar UI management. -class CallService: NSObject { +class CallPresenter: NSObject { private enum Constants { static let pipAnimationDuration: TimeInterval = 0.25 @@ -75,7 +75,7 @@ class CallService: NSObject { let maximumNumberOfConcurrentCalls: UInt = 2 /// Delegate object - weak var delegate: CallServiceDelegate? + weak var delegate: CallPresenterDelegate? /// Start the service func start() { @@ -120,7 +120,7 @@ class CallService: NSObject { } private func shouldHandleCall(_ call: MXCall) -> Bool { - if let delegate = delegate, !delegate.callService(self, shouldHandleNewCall: call) { + if let delegate = delegate, !delegate.callPresenter(self, shouldHandleNewCall: call) { return false } return callVCs.count < maximumNumberOfConcurrentCalls @@ -317,7 +317,7 @@ class CallService: NSObject { dismissCallVC(presentedCallVC) } - let operation = CallVCPresentOperation(service: self, callVC: callVC) { [weak self] in + let operation = CallVCPresentOperation(presenter: self, callVC: callVC) { [weak self] in self?.presentedCallVC = callVC if callVC == self?.pipCallVC { self?.pipCallVC = nil @@ -333,7 +333,7 @@ class CallService: NSObject { // do not use PiP transitions here, as we really want to dismiss the screen callVC.transitioningDelegate = nil - let operation = CallVCDismissOperation(service: self, callVC: callVC) { [weak self] in + let operation = CallVCDismissOperation(presenter: self, callVC: callVC) { [weak self] in if callVC == self?.presentedCallVC { self?.presentedCallVC = nil } @@ -348,7 +348,7 @@ class CallService: NSObject { // assign self as transitioning delegate callVC.transitioningDelegate = self - let operation = CallVCEnterPipOperation(service: self, callVC: callVC) { [weak self] in + let operation = CallVCEnterPipOperation(presenter: self, callVC: callVC) { [weak self] in self?.pipCallVC = callVC if callVC == self?.presentedCallVC { self?.presentedCallVC = nil @@ -364,7 +364,7 @@ class CallService: NSObject { // assign self as transitioning delegate callVC.transitioningDelegate = self - let operation = CallVCExitPipOperation(service: self, callVC: callVC) { [weak self] in + let operation = CallVCExitPipOperation(presenter: self, callVC: callVC) { [weak self] in if callVC == self?.pipCallVC { self?.pipCallVC = nil } @@ -381,7 +381,7 @@ class CallService: NSObject { let activeCallVC = self.activeCallVC - let operation = CallBarPresentOperation(service: self, activeCallVC: activeCallVC, numberOfPausedCalls: numberOfPausedCalls) { [weak self] in + let operation = CallBarPresentOperation(presenter: self, activeCallVC: activeCallVC, numberOfPausedCalls: numberOfPausedCalls) { [weak self] in // active calls are more prior to paused ones. // So, if user taps the bar when we have one active and one paused calls, we navigate to the active one. if !isUpdateOnly { @@ -395,7 +395,7 @@ class CallService: NSObject { private func dismissCallBar(for callVC: CallViewController, completion: (() -> Void)? = nil) { NSLog("[CallService] dismissCallBar: call: \(String(describing: callVC.mxCall?.callId))") - let operation = CallBarDismissOperation(service: self) { [weak self] in + let operation = CallBarDismissOperation(presenter: self) { [weak self] in if callVC == self?.inBarCallVC { self?.inBarCallVC = nil } @@ -409,7 +409,7 @@ class CallService: NSObject { // MARK: - MXKCallViewControllerDelegate -extension CallService: MXKCallViewControllerDelegate { +extension CallPresenter: MXKCallViewControllerDelegate { func dismiss(_ callViewController: MXKCallViewController!, completion: (() -> Void)!) { guard let callVC = callViewController as? CallViewController else { @@ -463,7 +463,7 @@ extension CallService: MXKCallViewControllerDelegate { // MARK: - UIViewControllerTransitioningDelegate -extension CallService: UIViewControllerTransitioningDelegate { +extension CallPresenter: UIViewControllerTransitioningDelegate { func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? { return PiPAnimator(animationDuration: Constants.pipAnimationDuration, @@ -481,7 +481,7 @@ extension CallService: UIViewControllerTransitioningDelegate { // MARK: - PiPViewDelegate -extension CallService: PiPViewDelegate { +extension CallPresenter: PiPViewDelegate { func pipViewDidTap(_ view: PiPView) { guard let pipCallVC = pipCallVC else { return } diff --git a/Riot/Managers/Call/CallPresenterDelegate.swift b/Riot/Managers/Call/CallPresenterDelegate.swift new file mode 100644 index 000000000..c3a47cb3a --- /dev/null +++ b/Riot/Managers/Call/CallPresenterDelegate.swift @@ -0,0 +1,49 @@ +// +// Copyright 2020 New Vector Ltd +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation + +@objc +protocol CallPresenterDelegate: class { + // New call + func callPresenter(_ presenter: CallPresenter, + shouldHandleNewCall call: MXCall) -> Bool + + // Call screens + func callPresenter(_ presenter: CallPresenter, + presentCallViewController viewController: CallViewController, + completion:(() -> Void)?) + func callPresenter(_ presenter: CallPresenter, + dismissCallViewController viewController: CallViewController, + completion:(() -> Void)?) + + // Call Bar + func callPresenter(_ presenter: CallPresenter, + presentCallBarFor activeCallViewController: CallViewController?, + numberOfPausedCalls: UInt, + completion:(() -> Void)?) + func callPresenter(_ presenter: CallPresenter, + dismissCallBar completion:(() -> Void)?) + + // PiP + func callPresenter(_ presenter: CallPresenter, + enterPipForCallViewController viewController: CallViewController, + completion:(() -> Void)?) + + func callPresenter(_ presenter: CallPresenter, + exitPipForCallViewController viewController: CallViewController, + completion:(() -> Void)?) +} diff --git a/Riot/Managers/Call/CallServiceDelegate.swift b/Riot/Managers/Call/CallServiceDelegate.swift deleted file mode 100644 index 93da9177c..000000000 --- a/Riot/Managers/Call/CallServiceDelegate.swift +++ /dev/null @@ -1,49 +0,0 @@ -// -// Copyright 2020 New Vector Ltd -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import Foundation - -@objc -protocol CallServiceDelegate: class { - // New call - func callService(_ service: CallService, - shouldHandleNewCall call: MXCall) -> Bool - - // Call screens - func callService(_ service: CallService, - presentCallViewController viewController: CallViewController, - completion:(() -> Void)?) - func callService(_ service: CallService, - dismissCallViewController viewController: CallViewController, - completion:(() -> Void)?) - - // Call Bar - func callService(_ service: CallService, - presentCallBarFor activeCallViewController: CallViewController?, - numberOfPausedCalls: UInt, - completion:(() -> Void)?) - func callService(_ service: CallService, - dismissCallBar completion:(() -> Void)?) - - // PiP - func callService(_ service: CallService, - enterPipForCallViewController viewController: CallViewController, - completion:(() -> Void)?) - - func callService(_ service: CallService, - exitPipForCallViewController viewController: CallViewController, - completion:(() -> Void)?) -} diff --git a/Riot/Managers/Call/Operations/CallBarDismissOperation.swift b/Riot/Managers/Call/Operations/CallBarDismissOperation.swift index f7e1e2c81..02be105d1 100644 --- a/Riot/Managers/Call/Operations/CallBarDismissOperation.swift +++ b/Riot/Managers/Call/Operations/CallBarDismissOperation.swift @@ -18,17 +18,17 @@ import Foundation class CallBarDismissOperation: AsyncOperation { - private var service: CallService + private var presenter: CallPresenter private var completion: (() -> Void)? - init(service: CallService, + init(presenter: CallPresenter, completion: (() -> Void)? = nil) { - self.service = service + self.presenter = presenter self.completion = completion } override func main() { - service.delegate?.callService(service, dismissCallBar: { + presenter.delegate?.callPresenter(presenter, dismissCallBar: { self.finish() self.completion?() }) diff --git a/Riot/Managers/Call/Operations/CallBarPresentOperation.swift b/Riot/Managers/Call/Operations/CallBarPresentOperation.swift index 032613c4a..8e2eb610a 100644 --- a/Riot/Managers/Call/Operations/CallBarPresentOperation.swift +++ b/Riot/Managers/Call/Operations/CallBarPresentOperation.swift @@ -18,23 +18,23 @@ import Foundation class CallBarPresentOperation: AsyncOperation { - private var service: CallService + private var presenter: CallPresenter private var activeCallVC: CallViewController? private var numberOfPausedCalls: UInt private var completion: (() -> Void)? - init(service: CallService, + init(presenter: CallPresenter, activeCallVC: CallViewController?, numberOfPausedCalls: UInt, completion: (() -> Void)? = nil) { - self.service = service + self.presenter = presenter self.activeCallVC = activeCallVC self.numberOfPausedCalls = numberOfPausedCalls self.completion = completion } override func main() { - service.delegate?.callService(service, presentCallBarFor: activeCallVC, numberOfPausedCalls: numberOfPausedCalls, completion: { + presenter.delegate?.callPresenter(presenter, presentCallBarFor: activeCallVC, numberOfPausedCalls: numberOfPausedCalls, completion: { self.finish() self.completion?() }) diff --git a/Riot/Managers/Call/Operations/CallVCDismissOperation.swift b/Riot/Managers/Call/Operations/CallVCDismissOperation.swift index a197b9a1c..7a7073d39 100644 --- a/Riot/Managers/Call/Operations/CallVCDismissOperation.swift +++ b/Riot/Managers/Call/Operations/CallVCDismissOperation.swift @@ -18,20 +18,20 @@ import Foundation class CallVCDismissOperation: AsyncOperation { - private var service: CallService + private var presenter: CallPresenter private var callVC: CallViewController private var completion: (() -> Void)? - init(service: CallService, + init(presenter: CallPresenter, callVC: CallViewController, completion: (() -> Void)? = nil) { - self.service = service + self.presenter = presenter self.callVC = callVC self.completion = completion } override func main() { - service.delegate?.callService(service, dismissCallViewController: callVC, completion: { + presenter.delegate?.callPresenter(presenter, dismissCallViewController: callVC, completion: { self.finish() self.completion?() }) diff --git a/Riot/Managers/Call/Operations/CallVCEnterPipOperation.swift b/Riot/Managers/Call/Operations/CallVCEnterPipOperation.swift index 95a105733..be140e7ae 100644 --- a/Riot/Managers/Call/Operations/CallVCEnterPipOperation.swift +++ b/Riot/Managers/Call/Operations/CallVCEnterPipOperation.swift @@ -18,20 +18,20 @@ import Foundation class CallVCEnterPipOperation: AsyncOperation { - private var service: CallService + private var presenter: CallPresenter private var callVC: CallViewController private var completion: (() -> Void)? - init(service: CallService, + init(presenter: CallPresenter, callVC: CallViewController, completion: (() -> Void)? = nil) { - self.service = service + self.presenter = presenter self.callVC = callVC self.completion = completion } override func main() { - service.delegate?.callService(service, enterPipForCallViewController: callVC, completion: { + presenter.delegate?.callPresenter(presenter, enterPipForCallViewController: callVC, completion: { self.finish() self.completion?() }) diff --git a/Riot/Managers/Call/Operations/CallVCExitPipOperation.swift b/Riot/Managers/Call/Operations/CallVCExitPipOperation.swift index ed1c4d347..0a4d17147 100644 --- a/Riot/Managers/Call/Operations/CallVCExitPipOperation.swift +++ b/Riot/Managers/Call/Operations/CallVCExitPipOperation.swift @@ -18,20 +18,20 @@ import Foundation class CallVCExitPipOperation: AsyncOperation { - private var service: CallService + private var presenter: CallPresenter private var callVC: CallViewController private var completion: (() -> Void)? - init(service: CallService, + init(presenter: CallPresenter, callVC: CallViewController, completion: (() -> Void)? = nil) { - self.service = service + self.presenter = presenter self.callVC = callVC self.completion = completion } override func main() { - service.delegate?.callService(service, exitPipForCallViewController: callVC, completion: { + presenter.delegate?.callPresenter(presenter, exitPipForCallViewController: callVC, completion: { self.finish() self.completion?() }) diff --git a/Riot/Managers/Call/Operations/CallVCPresentOperation.swift b/Riot/Managers/Call/Operations/CallVCPresentOperation.swift index e06f0e4a7..1a58f86cd 100644 --- a/Riot/Managers/Call/Operations/CallVCPresentOperation.swift +++ b/Riot/Managers/Call/Operations/CallVCPresentOperation.swift @@ -18,20 +18,20 @@ import Foundation class CallVCPresentOperation: AsyncOperation { - private var service: CallService + private var presenter: CallPresenter private var callVC: CallViewController private var completion: (() -> Void)? - init(service: CallService, + init(presenter: CallPresenter, callVC: CallViewController, completion: (() -> Void)? = nil) { - self.service = service + self.presenter = presenter self.callVC = callVC self.completion = completion } override func main() { - service.delegate?.callService(service, presentCallViewController: callVC, completion: { + presenter.delegate?.callPresenter(presenter, presentCallViewController: callVC, completion: { self.finish() self.completion?() }) diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m index c8fdf6219..d34095a3d 100644 --- a/Riot/Modules/Application/LegacyAppDelegate.m +++ b/Riot/Modules/Application/LegacyAppDelegate.m @@ -90,7 +90,7 @@ NSString *const AppDelegateDidValidateEmailNotificationClientSecretKey = @"AppDe NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUniversalLinkDidChangeNotification"; -@interface LegacyAppDelegate () +@interface LegacyAppDelegate () { /** Reachability observer @@ -224,7 +224,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni @property (nonatomic, strong) PushNotificationService *pushNotificationService; @property (nonatomic, strong) PushNotificationStore *pushNotificationStore; @property (nonatomic, strong) LocalAuthenticationService *localAuthenticationService; -@property (nonatomic, strong) CallService *callService; +@property (nonatomic, strong) CallPresenter *callPresenter; @property (nonatomic, strong) MajorUpdateManager *majorUpdateManager; @@ -454,8 +454,8 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni self.localAuthenticationService = [[LocalAuthenticationService alloc] initWithPinCodePreferences:[PinCodePreferences shared]]; - self.callService = [[CallService alloc] init]; - self.callService.delegate = self; + self.callPresenter = [[CallPresenter alloc] init]; + self.callPresenter.delegate = self; self.pushNotificationStore = [PushNotificationStore new]; self.pushNotificationService = [[PushNotificationService alloc] initWithPushNotificationStore:self.pushNotificationStore]; @@ -1757,7 +1757,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni else if (mxSession.state == MXSessionStateStoreDataReady) { // start the call service - [self.callService start]; + [self.callPresenter start]; // Look for the account related to this session. NSArray *mxAccounts = [MXKAccountManager sharedManager].activeAccounts; @@ -1992,7 +1992,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni if (!mxSessionArray.count) { // if no session left, stop the call service - [self.callService stop]; + [self.callPresenter stop]; } } @@ -4409,15 +4409,15 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni } } -#pragma mark - CallServiceDelegate +#pragma mark - CallPresenterDelegate -- (BOOL)callService:(CallService *)service shouldHandleNewCall:(MXCall *)call +- (BOOL)callPresenter:(CallPresenter *)presenter shouldHandleNewCall:(MXCall *)call { // Ignore the call if a call is already in progress return _jitsiViewController == nil; } -- (void)callService:(CallService *)service presentCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion +- (void)callPresenter:(CallPresenter *)presenter presentCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion { if (@available(iOS 13.0, *)) { @@ -4427,7 +4427,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni [self presentViewController:viewController animated:YES completion:completion]; } -- (void)callService:(CallService *)service dismissCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion +- (void)callPresenter:(CallPresenter *)presenter dismissCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion { // Check whether the call view controller is actually presented if (viewController.presentingViewController) @@ -4455,7 +4455,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni } } -- (void)callService:(CallService *)service presentCallBarFor:(CallViewController *)activeCallViewController numberOfPausedCalls:(NSUInteger)numberOfPausedCalls completion:(void (^)(void))completion +- (void)callPresenter:(CallPresenter *)presenter presentCallBarFor:(CallViewController *)activeCallViewController numberOfPausedCalls:(NSUInteger)numberOfPausedCalls completion:(void (^)(void))completion { NSString *btnTitle; @@ -4498,7 +4498,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni } } -- (void)callService:(CallService *)service dismissCallBar:(void (^)(void))completion +- (void)callPresenter:(CallPresenter *)presenter dismissCallBar:(void (^)(void))completion { [self removeCallStatusBar]; @@ -4508,7 +4508,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni } } -- (void)callService:(CallService *)service enterPipForCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion +- (void)callPresenter:(CallPresenter *)presenter enterPipForCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion { // Check whether the call view controller is actually presented if (viewController.presentingViewController) @@ -4524,7 +4524,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni } } -- (void)callService:(CallService *)service exitPipForCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion +- (void)callPresenter:(CallPresenter *)presenter exitPipForCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion { if (@available(iOS 13.0, *)) { @@ -4538,7 +4538,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni - (void)callBarDidTapReturnButton:(CallBar *)callBar { - if ([_callService callStatusBarButtonTapped]) + if ([_callPresenter callStatusBarButtonTapped]) { return; }