]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
Global: swiftlint autocorrect --format
authorRoopesh Chander <roop@roopc.net>
Tue, 6 Nov 2018 17:12:53 +0000 (22:42 +0530)
committerRoopesh Chander <roop@roopc.net>
Tue, 6 Nov 2018 17:12:53 +0000 (22:42 +0530)
Signed-off-by: Roopesh Chander <roop@roopc.net>
WireGuard/WireGuard/Model/IPAddressRange.swift
WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
WireGuard/WireGuard/VPN/TunnelsManager.swift

index 1e181d7a9ca37f8414d77cf4b0da4c35a0ac65f7..2fb4a16de67bbe6ef783a33c4c4f7379d98e4f30 100644 (file)
@@ -19,7 +19,7 @@ extension IPAddressRange {
         let addressString = String(string[string.startIndex ..< endOfIPAddress])
         let address: IPAddress
         if let addr = IPv4Address(addressString) {
-           address = addr
+            address = addr
         } else if let addr = IPv6Address(addressString) {
             address = addr
         } else {
index 9120f3810ac8f60489107454510cdad5fa625a08..9bd9f5abc72f9868e58ef837ba0937dd6c9d971c 100644 (file)
@@ -9,7 +9,7 @@ class TunnelDetailTableViewController: UITableViewController {
 
     let interfaceFields: [TunnelViewModel.InterfaceField] = [
         .name, .publicKey, .addresses,
-       .listenPort, .mtu, .dns
+        .listenPort, .mtu, .dns
     ]
 
     let peerFields: [TunnelViewModel.PeerField] = [
@@ -125,7 +125,7 @@ extension TunnelDetailTableViewController {
             return "Status"
         } else if (section == 1) {
             // Interface
-           return "Interface"
+            return "Interface"
         } else if ((numberOfPeerSections > 0) && (section < (2 + numberOfPeerSections))) {
             // Peer
             return "Peer"
index 2f2b6063d6a22a1ae29053436ea9c06a701a3c14..40d86e9b1e4105d97c5ae3e4966ea039d0579238 100644 (file)
@@ -449,9 +449,9 @@ class TunnelEditTableViewKeyValueCell: UITableViewCell {
         keyLabel.translatesAutoresizingMaskIntoConstraints = false
         keyLabel.textAlignment = .right
         let widthRatioConstraint = NSLayoutConstraint(item: keyLabel, attribute: .width,
-                                                  relatedBy: .equal,
-                                                  toItem: self, attribute: .width,
-                                                  multiplier: 0.4, constant: 0)
+                                                      relatedBy: .equal,
+                                                      toItem: self, attribute: .width,
+                                                      multiplier: 0.4, constant: 0)
         // 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.
         widthRatioConstraint.priority = .defaultHigh + 1
index bd067c89dc3d358d2adc400b690dab6cdbb30ee8..b6c25aeb7a25f318d237e22c9f659dd0b1353bc9 100644 (file)
@@ -256,7 +256,7 @@ extension TunnelsListTableViewController: UIDocumentPickerDelegate {
             } else {
                 // What if a file provider extension didn't respect our 'documentTypes' parameter
                 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 {
     func addScannedQRCode(tunnelConfiguration: TunnelConfiguration, qrScanViewController: QRScanViewController,
-                       completionHandler: (() -> Void)?) {
+                          completionHandler: (() -> Void)?) {
         tunnelsManager?.add(tunnelConfiguration: tunnelConfiguration) { (_, error) in
             if let error = error {
                 ErrorPresenter.showErrorAlert(error: error, from: qrScanViewController, onDismissal: completionHandler)
@@ -330,7 +330,7 @@ extension TunnelsListTableViewController: UITableViewDelegate {
     }
 
     func tableView(_ tableView: UITableView,
-                            trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
+                   trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
         let deleteAction = UIContextualAction(style: .destructive, title: "Delete", handler: { [weak self] (_, _, completionHandler) in
             guard let tunnelsManager = self?.tunnelsManager else { return }
             let tunnel = tunnelsManager.tunnel(at: indexPath.row)
index d0c0dc18bc4a1b864e3d7a6565c6c721198dfd6a..d0fe33783641a16e71f87c2d0dd8ecbc31791def 100644 (file)
@@ -289,8 +289,8 @@ class TunnelContainer: NSObject {
                     return
                 }
                 s.startActivation(tunnelConfiguration: tunnelConfiguration,
-                                resolvedEndpoints: resolvedEndpoints,
-                                completionHandler: completionHandler)
+                                  resolvedEndpoints: resolvedEndpoints,
+                                  completionHandler: completionHandler)
             }
         }
     }
@@ -356,10 +356,10 @@ class TunnelContainer: NSObject {
                 return
             }
             guard (vpnError.code == NEVPNError.configurationInvalid || vpnError.code == NEVPNError.configurationStale) else {
-                    os_log("Failed to activate tunnel: %{public}@", log: OSLog.default, type: .debug, "\(error)")
-                    status = .inactive
-                    completionHandler(error)
-                    return
+                os_log("Failed to activate tunnel: %{public}@", log: OSLog.default, type: .debug, "\(error)")
+                status = .inactive
+                completionHandler(error)
+                return
             }
             assert(vpnError.code == NEVPNError.configurationInvalid || vpnError.code == NEVPNError.configurationStale)
             os_log("startActivation: Error says: %{public}@", log: OSLog.default, type: .debug,