passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor single search domain to TunnelKit update

This commit is contained in:
Davide De Rosa 2019-10-25 17:44:02 +02:00
parent e600ca00c3
commit 6ad44216fc
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Passepartout-iOS/Scenes/ServerNetworkViewController.swift
View File

@ -67,7 +67,7 @@ class ServerNetworkViewController: UITableViewController, StrongTableHost {
} }
rows = [] rows = []
if let dnsDomain = configuration.searchDomain, !dnsDomain.isEmpty { if let dnsDomain = configuration.searchDomains?.first, !dnsDomain.isEmpty {
indexOfFirstDNSAddress = 1 indexOfFirstDNSAddress = 1
rows.append(.dnsDomain) rows.append(.dnsDomain)
} }
@ -240,7 +240,7 @@ extension ServerNetworkViewController {
// shared rows // shared rows
switch row { switch row {
case .dnsDomain: 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") fatalError("Got DNS domain without a domain")
} }
cell.leftText = L10n.Core.NetworkSettings.Dns.Cells.Domain.caption cell.leftText = L10n.Core.NetworkSettings.Dns.Cells.Domain.caption

2
Podfile
View File

@ -9,7 +9,7 @@ $tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO']
def shared_pods def shared_pods
#pod_version $tunnelkit_name, $tunnelkit_specs, '~> 2.0.5' #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_path $tunnelkit_name, $tunnelkit_specs, '..'
pod 'SSZipArchive' pod 'SSZipArchive'

10
Podfile.lock
View File

@ -37,8 +37,8 @@ DEPENDENCIES:
- Convenience/Tables (from `https://github.com/keeshux/convenience`, commit `b990a8c`) - Convenience/Tables (from `https://github.com/keeshux/convenience`, commit `b990a8c`)
- MBProgressHUD - MBProgressHUD
- SSZipArchive - SSZipArchive
- TunnelKit/Extra/LZO (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 `4959442`) - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `4d930d3`)
SPEC REPOS: SPEC REPOS:
https://github.com/cocoapods/specs.git: https://github.com/cocoapods/specs.git:
@ -52,7 +52,7 @@ EXTERNAL SOURCES:
:commit: b990a8c :commit: b990a8c
:git: https://github.com/keeshux/convenience :git: https://github.com/keeshux/convenience
TunnelKit: TunnelKit:
:commit: '4959442' :commit: 4d930d3
:git: https://github.com/passepartoutvpn/tunnelkit :git: https://github.com/passepartoutvpn/tunnelkit
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
@ -60,7 +60,7 @@ CHECKOUT OPTIONS:
:commit: b990a8c :commit: b990a8c
:git: https://github.com/keeshux/convenience :git: https://github.com/keeshux/convenience
TunnelKit: TunnelKit:
:commit: '4959442' :commit: 4d930d3
:git: https://github.com/passepartoutvpn/tunnelkit :git: https://github.com/passepartoutvpn/tunnelkit
SPEC CHECKSUMS: SPEC CHECKSUMS:
@ -71,6 +71,6 @@ SPEC CHECKSUMS:
SwiftyBeaver: aaf2ebd7dac2e952991f46a82ed24ad642867ae2 SwiftyBeaver: aaf2ebd7dac2e952991f46a82ed24ad642867ae2
TunnelKit: 0743f0306be0869d51118ac33e274e7507a93537 TunnelKit: 0743f0306be0869d51118ac33e274e7507a93537
PODFILE CHECKSUM: a0028109a65292b76d72edb188291804eac46868 PODFILE CHECKSUM: f45a3fd3744e646a5513e3e25d447d1550c9fefa
COCOAPODS: 1.8.4 COCOAPODS: 1.8.4

2
Submodules/Core

@ -1 +1 @@
Subproject commit 2b4ae2d4f5034b44c60bd5ad79c092c094362c30 Subproject commit 4fb306195bbb71973adf4d03290952226c2b5dab