diff options
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.pbxproj | 8 | ||||
| -rw-r--r-- | ios/MullvadVPN/ConnectViewController.swift | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/SelectLocationNavigationController.swift | 12 | ||||
| -rw-r--r-- | ios/MullvadVPN/SelectLocationViewController.swift (renamed from ios/MullvadVPN/SelectLocationController.swift) | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/ViewControllerIdentifier.swift | 1 |
5 files changed, 14 insertions, 15 deletions
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index ffc7c9d393..3961219d16 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -116,7 +116,7 @@ 588534BF246193D90018B744 /* AutomaticKeyRotationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 588534BD246193C00018B744 /* AutomaticKeyRotationManager.swift */; }; 5888AD7F2279B6BF0051EB06 /* RelayStatusIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5888AD7E2279B6BF0051EB06 /* RelayStatusIndicatorView.swift */; }; 5888AD83227B11080051EB06 /* SelectLocationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5888AD82227B11080051EB06 /* SelectLocationCell.swift */; }; - 5888AD87227B17950051EB06 /* SelectLocationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5888AD86227B17950051EB06 /* SelectLocationController.swift */; }; + 5888AD87227B17950051EB06 /* SelectLocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5888AD86227B17950051EB06 /* SelectLocationViewController.swift */; }; 588D2FE3248AC27F00E313F7 /* AsyncOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58E973DD24850EB600096F90 /* AsyncOperation.swift */; }; 58906DE02445C7A5002F0673 /* NEProviderStopReason+Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58906DDF2445C7A5002F0673 /* NEProviderStopReason+Debug.swift */; }; 58907D9524D17B4E00CFC3F5 /* DisconnectSplitButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58907D9424D17B4E00CFC3F5 /* DisconnectSplitButton.swift */; }; @@ -322,7 +322,7 @@ 588534BD246193C00018B744 /* AutomaticKeyRotationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutomaticKeyRotationManager.swift; sourceTree = "<group>"; }; 5888AD7E2279B6BF0051EB06 /* RelayStatusIndicatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayStatusIndicatorView.swift; sourceTree = "<group>"; }; 5888AD82227B11080051EB06 /* SelectLocationCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectLocationCell.swift; sourceTree = "<group>"; }; - 5888AD86227B17950051EB06 /* SelectLocationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectLocationController.swift; sourceTree = "<group>"; }; + 5888AD86227B17950051EB06 /* SelectLocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectLocationViewController.swift; sourceTree = "<group>"; }; 58906DDF2445C7A5002F0673 /* NEProviderStopReason+Debug.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEProviderStopReason+Debug.swift"; sourceTree = "<group>"; }; 58907D9424D17B4E00CFC3F5 /* DisconnectSplitButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisconnectSplitButton.swift; sourceTree = "<group>"; }; 5894E725236B2801008A2793 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; }; @@ -595,7 +595,7 @@ 5888AD7E2279B6BF0051EB06 /* RelayStatusIndicatorView.swift */, 587425C02299833500CA2045 /* RootContainerViewController.swift */, 5888AD82227B11080051EB06 /* SelectLocationCell.swift */, - 5888AD86227B17950051EB06 /* SelectLocationController.swift */, + 5888AD86227B17950051EB06 /* SelectLocationViewController.swift */, 5857F24224C8662600CF6F47 /* SelectLocationHeaderView.swift */, 5857F24624C882D700CF6F47 /* SelectLocationNavigationController.swift */, 582BB1B2229574F40055B6EF /* SettingsAccountCell.swift */, @@ -992,7 +992,7 @@ 582AE3102440A6CA00E6733A /* AccountTokenInput.swift in Sources */, 58FAEDF7245088E100CB0F5B /* Keychain.swift in Sources */, 58907D9524D17B4E00CFC3F5 /* DisconnectSplitButton.swift in Sources */, - 5888AD87227B17950051EB06 /* SelectLocationController.swift in Sources */, + 5888AD87227B17950051EB06 /* SelectLocationViewController.swift in Sources */, 580EE20424B321EC00F9D8A1 /* OperationObserver.swift in Sources */, 58F19E35228C15BA00C7710B /* SpinnerActivityIndicatorView.swift in Sources */, 58A99ED3240014A0006599E9 /* ConsentViewController.swift in Sources */, diff --git a/ios/MullvadVPN/ConnectViewController.swift b/ios/MullvadVPN/ConnectViewController.swift index a3dfdb7b05..725b2472da 100644 --- a/ios/MullvadVPN/ConnectViewController.swift +++ b/ios/MullvadVPN/ConnectViewController.swift @@ -94,7 +94,7 @@ class ConnectViewController: UIViewController, RootContainment, TunnelObserver, // MARK: - SelectLocationDelegate - func selectLocationController(_ controller: SelectLocationController, didSelectLocation location: RelayLocation) { + func selectLocationViewController(_ controller: SelectLocationViewController, didSelectLocation location: RelayLocation) { controller.dismiss(animated: true) { let relayConstraints = RelayConstraints(location: .only(location)) @@ -115,7 +115,7 @@ class ConnectViewController: UIViewController, RootContainment, TunnelObserver, } } - func selectLocationControllerDidCancel(_ controller: SelectLocationController) { + func selectLocationViewControllerDidCancel(_ controller: SelectLocationViewController) { controller.dismiss(animated: true) } diff --git a/ios/MullvadVPN/SelectLocationNavigationController.swift b/ios/MullvadVPN/SelectLocationNavigationController.swift index 08c3b3b7e8..a21f7788ed 100644 --- a/ios/MullvadVPN/SelectLocationNavigationController.swift +++ b/ios/MullvadVPN/SelectLocationNavigationController.swift @@ -10,12 +10,12 @@ import Foundation import UIKit protocol SelectLocationDelegate: class { - func selectLocationController(_ controller: SelectLocationController, didSelectLocation location: RelayLocation) - func selectLocationControllerDidCancel(_ controller: SelectLocationController) + func selectLocationViewController(_ controller: SelectLocationViewController, didSelectLocation location: RelayLocation) + func selectLocationViewControllerDidCancel(_ controller: SelectLocationViewController) } class SelectLocationNavigationController: UINavigationController { - private weak var contentController: SelectLocationController? + private weak var contentController: SelectLocationViewController? weak var selectLocationDelegate: SelectLocationDelegate? @@ -26,7 +26,7 @@ class SelectLocationNavigationController: UINavigationController { navigationBar.barStyle = .black navigationBar.tintColor = .white - let contentController = SelectLocationController() + let contentController = SelectLocationViewController() contentController.navigationItem.title = NSLocalizedString("Select location", comment: "") contentController.navigationItem.largeTitleDisplayMode = .always contentController.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(handleDone(_:))) @@ -34,7 +34,7 @@ class SelectLocationNavigationController: UINavigationController { contentController.didSelectLocationHandler = { [weak self] (location) in guard let self = self, let contentController = self.contentController else { return } - self.selectLocationDelegate?.selectLocationController(contentController, didSelectLocation: location) + self.selectLocationDelegate?.selectLocationViewController(contentController, didSelectLocation: location) } self.contentController = contentController @@ -57,7 +57,7 @@ class SelectLocationNavigationController: UINavigationController { @objc func handleDone(_ sender: AnyObject) { if let contentController = contentController { - selectLocationDelegate?.selectLocationControllerDidCancel(contentController) + selectLocationDelegate?.selectLocationViewControllerDidCancel(contentController) } } } diff --git a/ios/MullvadVPN/SelectLocationController.swift b/ios/MullvadVPN/SelectLocationViewController.swift index 44e8751919..47a6dab663 100644 --- a/ios/MullvadVPN/SelectLocationController.swift +++ b/ios/MullvadVPN/SelectLocationViewController.swift @@ -1,5 +1,5 @@ // -// SelectLocationController.swift +// SelectLocationViewController.swift // MullvadVPN // // Created by pronebird on 02/05/2019. @@ -12,7 +12,7 @@ import Logging private let kCellIdentifier = "Cell" -class SelectLocationController: UITableViewController, RelayCacheObserver { +class SelectLocationViewController: UITableViewController, RelayCacheObserver { private enum Error: ChainedError { case loadRelayList(RelayCacheError) diff --git a/ios/MullvadVPN/ViewControllerIdentifier.swift b/ios/MullvadVPN/ViewControllerIdentifier.swift index fd3defdfb5..1a808d1873 100644 --- a/ios/MullvadVPN/ViewControllerIdentifier.swift +++ b/ios/MullvadVPN/ViewControllerIdentifier.swift @@ -11,5 +11,4 @@ import Foundation enum ViewControllerIdentifier: String { case main = "Main" case settings = "Settings" - case selectLocation = "SelectLocation" } |