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

Global: swiftlint autocorrect --format

This commit is contained in:
Roopesh Chander 2018-11-06 22:42:53 +05:30
parent fe191b1eff
commit cc57d8443e
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WireGuard/WireGuard/Model/IPAddressRange.swift
View File

@ -19,7 +19,7 @@ extension IPAddressRange {
let addressString = String(string[string.startIndex ..< endOfIPAddress]) let addressString = String(string[string.startIndex ..< endOfIPAddress])
let address: IPAddress let address: IPAddress
if let addr = IPv4Address(addressString) { if let addr = IPv4Address(addressString) {
address = addr address = addr
} else if let addr = IPv6Address(addressString) { } else if let addr = IPv6Address(addressString) {
address = addr address = addr
} else { } else {

4
WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
View File

@ -9,7 +9,7 @@ class TunnelDetailTableViewController: UITableViewController {
let interfaceFields: [TunnelViewModel.InterfaceField] = [ let interfaceFields: [TunnelViewModel.InterfaceField] = [
.name, .publicKey, .addresses, .name, .publicKey, .addresses,
.listenPort, .mtu, .dns .listenPort, .mtu, .dns
] ]
let peerFields: [TunnelViewModel.PeerField] = [ let peerFields: [TunnelViewModel.PeerField] = [
@ -125,7 +125,7 @@ extension TunnelDetailTableViewController {
return "Status" return "Status"
} else if (section == 1) { } else if (section == 1) {
// Interface // Interface
return "Interface" return "Interface"
} else if ((numberOfPeerSections > 0) && (section < (2 + numberOfPeerSections))) { } else if ((numberOfPeerSections > 0) && (section < (2 + numberOfPeerSections))) {
// Peer // Peer
return "Peer" return "Peer"

6
WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
View File

@ -449,9 +449,9 @@ class TunnelEditTableViewKeyValueCell: UITableViewCell {
keyLabel.translatesAutoresizingMaskIntoConstraints = false keyLabel.translatesAutoresizingMaskIntoConstraints = false
keyLabel.textAlignment = .right keyLabel.textAlignment = .right
let widthRatioConstraint = NSLayoutConstraint(item: keyLabel, attribute: .width, let widthRatioConstraint = NSLayoutConstraint(item: keyLabel, attribute: .width,
relatedBy: .equal, relatedBy: .equal,
toItem: self, attribute: .width, toItem: self, attribute: .width,
multiplier: 0.4, constant: 0) multiplier: 0.4, constant: 0)
// The "Persistent Keepalive" key doesn't fit into 0.4 * width on the iPhone SE, // The "Persistent Keepalive" key doesn't fit into 0.4 * width on the iPhone SE,
// so set a CR priority > the 0.4-constraint's priority. // so set a CR priority > the 0.4-constraint's priority.
widthRatioConstraint.priority = .defaultHigh + 1 widthRatioConstraint.priority = .defaultHigh + 1

6
WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
View File

@ -256,7 +256,7 @@ extension TunnelsListTableViewController: UIDocumentPickerDelegate {
} else { } else {
// What if a file provider extension didn't respect our 'documentTypes' parameter // What if a file provider extension didn't respect our 'documentTypes' parameter
self.showErrorAlert(title: "Invalid file extension", self.showErrorAlert(title: "Invalid file extension",
message: "Please select a WireGuard configuration file (.conf) or a zip archive (.zip) for importing") message: "Please select a WireGuard configuration file (.conf) or a zip archive (.zip) for importing")
} }
} }
} }
@ -266,7 +266,7 @@ extension TunnelsListTableViewController: UIDocumentPickerDelegate {
extension TunnelsListTableViewController: QRScanViewControllerDelegate { extension TunnelsListTableViewController: QRScanViewControllerDelegate {
func addScannedQRCode(tunnelConfiguration: TunnelConfiguration, qrScanViewController: QRScanViewController, func addScannedQRCode(tunnelConfiguration: TunnelConfiguration, qrScanViewController: QRScanViewController,
completionHandler: (() -> Void)?) { completionHandler: (() -> Void)?) {
tunnelsManager?.add(tunnelConfiguration: tunnelConfiguration) { (_, error) in tunnelsManager?.add(tunnelConfiguration: tunnelConfiguration) { (_, error) in
if let error = error { if let error = error {
ErrorPresenter.showErrorAlert(error: error, from: qrScanViewController, onDismissal: completionHandler) ErrorPresenter.showErrorAlert(error: error, from: qrScanViewController, onDismissal: completionHandler)
@ -330,7 +330,7 @@ extension TunnelsListTableViewController: UITableViewDelegate {
} }
func tableView(_ tableView: UITableView, func tableView(_ tableView: UITableView,
trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? { trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
let deleteAction = UIContextualAction(style: .destructive, title: "Delete", handler: { [weak self] (_, _, completionHandler) in let deleteAction = UIContextualAction(style: .destructive, title: "Delete", handler: { [weak self] (_, _, completionHandler) in
guard let tunnelsManager = self?.tunnelsManager else { return } guard let tunnelsManager = self?.tunnelsManager else { return }
let tunnel = tunnelsManager.tunnel(at: indexPath.row) let tunnel = tunnelsManager.tunnel(at: indexPath.row)

12
WireGuard/WireGuard/VPN/TunnelsManager.swift
View File

@ -289,8 +289,8 @@ class TunnelContainer: NSObject {
return return
} }
s.startActivation(tunnelConfiguration: tunnelConfiguration, s.startActivation(tunnelConfiguration: tunnelConfiguration,
resolvedEndpoints: resolvedEndpoints, resolvedEndpoints: resolvedEndpoints,
completionHandler: completionHandler) completionHandler: completionHandler)
} }
} }
} }
@ -356,10 +356,10 @@ class TunnelContainer: NSObject {
return return
} }
guard (vpnError.code == NEVPNError.configurationInvalid || vpnError.code == NEVPNError.configurationStale) else { guard (vpnError.code == NEVPNError.configurationInvalid || vpnError.code == NEVPNError.configurationStale) else {
os_log("Failed to activate tunnel: %{public}@", log: OSLog.default, type: .debug, "\(error)") os_log("Failed to activate tunnel: %{public}@", log: OSLog.default, type: .debug, "\(error)")
status = .inactive status = .inactive
completionHandler(error) completionHandler(error)
return return
} }
assert(vpnError.code == NEVPNError.configurationInvalid || vpnError.code == NEVPNError.configurationStale) assert(vpnError.code == NEVPNError.configurationInvalid || vpnError.code == NEVPNError.configurationStale)
os_log("startActivation: Error says: %{public}@", log: OSLog.default, type: .debug, os_log("startActivation: Error says: %{public}@", log: OSLog.default, type: .debug,