From 524f095904d9ecf5ce2b0c54fc522ddcf3067e59 Mon Sep 17 00:00:00 2001 From: Aliaksandr Dvoineu Date: Tue, 14 Mar 2023 23:32:15 +0300 Subject: [PATCH] removed unused comments and some styling --- Client.swift | 1 - FirewallController.swift | 1 - FirewallUtilities.swift | 53 ------------------- .../ContentBlockerRequestHandler.swift | 1 - .../FirewallTodayViewController.swift | 1 - Lockdown Tunnel/DNSCryptThread.swift | 1 - Lockdown Tunnel/PacketTunnelProvider.swift | 3 +- LockdownFirewallWidget/CombinedProvider.swift | 1 - LockdownFirewallWidget/LoadingCircle.swift | 1 - .../Account/EmailSignInViewController.swift | 1 - .../Account/EmailSignUpViewController.swift | 1 - .../ForgotPasswordViewController.swift | 1 - .../BlockListGroupViewController.swift | 1 - LockdowniOS/BlockLogCell.swift | 1 - LockdowniOS/HomeViewController.swift | 1 - LockdowniOS/Loader.swift | 1 - LockdowniOS/Mailto.swift | 1 - LockdowniOS/SetRegionCell.swift | 1 - LockdowniOS/SetRegionViewController.swift | 1 - LockdowniOS/StaticTableView.swift | 7 --- LockdowniOS/TitleViewController.swift | 1 - LockdowniOS/VPNController.swift | 1 - LockdowniOS/WebViewViewController.swift | 1 - LockdowniOS/WhatIsVpnViewController.swift | 1 - LockdowniOS/WhitelistAddCell.swift | 1 - LockdowniOS/WhitelistCell.swift | 1 - LockdowniOS/WhitelistViewController.swift | 1 - LockdowniOS/WhyTrustViewController.swift | 1 - PushNotifications.swift | 1 - PushNotificationsAuthorizationUI.swift | 1 - SpeedTest.swift | 1 - Today/VPNTodayViewController.swift | 1 - UserDefaults.swift | 1 - 33 files changed, 1 insertion(+), 92 deletions(-) diff --git a/Client.swift b/Client.swift index 64b328c..65af7af 100644 --- a/Client.swift +++ b/Client.swift @@ -391,5 +391,4 @@ class Client { throw "Invalid URL Response received" } } - } diff --git a/FirewallController.swift b/FirewallController.swift index 9eecf72..827b8b2 100644 --- a/FirewallController.swift +++ b/FirewallController.swift @@ -197,5 +197,4 @@ class FirewallController: NSObject { }) } } - } diff --git a/FirewallUtilities.swift b/FirewallUtilities.swift index 43d5204..9ffa5ee 100644 --- a/FirewallUtilities.swift +++ b/FirewallUtilities.swift @@ -423,56 +423,3 @@ func getLockdownBlockedDomains() -> LockdownDefaults { } return lockdownDefaults } - -// MARK: - Unused -// -//func getBlockedIPv4List(filename: String) -> Dictionary { -// var domains = [String : IPRange]() -// guard let path = Bundle.main.path(forResource: filename, ofType: "txt") else { -// return domains -// } -// do { -// let content = try String(contentsOfFile:path, encoding: String.Encoding.utf8) -// let lines = content.components(separatedBy: "\n") -// for line in lines { -// // CIDR -// if line.contains("/") { -// if let subnetBits = Int(line.split(separator: "/")[1]) { -// let d = String(line.split(separator: "/")[0]) -// let mask = 0xffffffff ^ ((1 << (32 - subnetBits)) - 1) -// let subnetMask = String.init(format: "%d.%d.%d.%d", (mask & 0x00ff000000) >> 24, (mask & 0x00ff0000) >> 16, (mask & 0x0000ff00) >> 8, (mask & 0xff)) -// -// domains[d] = IPRange.init(subnetMask: subnetMask, enabled: true, IPv6: false, subnetBits: subnetBits) -// } -// } -// // not CIDR, just feed the IP itself -// else { -// domains[line] = IPRange.init(subnetMask: "255.255.255.255", enabled: true, IPv6: false, subnetBits: 0) -// } -// } -// } catch _ as NSError { -// } -// return domains -//} -// -//func getBlockedIPv6List(filename: String) -> Dictionary { -// var domains = [String : IPRange]() -// guard let ipv6Path = Bundle.main.path(forResource: filename, ofType: "txt") else { -// return domains -// } -// do { -// let content = try String(contentsOfFile:ipv6Path, encoding: String.Encoding.utf8) -// let lines = content.components(separatedBy: "\n") -// for line in lines { -// if line.contains("/") { -// if let subnetBits = Int(line.split(separator: "/")[1]) { -// let d = String(line.split(separator: "/")[0]) -// let subnetMask = "\(subnetBits)" -// domains[d] = IPRange.init(subnetMask: subnetMask, enabled: true, IPv6: true, subnetBits: subnetBits) -// } -// } -// } -// } catch _ as NSError { -// } -// return domains -//} diff --git a/Lockdown Blocker/ContentBlockerRequestHandler.swift b/Lockdown Blocker/ContentBlockerRequestHandler.swift index 45143ba..6aa80dc 100644 --- a/Lockdown Blocker/ContentBlockerRequestHandler.swift +++ b/Lockdown Blocker/ContentBlockerRequestHandler.swift @@ -66,5 +66,4 @@ class ContentBlockerRequestHandler: NSObject, NSExtensionRequestHandling { context.completeRequest(returningItems: [item], completionHandler: nil) } - } diff --git a/Lockdown Firewall Today/FirewallTodayViewController.swift b/Lockdown Firewall Today/FirewallTodayViewController.swift index e48f51a..96ffcfb 100644 --- a/Lockdown Firewall Today/FirewallTodayViewController.swift +++ b/Lockdown Firewall Today/FirewallTodayViewController.swift @@ -193,5 +193,4 @@ class FirewallTodayViewController: UIViewController, NCWidgetProviding { @IBAction func openLockdown(sender: UIButton) { openApp() } - } diff --git a/Lockdown Tunnel/DNSCryptThread.swift b/Lockdown Tunnel/DNSCryptThread.swift index 83ae21d..b880b84 100644 --- a/Lockdown Tunnel/DNSCryptThread.swift +++ b/Lockdown Tunnel/DNSCryptThread.swift @@ -81,5 +81,4 @@ class DNSCryptThread: Thread, DnscryptproxyCloakCallbackProtocol { func logFatal(_ str: String) { _dnsApp.logFatal(str) } - } diff --git a/Lockdown Tunnel/PacketTunnelProvider.swift b/Lockdown Tunnel/PacketTunnelProvider.swift index cccb262..510bf4a 100644 --- a/Lockdown Tunnel/PacketTunnelProvider.swift +++ b/Lockdown Tunnel/PacketTunnelProvider.swift @@ -34,7 +34,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider { } override func cancelTunnelWithError(_ error: Error?) { - self.log("===== ERROR - cancelTunnelWithError \(error?.localizedDescription)") + self.log("===== ERROR - cancelTunnelWithError \(error?.localizedDescription ?? "")") } override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) { @@ -73,7 +73,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider { self.log("successfully stopped tunnel from reachability") }) } - } } } diff --git a/LockdownFirewallWidget/CombinedProvider.swift b/LockdownFirewallWidget/CombinedProvider.swift index c247b48..758d61e 100644 --- a/LockdownFirewallWidget/CombinedProvider.swift +++ b/LockdownFirewallWidget/CombinedProvider.swift @@ -76,6 +76,5 @@ struct CombinedProvider: let timeline = Timeline(entries: zippedEntries.map({ Entry.init(main: $0, supplemental: $1) }), policy: leftTimeline!.policy) completion(timeline) } - } } diff --git a/LockdownFirewallWidget/LoadingCircle.swift b/LockdownFirewallWidget/LoadingCircle.swift index 1a12851..3aa4c44 100644 --- a/LockdownFirewallWidget/LoadingCircle.swift +++ b/LockdownFirewallWidget/LoadingCircle.swift @@ -38,7 +38,6 @@ struct StatusLabel: View { .stroke(color, lineWidth: 4) ) } - } struct LoadingCircle: View { diff --git a/LockdowniOS/Account/EmailSignInViewController.swift b/LockdowniOS/Account/EmailSignInViewController.swift index 7285ab0..d07108e 100644 --- a/LockdowniOS/Account/EmailSignInViewController.swift +++ b/LockdowniOS/Account/EmailSignInViewController.swift @@ -102,5 +102,4 @@ class EmailSignInViewController: BaseViewController, UITextFieldDelegate, Loadab @IBAction func cancelTapped(_ sender: Any) { self.dismiss(animated: true, completion: nil) } - } diff --git a/LockdowniOS/Account/EmailSignUpViewController.swift b/LockdowniOS/Account/EmailSignUpViewController.swift index b9d2792..62094a3 100644 --- a/LockdowniOS/Account/EmailSignUpViewController.swift +++ b/LockdowniOS/Account/EmailSignUpViewController.swift @@ -169,5 +169,4 @@ class EmailSignUpViewController: BaseViewController, UITextFieldDelegate, Loadab @IBAction func cancelTapped(_ sender: Any) { self.dismiss(animated: true, completion: nil) } - } diff --git a/LockdowniOS/Account/ForgotPasswordViewController.swift b/LockdowniOS/Account/ForgotPasswordViewController.swift index 4cabc81..ef535f2 100644 --- a/LockdowniOS/Account/ForgotPasswordViewController.swift +++ b/LockdowniOS/Account/ForgotPasswordViewController.swift @@ -72,5 +72,4 @@ class ForgotPasswordViewController: BaseViewController, UITextFieldDelegate, Loa @IBAction func cancelTapped(_ sender: Any) { self.dismiss(animated: true, completion: nil) } - } diff --git a/LockdowniOS/BlockListGroupViewController.swift b/LockdowniOS/BlockListGroupViewController.swift index 2b5c6ea..f6b19f0 100644 --- a/LockdowniOS/BlockListGroupViewController.swift +++ b/LockdowniOS/BlockListGroupViewController.swift @@ -94,5 +94,4 @@ class BlockListGroupViewController: BaseViewController, UITableViewDelegate, UIT blockListVC?.reloadBlockLists() self.navigationController?.popViewController(animated: true) } - } diff --git a/LockdowniOS/BlockLogCell.swift b/LockdowniOS/BlockLogCell.swift index 6f5b0f6..01d1294 100644 --- a/LockdowniOS/BlockLogCell.swift +++ b/LockdowniOS/BlockLogCell.swift @@ -11,5 +11,4 @@ class BlockLogCell: UITableViewCell { @IBOutlet weak var logHost: UILabel? @IBOutlet weak var time: UILabel! - } diff --git a/LockdowniOS/HomeViewController.swift b/LockdowniOS/HomeViewController.swift index ab588fd..4d14db1 100644 --- a/LockdowniOS/HomeViewController.swift +++ b/LockdowniOS/HomeViewController.swift @@ -876,5 +876,4 @@ extension NEVPNStatus: CustomStringConvertible { return "disconnecting" } } - } diff --git a/LockdowniOS/Loader.swift b/LockdowniOS/Loader.swift index f4491d6..e51bfdb 100644 --- a/LockdowniOS/Loader.swift +++ b/LockdowniOS/Loader.swift @@ -66,5 +66,4 @@ extension Loadable where Self: UIViewController { } } } - } diff --git a/LockdowniOS/Mailto.swift b/LockdowniOS/Mailto.swift index 7795441..98eb21b 100644 --- a/LockdowniOS/Mailto.swift +++ b/LockdowniOS/Mailto.swift @@ -22,5 +22,4 @@ enum Mailto { return mailtoURL } - } diff --git a/LockdowniOS/SetRegionCell.swift b/LockdowniOS/SetRegionCell.swift index 151e14a..c079888 100644 --- a/LockdowniOS/SetRegionCell.swift +++ b/LockdowniOS/SetRegionCell.swift @@ -12,5 +12,4 @@ class SetRegionCell: UITableViewCell { @IBOutlet weak var regionFlag: UILabel! @IBOutlet weak var regionName: UILabel! @IBOutlet weak var regionSelected: UIButton! - } diff --git a/LockdowniOS/SetRegionViewController.swift b/LockdowniOS/SetRegionViewController.swift index 8878eee..17a009d 100644 --- a/LockdowniOS/SetRegionViewController.swift +++ b/LockdowniOS/SetRegionViewController.swift @@ -80,5 +80,4 @@ class SetRegionViewController: BaseViewController, UITableViewDataSource, UITabl return cell } - } diff --git a/LockdowniOS/StaticTableView.swift b/LockdowniOS/StaticTableView.swift index 4b6c5ba..987b21d 100644 --- a/LockdowniOS/StaticTableView.swift +++ b/LockdowniOS/StaticTableView.swift @@ -76,13 +76,6 @@ final class StaticTableView: UITableView { rows = [] } -// override func touchesShouldCancel(in view: UIView) -> Bool { -// if view is UIControl { -// return true -// } -// return super.touchesShouldCancel(in: view) -// } - @available(*, unavailable) required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") diff --git a/LockdowniOS/TitleViewController.swift b/LockdowniOS/TitleViewController.swift index 5fb9842..bd4c79b 100644 --- a/LockdowniOS/TitleViewController.swift +++ b/LockdowniOS/TitleViewController.swift @@ -78,5 +78,4 @@ class TitleViewController: BaseViewController { @IBAction func whyTrustTapped(_ sender: Any) { showWhyTrustPopup() } - } diff --git a/LockdowniOS/VPNController.swift b/LockdowniOS/VPNController.swift index 05614f1..2f59b6e 100644 --- a/LockdowniOS/VPNController.swift +++ b/LockdowniOS/VPNController.swift @@ -153,5 +153,4 @@ class VPNController: NSObject { }) }) } - } diff --git a/LockdowniOS/WebViewViewController.swift b/LockdowniOS/WebViewViewController.swift index 4cbf3ac..26100ff 100644 --- a/LockdowniOS/WebViewViewController.swift +++ b/LockdowniOS/WebViewViewController.swift @@ -44,5 +44,4 @@ class WebViewViewController: BaseViewController, WKNavigationDelegate { @IBAction func dismiss() { self.dismiss(animated: true, completion: nil) } - } diff --git a/LockdowniOS/WhatIsVpnViewController.swift b/LockdowniOS/WhatIsVpnViewController.swift index 0e75133..cc480b3 100644 --- a/LockdowniOS/WhatIsVpnViewController.swift +++ b/LockdowniOS/WhatIsVpnViewController.swift @@ -193,6 +193,5 @@ class WhatIsVpnViewController: BaseViewController, AwesomeSpotlightViewDelegate return bulletList } - } diff --git a/LockdowniOS/WhitelistAddCell.swift b/LockdowniOS/WhitelistAddCell.swift index 4daa25d..83f2ca8 100644 --- a/LockdowniOS/WhitelistAddCell.swift +++ b/LockdowniOS/WhitelistAddCell.swift @@ -20,5 +20,4 @@ class WhitelistAddCell: UITableViewCell { } @IBOutlet weak var addWhitelistDomain: UITextField! - } diff --git a/LockdowniOS/WhitelistCell.swift b/LockdowniOS/WhitelistCell.swift index 9f7a452..09343e6 100644 --- a/LockdowniOS/WhitelistCell.swift +++ b/LockdowniOS/WhitelistCell.swift @@ -11,5 +11,4 @@ class WhitelistCell: UITableViewCell { @IBOutlet weak var whitelistDomain: UILabel? @IBOutlet weak var whitelistStatus: UILabel? - } diff --git a/LockdowniOS/WhitelistViewController.swift b/LockdowniOS/WhitelistViewController.swift index e051a07..f6f1bba 100644 --- a/LockdowniOS/WhitelistViewController.swift +++ b/LockdowniOS/WhitelistViewController.swift @@ -235,5 +235,4 @@ class WhitelistViewController: BaseViewController, UITableViewDataSource, UITabl let addDomainRow = tableView.numberOfRows(inSection: 0) - 1 self.tableView.scrollToRow(at: IndexPath.init(row: addDomainRow, section: 0), at: .middle, animated: true) } - } diff --git a/LockdowniOS/WhyTrustViewController.swift b/LockdowniOS/WhyTrustViewController.swift index b3d45d7..4373be0 100644 --- a/LockdowniOS/WhyTrustViewController.swift +++ b/LockdowniOS/WhyTrustViewController.swift @@ -42,5 +42,4 @@ class WhyTrustViewController: BaseViewController, UIScrollViewDelegate { let pageIndex = round(scrollView.contentOffset.x/view.frame.width) pageControl.currentPage = Int(pageIndex) } - } diff --git a/PushNotifications.swift b/PushNotifications.swift index f6b5e51..0ca3ad1 100644 --- a/PushNotifications.swift +++ b/PushNotifications.swift @@ -324,5 +324,4 @@ extension PushNotifications { return false } } - } diff --git a/PushNotificationsAuthorizationUI.swift b/PushNotificationsAuthorizationUI.swift index c736956..b8cb09d 100644 --- a/PushNotificationsAuthorizationUI.swift +++ b/PushNotificationsAuthorizationUI.swift @@ -130,7 +130,6 @@ extension PushNotifications.Authorization { resolver.fulfill(.undetermined) } } - } } } diff --git a/SpeedTest.swift b/SpeedTest.swift index 419c785..267b0c7 100644 --- a/SpeedTest.swift +++ b/SpeedTest.swift @@ -70,5 +70,4 @@ public class SpeedTest: NSObject, URLSessionDelegate, URLSessionDataDelegate { throw "Invalid URL string: \(urlString)" } } - } diff --git a/Today/VPNTodayViewController.swift b/Today/VPNTodayViewController.swift index e83bb21..9b050be 100644 --- a/Today/VPNTodayViewController.swift +++ b/Today/VPNTodayViewController.swift @@ -118,5 +118,4 @@ class VPNTodayViewController: UIViewController, NCWidgetProviding { @IBAction func openLockdown(sender: UIButton) { openApp() } - } diff --git a/UserDefaults.swift b/UserDefaults.swift index 7a2e463..3985826 100644 --- a/UserDefaults.swift +++ b/UserDefaults.swift @@ -35,7 +35,6 @@ enum LatestKnowledge { defaults.setValue(newValue, forKey: kLatestKnowledgeIsVPNEnabled) } } - } func setUserWantsFirewallEnabled(_ enabled: Bool) {