Skip to content

Commit 66d28cd

Browse files
committed
use built-in constants for ProxyDict
1 parent bd9aa7e commit 66d28cd

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

ios/Classes/SwiftFlutterSystemProxyPlugin.swift

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,20 @@ public class SwiftFlutterSystemProxyPlugin: NSObject, FlutterPlugin {
4141
if(SwiftFlutterSystemProxyPlugin.proxyCache[url] != nil){
4242
return SwiftFlutterSystemProxyPlugin.proxyCache[url]
4343
}
44-
let proxConfigDict = CFNetworkCopySystemProxySettings()?.takeUnretainedValue() as NSDictionary?
45-
if(proxConfigDict != nil){
46-
if(proxConfigDict!["ProxyAutoConfigEnable"] as? Int == 1){
47-
let pacUrl = proxConfigDict!["ProxyAutoConfigURLString"] as? String
48-
let pacContent = proxConfigDict!["ProxyAutoConfigJavaScript"] as? String
44+
let proxConfigDict = CFNetworkCopySystemProxySettings()?.takeUnretainedValue() as NSDictionary?
45+
if proxConfigDict != nil {
46+
if(proxConfigDict?[kCFNetworkProxiesProxyAutoConfigEnable] as? Int == 1){
47+
let pacUrl = proxConfigDict?[kCFNetworkProxiesProxyAutoConfigURLString] as! String?
48+
let pacContent = proxConfigDict?[kCFNetworkProxiesProxyAutoConfigJavaScript] as! String?
4949
if(pacContent != nil){
50-
self.handlePacContent(pacContent: pacContent! as String, url: url)
50+
self.handlePacContent(pacContent: pacContent!, url: url)
5151
}else if(pacUrl != nil){
5252
self.handlePacUrl(pacUrl: pacUrl!,url: url)
5353
}
54-
} else if (proxConfigDict!["HTTPEnable"] as? Int == 1){
54+
} else if (proxConfigDict![kCFNetworkProxiesHTTPEnable] as! Int == 1){
5555
var dict: [String: Any] = [:]
56-
dict["host"] = proxConfigDict!["HTTPProxy"] as? String
57-
dict["port"] = proxConfigDict!["HTTPPort"] as? Int
58-
SwiftFlutterSystemProxyPlugin.proxyCache[url] = dict
59-
60-
} else if ( proxConfigDict!["HTTPSEnable"] as? Int == 1){
61-
var dict: [String: Any] = [:]
62-
dict["host"] = proxConfigDict!["HTTPSProxy"] as? String
63-
dict["port"] = proxConfigDict!["HTTPSPort"] as? Int
56+
dict["host"] = proxConfigDict![kCFNetworkProxiesHTTPProxy] as? String
57+
dict["port"] = proxConfigDict![kCFNetworkProxiesHTTPPort] as? Int
6458
SwiftFlutterSystemProxyPlugin.proxyCache[url] = dict
6559
}
6660
}

0 commit comments

Comments
 (0)