App: bump minimum OS versions

This allows us to remove a good deal of legacy cruft. Signed-off-by: Jason A. Donenfeld <[email protected]>
amnezia-vpn · Feb 15, 2023 · 901fe1c · 901fe1c
1 parent ccc7472
commit 901fe1c
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 159 deletions.
diff --git a/Package.swift b/Package.swift
@@ -6,8 +6,8 @@ import PackageDescription
 let package = Package(
     name: "WireGuardKit",
     platforms: [
-        .macOS(.v10_14),
-        .iOS(.v12)
+        .macOS(.v12),
+        .iOS(.v15)
     ],
     products: [
         .library(name: "WireGuardKit", targets: ["WireGuardKit"])

diff --git a/Sources/Shared/Model/NETunnelProviderProtocol+Extension.swift b/Sources/Shared/Model/NETunnelProviderProtocol+Extension.swift
@@ -82,24 +82,22 @@ extension NETunnelProviderProtocol {
             return true
         }
         #elseif os(iOS)
-        if #available(iOS 15, *) {
-            /* Update the stored reference from the old iOS 14 one to the canonical iOS 15 one.
-             * The iOS 14 ones are 96 bits, while the iOS 15 ones are 160 bits. We do this so
-             * that we can have fast set exclusion in deleteReferences safely. */
-            if passwordReference != nil && passwordReference!.count == 12 {
-                var result: CFTypeRef?
-                let ret = SecItemCopyMatching([kSecValuePersistentRef: passwordReference!,
-                                               kSecReturnPersistentRef: true] as CFDictionary,
-                                               &result)
-                if ret != errSecSuccess || result == nil {
-                    return false
-                }
-                guard let newReference = result as? Data else { return false }
-                if !newReference.elementsEqual(passwordReference!) {
-                    wg_log(.info, message: "Migrating iOS 14-style keychain reference to iOS 15-style keychain reference for '\(name)'")
-                    passwordReference = newReference
-                    return true
-                }
+        /* Update the stored reference from the old iOS 14 one to the canonical iOS 15 one.
+         * The iOS 14 ones are 96 bits, while the iOS 15 ones are 160 bits. We do this so
+         * that we can have fast set exclusion in deleteReferences safely. */
+        if passwordReference != nil && passwordReference!.count == 12 {
+            var result: CFTypeRef?
+            let ret = SecItemCopyMatching([kSecValuePersistentRef: passwordReference!,
+                                           kSecReturnPersistentRef: true] as CFDictionary,
+                                           &result)
+            if ret != errSecSuccess || result == nil {
+                return false
+            }
+            guard let newReference = result as? Data else { return false }
+            if !newReference.elementsEqual(passwordReference!) {
+                wg_log(.info, message: "Migrating iOS 14-style keychain reference to iOS 15-style keychain reference for '\(name)'")
+                passwordReference = newReference
+                return true
             }
         }
         #endif

diff --git a/Sources/WireGuardApp/UI/iOS/View/KeyValueCell.swift b/Sources/WireGuardApp/UI/iOS/View/KeyValueCell.swift
@@ -9,11 +9,7 @@ class KeyValueCell: UITableViewCell {
         let keyLabel = UILabel()
         keyLabel.font = UIFont.preferredFont(forTextStyle: .body)
         keyLabel.adjustsFontForContentSizeCategory = true
-        if #available(iOS 13.0, *) {
-            keyLabel.textColor = .label
-        } else {
-            keyLabel.textColor = .black
-        }
+        keyLabel.textColor = .label
         keyLabel.textAlignment = .left
         return keyLabel
     }()
@@ -35,11 +31,7 @@ class KeyValueCell: UITableViewCell {
         valueTextField.autocapitalizationType = .none
         valueTextField.autocorrectionType = .no
         valueTextField.spellCheckingType = .no
-        if #available(iOS 13.0, *) {
-            valueTextField.textColor = .secondaryLabel
-        } else {
-            valueTextField.textColor = .gray
-        }
+        valueTextField.textColor = .secondaryLabel
         return valueTextField
     }()
 
@@ -64,18 +56,10 @@ class KeyValueCell: UITableViewCell {
 
     var isValueValid = true {
         didSet {
-            if #available(iOS 13.0, *) {
-                if isValueValid {
-                    keyLabel.textColor = .label
-                } else {
-                    keyLabel.textColor = .systemRed
-                }
+            if isValueValid {
+                keyLabel.textColor = .label
             } else {
-                if isValueValid {
-                    keyLabel.textColor = .black
-                } else {
-                    keyLabel.textColor = .red
-                }
+                keyLabel.textColor = .systemRed
             }
         }
     }

diff --git a/Sources/WireGuardApp/UI/iOS/View/SwitchCell.swift b/Sources/WireGuardApp/UI/iOS/View/SwitchCell.swift
@@ -16,11 +16,7 @@ class SwitchCell: UITableViewCell {
         get { return switchView.isEnabled }
         set(value) {
             switchView.isEnabled = value
-            if #available(iOS 13.0, *) {
-                textLabel?.textColor = value ? .label : .secondaryLabel
-            } else {
-                textLabel?.textColor = value ? .black : .gray
-            }
+            textLabel?.textColor = value ? .label : .secondaryLabel
         }
     }
 

diff --git a/Sources/WireGuardApp/UI/iOS/View/TextCell.swift b/Sources/WireGuardApp/UI/iOS/View/TextCell.swift
@@ -28,11 +28,7 @@ class TextCell: UITableViewCell {
     override func prepareForReuse() {
         super.prepareForReuse()
         message = ""
-        if #available(iOS 13.0, *) {
-            setTextColor(.label)
-        } else {
-            setTextColor(.black)
-        }
+        setTextColor(.label)
         setTextAlignment(.left)
     }
 }
diff --git a/Sources/WireGuardApp/UI/iOS/View/TunnelEditKeyValueCell.swift b/Sources/WireGuardApp/UI/iOS/View/TunnelEditKeyValueCell.swift
@@ -30,11 +30,7 @@ class TunnelEditEditableKeyValueCell: TunnelEditKeyValueCell {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
         copyableGesture = false
-        if #available(iOS 13.0, *) {
-            valueTextField.textColor = .label
-        } else {
-            valueTextField.textColor = .black
-        }
+        valueTextField.textColor = .label
         valueTextField.isEnabled = true
         valueLabelScrollView.isScrollEnabled = false
         valueTextField.widthAnchor.constraint(equalTo: valueLabelScrollView.widthAnchor).isActive = true

diff --git a/Sources/WireGuardApp/UI/iOS/View/TunnelListCell.swift b/Sources/WireGuardApp/UI/iOS/View/TunnelListCell.swift
@@ -41,21 +41,13 @@ class TunnelListCell: UITableViewCell {
         label.font = UIFont.preferredFont(forTextStyle: .caption2)
         label.adjustsFontForContentSizeCategory = true
         label.numberOfLines = 1
-        if #available(iOS 13.0, *) {
-            label.textColor = .secondaryLabel
-        } else {
-            label.textColor = .gray
-        }
+        label.textColor = .secondaryLabel
         return label
     }()
 
     let busyIndicator: UIActivityIndicatorView = {
         let busyIndicator: UIActivityIndicatorView
-        if #available(iOS 13.0, *) {
-            busyIndicator = UIActivityIndicatorView(style: .medium)
-        } else {
-            busyIndicator = UIActivityIndicatorView(style: .gray)
-        }
+        busyIndicator = UIActivityIndicatorView(style: .medium)
         busyIndicator.hidesWhenStopped = true
         return busyIndicator
     }()

diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/LogViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/LogViewController.swift
@@ -15,15 +15,9 @@ class LogViewController: UIViewController {
     }()
 
     let busyIndicator: UIActivityIndicatorView = {
-        if #available(iOS 13.0, *) {
-            let busyIndicator = UIActivityIndicatorView(style: .medium)
-            busyIndicator.hidesWhenStopped = true
-            return busyIndicator
-        } else {
-            let busyIndicator = UIActivityIndicatorView(style: .gray)
-            busyIndicator.hidesWhenStopped = true
-            return busyIndicator
-        }
+        let busyIndicator = UIActivityIndicatorView(style: .medium)
+        busyIndicator.hidesWhenStopped = true
+        return busyIndicator
     }()
 
     let paragraphStyle: NSParagraphStyle = {
@@ -41,12 +35,7 @@ class LogViewController: UIViewController {
 
     override func loadView() {
         view = UIView()
-        if #available(iOS 13.0, *) {
-            view.backgroundColor = .systemBackground
-        } else {
-            view.backgroundColor = .white
-        }
-
+        view.backgroundColor = .systemBackground
         view.addSubview(textView)
         textView.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
@@ -92,15 +81,8 @@ class LogViewController: UIViewController {
             let bodyFont = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.body)
             let captionFont = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.caption1)
             for logEntry in fetchedLogEntries {
-                var bgColor: UIColor
-                var fgColor: UIColor
-                if #available(iOS 13.0, *) {
-                    bgColor = self.isNextLineHighlighted ? .systemGray3 : .systemBackground
-                    fgColor = .label
-                } else {
-                    bgColor = self.isNextLineHighlighted ? UIColor(white: 0.88, alpha: 1.0) : UIColor.white
-                    fgColor = .black
-                }
+                let bgColor: UIColor = self.isNextLineHighlighted ? .systemGray3 : .systemBackground
+                let fgColor: UIColor = .label
                 let timestampText = NSAttributedString(string: logEntry.timestamp + "\n", attributes: [.font: captionFont, .backgroundColor: bgColor, .foregroundColor: fgColor, .paragraphStyle: self.paragraphStyle])
                 let messageText = NSAttributedString(string: logEntry.message + "\n", attributes: [.font: bodyFont, .backgroundColor: bgColor, .foregroundColor: fgColor, .paragraphStyle: self.paragraphStyle])
                 richText.append(timestampText)

diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/MainViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/MainViewController.swift
@@ -11,11 +11,7 @@ class MainViewController: UISplitViewController {
 
     init() {
         let detailVC = UIViewController()
-        if #available(iOS 13.0, *) {
-            detailVC.view.backgroundColor = .systemBackground
-        } else {
-            detailVC.view.backgroundColor = .white
-        }
+        detailVC.view.backgroundColor = .systemBackground
         let detailNC = UINavigationController(rootViewController: detailVC)
 
         let masterVC = TunnelsListTableViewController()

diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/SSIDOptionEditTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/SSIDOptionEditTableViewController.swift
@@ -185,11 +185,7 @@ extension SSIDOptionEditTableViewController {
     private func noSSIDsCell(for tableView: UITableView, at indexPath: IndexPath) -> UITableViewCell {
         let cell: TextCell = tableView.dequeueReusableCell(for: indexPath)
         cell.message = tr("tunnelOnDemandNoSSIDs")
-        if #available(iOS 13.0, *) {
-            cell.setTextColor(.secondaryLabel)
-        } else {
-            cell.setTextColor(.gray)
-        }
+        cell.setTextColor(.secondaryLabel)
         cell.setTextAlignment(.center)
         return cell
     }
@@ -268,23 +264,8 @@ extension SSIDOptionEditTableViewController {
         #if targetEnvironment(simulator)
         completionHandler("Simulator Wi-Fi")
         #else
-        if #available(iOS 14, *) {
-            NEHotspotNetwork.fetchCurrent { hotspotNetwork in
-                completionHandler(hotspotNetwork?.ssid)
-            }
-        } else {
-            if let supportedInterfaces = CNCopySupportedInterfaces() as? [CFString] {
-                for interface in supportedInterfaces {
-                    if let networkInfo = CNCopyCurrentNetworkInfo(interface) {
-                        if let ssid = (networkInfo as NSDictionary)[kCNNetworkInfoKeySSID as String] as? String {
-                            completionHandler(!ssid.isEmpty ? ssid : nil)
-                            return
-                        }
-                    }
-                }
-            }
-
-            completionHandler(nil)
+        NEHotspotNetwork.fetchCurrent { hotspotNetwork in
+            completionHandler(hotspotNetwork?.ssid)
         }
         #endif
     }

diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift
@@ -33,11 +33,7 @@ class TunnelsListTableViewController: UIViewController {
 
     let busyIndicator: UIActivityIndicatorView = {
         let busyIndicator: UIActivityIndicatorView
-        if #available(iOS 13.0, *) {
-            busyIndicator = UIActivityIndicatorView(style: .medium)
-        } else {
-            busyIndicator = UIActivityIndicatorView(style: .gray)
-        }
+        busyIndicator = UIActivityIndicatorView(style: .medium)
         busyIndicator.hidesWhenStopped = true
         return busyIndicator
     }()
@@ -51,11 +47,7 @@ class TunnelsListTableViewController: UIViewController {
 
     override func loadView() {
         view = UIView()
-        if #available(iOS 13.0, *) {
-            view.backgroundColor = .systemBackground
-        } else {
-            view.backgroundColor = .white
-        }
+        view.backgroundColor = .systemBackground
 
         tableView.dataSource = self
         tableView.delegate = self
@@ -406,11 +398,7 @@ extension TunnelsListTableViewController: TunnelsManagerListDelegate {
                 (splitViewController.viewControllers[0] as? UINavigationController)?.popToRootViewController(animated: false)
             } else {
                 let detailVC = UIViewController()
-                if #available(iOS 13.0, *) {
-                    detailVC.view.backgroundColor = .systemBackground
-                } else {
-                    detailVC.view.backgroundColor = .white
-                }
+                detailVC.view.backgroundColor = .systemBackground
                 let detailNC = UINavigationController(rootViewController: detailVC)
                 splitViewController.showDetailViewController(detailNC, sender: self)
             }

diff --git a/Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m b/Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m
@@ -14,23 +14,19 @@ int main(int argc, char *argv[])
         return 2;
     uint64_t now = clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
     if (![[NSData dataWithBytes:&now length:sizeof(now)] writeToURL:[containerUrl URLByAppendingPathComponent:@"login-helper-timestamp.bin"] atomically:YES])
-        return 3;
-    if (@available(macOS 10.15, *)) {
-        NSCondition *condition = [[NSCondition alloc] init];
-        NSURL *appURL = [NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:appId];
-        if (!appURL)
-            return 4;
-        NSWorkspaceOpenConfiguration *openConfiguration = [NSWorkspaceOpenConfiguration configuration];
-        openConfiguration.activates = NO;
-        openConfiguration.addsToRecentItems = NO;
-        openConfiguration.hides = YES;
-        [NSWorkspace.sharedWorkspace openApplicationAtURL:appURL configuration:openConfiguration completionHandler:^(NSRunningApplication * _Nullable app, NSError * _Nullable error) {
-            [condition signal];
-        }];
-        [condition wait];
-    } else {
-        [NSWorkspace.sharedWorkspace launchAppWithBundleIdentifier:appId options:NSWorkspaceLaunchWithoutActivation
-                                    additionalEventParamDescriptor:NULL launchIdentifier:NULL];
-    }
+    return 3;
+
+    NSCondition *condition = [[NSCondition alloc] init];
+    NSURL *appURL = [NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:appId];
+    if (!appURL)
+       return 4;
+    NSWorkspaceOpenConfiguration *openConfiguration = [NSWorkspaceOpenConfiguration configuration];
+    openConfiguration.activates = NO;
+    openConfiguration.addsToRecentItems = NO;
+    openConfiguration.hides = YES;
+    [NSWorkspace.sharedWorkspace openApplicationAtURL:appURL configuration:openConfiguration completionHandler:^(NSRunningApplication * _Nullable app, NSError * _Nullable error) {
+        [condition signal];
+    }];
+    [condition wait];
     return 0;
 }