diff --git a/Passepartout/App/iOS/Views/NetworkSettingsView.swift b/Passepartout/App/iOS/Views/NetworkSettingsView.swift index e83baa47..e0367d43 100644 --- a/Passepartout/App/iOS/Views/NetworkSettingsView.swift +++ b/Passepartout/App/iOS/Views/NetworkSettingsView.swift @@ -242,7 +242,7 @@ extension NetworkSettingsView { } } } - if !settings.isAutomaticProxy && settings.proxy.configurationType != .disabled { + if !settings.isAutomaticProxy && settings.proxy.configurationType == .manual { proxyManualBypassDomains } } diff --git a/PassepartoutCore/Sources/PassepartoutProfiles/DataModels/Network.swift b/PassepartoutCore/Sources/PassepartoutProfiles/DataModels/Network.swift index ce491416..fab924e4 100644 --- a/PassepartoutCore/Sources/PassepartoutProfiles/DataModels/Network.swift +++ b/PassepartoutCore/Sources/PassepartoutProfiles/DataModels/Network.swift @@ -122,10 +122,10 @@ extension Network { public var proxyPort: UInt16? - public var proxyAutoConfigurationURL: URL? - public var proxyBypassDomains: [String] = [] + public var proxyAutoConfigurationURL: URL? + public var proxyServer: Proxy? { guard let address = proxyAddress, let port = proxyPort, !address.isEmpty, port > 0 else { return nil