Fix missing DNS servers fields in DoH

Also fix servers list not saved in DoH/DoT in general.

Fixes #171
This commit is contained in:
Davide De Rosa 2021-02-11 17:39:07 +01:00
parent 95c84a0386
commit 551e57dcd7
4 changed files with 15 additions and 11 deletions

View File

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Fixed
- No way to set DNS servers when using DNS over HTTPS. [#171](https://github.com/passepartoutvpn/passepartout-apple/issues/171)
## 1.15.0 (2021-02-09) ## 1.15.0 (2021-02-09)
### Added ### Added

View File

@ -79,13 +79,7 @@ class NetworkSettingsViewController: UITableViewController {
} }
if networkChoices.dns != .server { if networkChoices.dns != .server {
sections.append(.manualDNSProtocol) sections.append(.manualDNSProtocol)
switch networkSettings.dnsProtocol {
case .https:
break
default:
sections.append(.manualDNSServers) sections.append(.manualDNSServers)
}
sections.append(.manualDNSDomains) sections.append(.manualDNSDomains)
} }
if networkChoices.proxy != .server { if networkChoices.proxy != .server {

View File

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Fixed
- No way to set DNS servers when using DNS over HTTPS. [#171](https://github.com/passepartoutvpn/passepartout-apple/issues/171)
## 1.15.0 (2021-02-09) ## 1.15.0 (2021-02-09)
### Added ### Added

View File

@ -162,8 +162,9 @@ class DNSViewController: NSViewController, ProfileCustomization {
networkSettings.dnsTLSServerName = textDNSCustom.stringValue networkSettings.dnsTLSServerName = textDNSCustom.stringValue
default: default:
networkSettings.dnsServers = tableDNSAddresses.rows break
} }
networkSettings.dnsServers = tableDNSAddresses.rows
networkSettings.dnsSearchDomains = tableDNSDomains.rows networkSettings.dnsSearchDomains = tableDNSDomains.rows
delegate?.profileCustomization(self, didUpdateDNS: .manual, withManualSettings: networkSettings) delegate?.profileCustomization(self, didUpdateDNS: .manual, withManualSettings: networkSettings)
@ -209,17 +210,14 @@ class DNSViewController: NSViewController, ProfileCustomization {
textDNSCustom.placeholderString = isManual ? AppConstants.Placeholders.dohURL : "" textDNSCustom.placeholderString = isManual ? AppConstants.Placeholders.dohURL : ""
textDNSCustom.stringValue = networkSettings.dnsHTTPSURL?.absoluteString ?? "" textDNSCustom.stringValue = networkSettings.dnsHTTPSURL?.absoluteString ?? ""
textDNSCustom.isHidden = false textDNSCustom.isHidden = false
viewDNSAddresses.isHidden = true
case .tls: case .tls:
textDNSCustom.placeholderString = isManual ? AppConstants.Placeholders.dotServerName : "" textDNSCustom.placeholderString = isManual ? AppConstants.Placeholders.dotServerName : ""
textDNSCustom.stringValue = networkSettings.dnsTLSServerName ?? "" textDNSCustom.stringValue = networkSettings.dnsTLSServerName ?? ""
textDNSCustom.isHidden = false textDNSCustom.isHidden = false
viewDNSAddresses.isHidden = false
default: default:
textDNSCustom.isHidden = true textDNSCustom.isHidden = true
viewDNSAddresses.isHidden = false
} }
} }
} }