From 6ad44216fcf7e7bd9a05f3d6f7de4e215907295b Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Fri, 25 Oct 2019 17:44:02 +0200 Subject: [PATCH] Refactor single search domain to TunnelKit update --- .../Scenes/ServerNetworkViewController.swift | 4 ++-- Podfile | 2 +- Podfile.lock | 10 +++++----- Submodules/Core | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Passepartout-iOS/Scenes/ServerNetworkViewController.swift b/Passepartout-iOS/Scenes/ServerNetworkViewController.swift index 5cbeaf8b..e162cdce 100644 --- a/Passepartout-iOS/Scenes/ServerNetworkViewController.swift +++ b/Passepartout-iOS/Scenes/ServerNetworkViewController.swift @@ -67,7 +67,7 @@ class ServerNetworkViewController: UITableViewController, StrongTableHost { } rows = [] - if let dnsDomain = configuration.searchDomain, !dnsDomain.isEmpty { + if let dnsDomain = configuration.searchDomains?.first, !dnsDomain.isEmpty { indexOfFirstDNSAddress = 1 rows.append(.dnsDomain) } @@ -240,7 +240,7 @@ extension ServerNetworkViewController { // shared rows switch row { case .dnsDomain: - guard let domain = configuration.searchDomain, !domain.isEmpty else { + guard let domain = configuration.searchDomains?.first, !domain.isEmpty else { fatalError("Got DNS domain without a domain") } cell.leftText = L10n.Core.NetworkSettings.Dns.Cells.Domain.caption diff --git a/Podfile b/Podfile index 272ebec2..f4f6a9af 100644 --- a/Podfile +++ b/Podfile @@ -9,7 +9,7 @@ $tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO'] def shared_pods #pod_version $tunnelkit_name, $tunnelkit_specs, '~> 2.0.5' - pod_git $tunnelkit_name, $tunnelkit_specs, '4959442' + pod_git $tunnelkit_name, $tunnelkit_specs, '4d930d3' #pod_path $tunnelkit_name, $tunnelkit_specs, '..' pod 'SSZipArchive' diff --git a/Podfile.lock b/Podfile.lock index 33b2e1b4..27769c28 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -37,8 +37,8 @@ DEPENDENCIES: - Convenience/Tables (from `https://github.com/keeshux/convenience`, commit `b990a8c`) - MBProgressHUD - SSZipArchive - - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `4959442`) - - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `4959442`) + - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `4d930d3`) + - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `4d930d3`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -52,7 +52,7 @@ EXTERNAL SOURCES: :commit: b990a8c :git: https://github.com/keeshux/convenience TunnelKit: - :commit: '4959442' + :commit: 4d930d3 :git: https://github.com/passepartoutvpn/tunnelkit CHECKOUT OPTIONS: @@ -60,7 +60,7 @@ CHECKOUT OPTIONS: :commit: b990a8c :git: https://github.com/keeshux/convenience TunnelKit: - :commit: '4959442' + :commit: 4d930d3 :git: https://github.com/passepartoutvpn/tunnelkit SPEC CHECKSUMS: @@ -71,6 +71,6 @@ SPEC CHECKSUMS: SwiftyBeaver: aaf2ebd7dac2e952991f46a82ed24ad642867ae2 TunnelKit: 0743f0306be0869d51118ac33e274e7507a93537 -PODFILE CHECKSUM: a0028109a65292b76d72edb188291804eac46868 +PODFILE CHECKSUM: f45a3fd3744e646a5513e3e25d447d1550c9fefa COCOAPODS: 1.8.4 diff --git a/Submodules/Core b/Submodules/Core index 2b4ae2d4..4fb30619 160000 --- a/Submodules/Core +++ b/Submodules/Core @@ -1 +1 @@ -Subproject commit 2b4ae2d4f5034b44c60bd5ad79c092c094362c30 +Subproject commit 4fb306195bbb71973adf4d03290952226c2b5dab