ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 01:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix proxies by reverting the change that introduced schemes. (#4481)

Browse Source 
This partially reverts commit 863f28d476.
This commit is contained in:
Doug
2025-09-08 12:03:41 +01:00
committed by GitHub
parent ed61e6af32
commit f59928f4d5
1 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Extensions/URL.swift
+14 -41
View File
@@ -114,49 +114,22 @@ extension URL {
} }
MXLog.info("Found \(String(describing: proxies?.count)) proxies, using the first one.") MXLog.info("Found \(String(describing: proxies?.count)) proxies, using the first one.")
MXLog.info("Proxy type is \(proxyType)")
if proxyType == kCFProxyTypeAutoConfigurationURL as String {
MXLog.info("Found proxy auto configuration")
if let pacURL = firstProxy[kCFProxyAutoConfigurationURLKey] as? String { guard let host = firstProxy[kCFProxyHostNameKey] as? String else {
MXLog.info("Retrieved global PAC URL: \(pacURL)") MXLog.error("Found proxy with invalid host name")
return pacURL return nil
} else { }
MXLog.info("Failed retrieving PAC URL")
} let port = firstProxy[kCFProxyPortNumberKey] as? Int
} else {
MXLog.info("Proxy type found as \(proxyType)") MXLog.info("Found proxy host: \(host), port: \(String(describing: port))")
guard let host = firstProxy[kCFProxyHostNameKey] as? String else { if let port {
MXLog.error("Found proxy with invalid host name") return "\(host):\(port)"
return nil } else {
} return host
let port = firstProxy[kCFProxyPortNumberKey] as? Int
let scheme: String? = if proxyType == kCFProxyTypeHTTP as String {
"http"
} else if proxyType == kCFProxyTypeHTTPS as String {
"https"
} else if proxyType == kCFProxyTypeSOCKS as String {
"socks"
} else {
nil
}
var components = URLComponents()
components.scheme = scheme
components.host = host
components.port = port
MXLog.info("Found proxy components: \(String(describing: scheme)), \(host), \(String(describing: port))")
MXLog.info("Retrieved global proxy: \(String(describing: components.url))")
return components.url?.absoluteString
} }
return nil
} }
// MARK: Mocks // MARK: Mocks