ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into an/shortcuts-integration

Browse Source
This commit is contained in:
Alessio Nossa
2024-02-28 10:28:12 +01:00
parent 2f99f5c781 2fec12a6e1
commit a37ae8a99b
132 changed files with 898 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
COPYING
+1 -1
View File
@@ -1,4 +1,4 @@
Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
Package.swift
+2 -2
View File
@@ -6,8 +6,8 @@ import PackageDescription
let package = Package( let package = Package(
name: "WireGuardKit", name: "WireGuardKit",
platforms: [ platforms: [
.macOS(.v10_14), .macOS(.v12),
.iOS(.v12) .iOS(.v15)
], ],
products: [ products: [
.library(name: "WireGuardKit", targets: ["WireGuardKit"]) .library(name: "WireGuardKit", targets: ["WireGuardKit"])
README.md
+1 -1
View File
@@ -18,7 +18,7 @@ $ cp Sources/WireGuardApp/Config/Developer.xcconfig.template Sources/WireGuardAp
$ vim Sources/WireGuardApp/Config/Developer.xcconfig $ vim Sources/WireGuardApp/Config/Developer.xcconfig
``` ```
- Install swiftlint and go 1.15: - Install swiftlint and go 1.19:
``` ```
$ brew install swiftlint go $ brew install swiftlint go
Sources/Shared/FileManager+Extension.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
import os.log import os.log
Sources/Shared/Keychain.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
import Security import Security
Sources/Shared/Logging/Logger.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
import os.log import os.log
Sources/Shared/Logging/ringlogger.c
+1 -1
View File
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: MIT /* SPDX-License-Identifier: MIT
* *
* Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. * Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
*/ */
#include <string.h> #include <string.h>
Sources/Shared/Logging/ringlogger.h
+1 -1
View File
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: MIT /* SPDX-License-Identifier: MIT
* *
* Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. * Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
*/ */
#ifndef RINGLOGGER_H #ifndef RINGLOGGER_H
Sources/Shared/Model/NETunnelProviderProtocol+Extension.swift
+17 -19
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import NetworkExtension import NetworkExtension
@@ -82,24 +82,22 @@ extension NETunnelProviderProtocol {
return true return true
} }
#elseif os(iOS) #elseif os(iOS)
if #available(iOS 15, *) { /* Update the stored reference from the old iOS 14 one to the canonical iOS 15 one.
/* 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
* 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. */
* that we can have fast set exclusion in deleteReferences safely. */ if passwordReference != nil && passwordReference!.count == 12 {
if passwordReference != nil && passwordReference!.count == 12 { var result: CFTypeRef?
var result: CFTypeRef? let ret = SecItemCopyMatching([kSecValuePersistentRef: passwordReference!,
let ret = SecItemCopyMatching([kSecValuePersistentRef: passwordReference!, kSecReturnPersistentRef: true] as CFDictionary,
kSecReturnPersistentRef: true] as CFDictionary, &result)
&result) if ret != errSecSuccess || result == nil {
if ret != errSecSuccess || result == nil { return false
return false }
} guard let newReference = result as? Data else { return false }
guard let newReference = result as? Data else { return false } if !newReference.elementsEqual(passwordReference!) {
if !newReference.elementsEqual(passwordReference!) { wg_log(.info, message: "Migrating iOS 14-style keychain reference to iOS 15-style keychain reference for '\(name)'")
wg_log(.info, message: "Migrating iOS 14-style keychain reference to iOS 15-style keychain reference for '\(name)'") passwordReference = newReference
passwordReference = newReference return true
return true
}
} }
} }
#endif #endif
Sources/Shared/Model/String+ArrayConversion.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/Shared/Model/TunnelConfiguration+WgQuickConfig.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/Shared/NotificationToken.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/Base.lproj/InfoPlist.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// iOS permission prompts // iOS permission prompts
Sources/WireGuardApp/Base.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names
Sources/WireGuardApp/Config/Version.xcconfig
+2 -2
View File
@@ -1,2 +1,2 @@
VERSION_NAME = 1.0.15 VERSION_NAME = 1.0.16
VERSION_ID = 26 VERSION_ID = 27
Sources/WireGuardApp/LocalizationHelper.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/Tunnel/ActivateOnDemandOption.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import NetworkExtension import NetworkExtension
Sources/WireGuardApp/Tunnel/MockTunnels.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import NetworkExtension import NetworkExtension
Sources/WireGuardApp/Tunnel/TunnelConfiguration+UapiConfig.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/Tunnel/TunnelErrors.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import NetworkExtension import NetworkExtension
Sources/WireGuardApp/Tunnel/TunnelStatus.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
import NetworkExtension import NetworkExtension
Sources/WireGuardApp/Tunnel/TunnelsManager.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
import NetworkExtension import NetworkExtension
Sources/WireGuardApp/UI/ActivateOnDemandViewModel.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/UI/ErrorPresenterProtocol.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
protocol ErrorPresenterProtocol { protocol ErrorPresenterProtocol {
static func showErrorAlert(title: String, message: String, from sourceVC: AnyObject?, onPresented: (() -> Void)?, onDismissal: (() -> Void)?) static func showErrorAlert(title: String, message: String, from sourceVC: AnyObject?, onPresented: (() -> Void)?, onDismissal: (() -> Void)?)
Sources/WireGuardApp/UI/LogViewHelper.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/UI/PrivateDataConfirmation.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
import LocalAuthentication import LocalAuthentication
Sources/WireGuardApp/UI/TunnelImporter.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/UI/TunnelViewModel.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/UI/iOS/AppDelegate.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
import os.log import os.log
Sources/WireGuardApp/UI/iOS/ConfirmationAlertPresenter.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/ErrorPresenter.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
import os.log import os.log
Sources/WireGuardApp/UI/iOS/QuickActionItem.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/RecentTunnelsTracker.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/UI/iOS/UITableViewCell+Reuse.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/View/BorderedTextButton.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/View/ButtonCell.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/View/CheckmarkCell.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/View/ChevronCell.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/View/EditableTextCell.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/View/KeyValueCell.swift
+6 -22
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
@@ -9,11 +9,7 @@ class KeyValueCell: UITableViewCell {
let keyLabel = UILabel() let keyLabel = UILabel()
keyLabel.font = UIFont.preferredFont(forTextStyle: .body) keyLabel.font = UIFont.preferredFont(forTextStyle: .body)
keyLabel.adjustsFontForContentSizeCategory = true keyLabel.adjustsFontForContentSizeCategory = true
if #available(iOS 13.0, *) { keyLabel.textColor = .label
keyLabel.textColor = .label
} else {
keyLabel.textColor = .black
}
keyLabel.textAlignment = .left keyLabel.textAlignment = .left
return keyLabel return keyLabel
}() }()
@@ -35,11 +31,7 @@ class KeyValueCell: UITableViewCell {
valueTextField.autocapitalizationType = .none valueTextField.autocapitalizationType = .none
valueTextField.autocorrectionType = .no valueTextField.autocorrectionType = .no
valueTextField.spellCheckingType = .no valueTextField.spellCheckingType = .no
if #available(iOS 13.0, *) { valueTextField.textColor = .secondaryLabel
valueTextField.textColor = .secondaryLabel
} else {
valueTextField.textColor = .gray
}
return valueTextField return valueTextField
}() }()
@@ -64,18 +56,10 @@ class KeyValueCell: UITableViewCell {
var isValueValid = true { var isValueValid = true {
didSet { didSet {
if #available(iOS 13.0, *) { if isValueValid {
if isValueValid { keyLabel.textColor = .label
keyLabel.textColor = .label
} else {
keyLabel.textColor = .systemRed
}
} else { } else {
if isValueValid { keyLabel.textColor = .systemRed
keyLabel.textColor = .black
} else {
keyLabel.textColor = .red
}
} }
} }
} }
Sources/WireGuardApp/UI/iOS/View/SwitchCell.swift
+2 -6
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
@@ -16,11 +16,7 @@ class SwitchCell: UITableViewCell {
get { return switchView.isEnabled } get { return switchView.isEnabled }
set(value) { set(value) {
switchView.isEnabled = value switchView.isEnabled = value
if #available(iOS 13.0, *) { textLabel?.textColor = value ? .label : .secondaryLabel
textLabel?.textColor = value ? .label : .secondaryLabel
} else {
textLabel?.textColor = value ? .black : .gray
}
} }
} }
Sources/WireGuardApp/UI/iOS/View/TextCell.swift
+2 -6
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
@@ -28,11 +28,7 @@ class TextCell: UITableViewCell {
override func prepareForReuse() { override func prepareForReuse() {
super.prepareForReuse() super.prepareForReuse()
message = "" message = ""
if #available(iOS 13.0, *) { setTextColor(.label)
setTextColor(.label)
} else {
setTextColor(.black)
}
setTextAlignment(.left) setTextAlignment(.left)
} }
} }
Sources/WireGuardApp/UI/iOS/View/TunnelEditKeyValueCell.swift
+2 -6
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
@@ -30,11 +30,7 @@ class TunnelEditEditableKeyValueCell: TunnelEditKeyValueCell {
super.init(style: style, reuseIdentifier: reuseIdentifier) super.init(style: style, reuseIdentifier: reuseIdentifier)
copyableGesture = false copyableGesture = false
if #available(iOS 13.0, *) { valueTextField.textColor = .label
valueTextField.textColor = .label
} else {
valueTextField.textColor = .black
}
valueTextField.isEnabled = true valueTextField.isEnabled = true
valueLabelScrollView.isScrollEnabled = false valueLabelScrollView.isScrollEnabled = false
valueTextField.widthAnchor.constraint(equalTo: valueLabelScrollView.widthAnchor).isActive = true valueTextField.widthAnchor.constraint(equalTo: valueLabelScrollView.widthAnchor).isActive = true
Sources/WireGuardApp/UI/iOS/View/TunnelListCell.swift
+3 -11
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
@@ -41,21 +41,13 @@ class TunnelListCell: UITableViewCell {
label.font = UIFont.preferredFont(forTextStyle: .caption2) label.font = UIFont.preferredFont(forTextStyle: .caption2)
label.adjustsFontForContentSizeCategory = true label.adjustsFontForContentSizeCategory = true
label.numberOfLines = 1 label.numberOfLines = 1
if #available(iOS 13.0, *) { label.textColor = .secondaryLabel
label.textColor = .secondaryLabel
} else {
label.textColor = .gray
}
return label return label
}() }()
let busyIndicator: UIActivityIndicatorView = { let busyIndicator: UIActivityIndicatorView = {
let busyIndicator: UIActivityIndicatorView let busyIndicator: UIActivityIndicatorView
if #available(iOS 13.0, *) { busyIndicator = UIActivityIndicatorView(style: .medium)
busyIndicator = UIActivityIndicatorView(style: .medium)
} else {
busyIndicator = UIActivityIndicatorView(style: .gray)
}
busyIndicator.hidesWhenStopped = true busyIndicator.hidesWhenStopped = true
return busyIndicator return busyIndicator
}() }()
Sources/WireGuardApp/UI/iOS/ViewController/LogViewController.swift
+7 -25
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
@@ -15,15 +15,9 @@ class LogViewController: UIViewController {
}() }()
let busyIndicator: UIActivityIndicatorView = { let busyIndicator: UIActivityIndicatorView = {
if #available(iOS 13.0, *) { let busyIndicator = UIActivityIndicatorView(style: .medium)
let busyIndicator = UIActivityIndicatorView(style: .medium) busyIndicator.hidesWhenStopped = true
busyIndicator.hidesWhenStopped = true return busyIndicator
return busyIndicator
} else {
let busyIndicator = UIActivityIndicatorView(style: .gray)
busyIndicator.hidesWhenStopped = true
return busyIndicator
}
}() }()
let paragraphStyle: NSParagraphStyle = { let paragraphStyle: NSParagraphStyle = {
@@ -41,12 +35,7 @@ class LogViewController: UIViewController {
override func loadView() { override func loadView() {
view = UIView() view = UIView()
if #available(iOS 13.0, *) { view.backgroundColor = .systemBackground
view.backgroundColor = .systemBackground
} else {
view.backgroundColor = .white
}
view.addSubview(textView) view.addSubview(textView)
textView.translatesAutoresizingMaskIntoConstraints = false textView.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
@@ -92,15 +81,8 @@ class LogViewController: UIViewController {
let bodyFont = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.body) let bodyFont = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.body)
let captionFont = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.caption1) let captionFont = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.caption1)
for logEntry in fetchedLogEntries { for logEntry in fetchedLogEntries {
var bgColor: UIColor let bgColor: UIColor = self.isNextLineHighlighted ? .systemGray3 : .systemBackground
var fgColor: UIColor let fgColor: UIColor = .label
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 timestampText = NSAttributedString(string: logEntry.timestamp + "\n", attributes: [.font: captionFont, .backgroundColor: bgColor, .foregroundColor: fgColor, .paragraphStyle: self.paragraphStyle]) 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]) let messageText = NSAttributedString(string: logEntry.message + "\n", attributes: [.font: bodyFont, .backgroundColor: bgColor, .foregroundColor: fgColor, .paragraphStyle: self.paragraphStyle])
richText.append(timestampText) richText.append(timestampText)
Sources/WireGuardApp/UI/iOS/ViewController/MainViewController.swift
+2 -6
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
@@ -13,11 +13,7 @@ class MainViewController: UISplitViewController {
init() { init() {
let detailVC = UIViewController() let detailVC = UIViewController()
if #available(iOS 13.0, *) { detailVC.view.backgroundColor = .systemBackground
detailVC.view.backgroundColor = .systemBackground
} else {
detailVC.view.backgroundColor = .white
}
let detailNC = UINavigationController(rootViewController: detailVC) let detailNC = UINavigationController(rootViewController: detailVC)
let masterVC = TunnelsListTableViewController() let masterVC = TunnelsListTableViewController()
Sources/WireGuardApp/UI/iOS/ViewController/QRScanViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import AVFoundation import AVFoundation
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/ViewController/SSIDOptionDetailTableViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/ViewController/SSIDOptionEditTableViewController.swift
+4 -23
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
import SystemConfiguration.CaptiveNetwork import SystemConfiguration.CaptiveNetwork
@@ -185,11 +185,7 @@ extension SSIDOptionEditTableViewController {
private func noSSIDsCell(for tableView: UITableView, at indexPath: IndexPath) -> UITableViewCell { private func noSSIDsCell(for tableView: UITableView, at indexPath: IndexPath) -> UITableViewCell {
let cell: TextCell = tableView.dequeueReusableCell(for: indexPath) let cell: TextCell = tableView.dequeueReusableCell(for: indexPath)
cell.message = tr("tunnelOnDemandNoSSIDs") cell.message = tr("tunnelOnDemandNoSSIDs")
if #available(iOS 13.0, *) { cell.setTextColor(.secondaryLabel)
cell.setTextColor(.secondaryLabel)
} else {
cell.setTextColor(.gray)
}
cell.setTextAlignment(.center) cell.setTextAlignment(.center)
return cell return cell
} }
@@ -268,23 +264,8 @@ extension SSIDOptionEditTableViewController {
#if targetEnvironment(simulator) #if targetEnvironment(simulator)
completionHandler("Simulator Wi-Fi") completionHandler("Simulator Wi-Fi")
#else #else
if #available(iOS 14, *) { NEHotspotNetwork.fetchCurrent { hotspotNetwork in
NEHotspotNetwork.fetchCurrent { hotspotNetwork in completionHandler(hotspotNetwork?.ssid)
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)
} }
#endif #endif
} }
Sources/WireGuardApp/UI/iOS/ViewController/SettingsTableViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
import os.log import os.log
Sources/WireGuardApp/UI/iOS/ViewController/TunnelDetailTableViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift
+4 -16
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import UIKit import UIKit
import MobileCoreServices import MobileCoreServices
@@ -33,11 +33,7 @@ class TunnelsListTableViewController: UIViewController {
let busyIndicator: UIActivityIndicatorView = { let busyIndicator: UIActivityIndicatorView = {
let busyIndicator: UIActivityIndicatorView let busyIndicator: UIActivityIndicatorView
if #available(iOS 13.0, *) { busyIndicator = UIActivityIndicatorView(style: .medium)
busyIndicator = UIActivityIndicatorView(style: .medium)
} else {
busyIndicator = UIActivityIndicatorView(style: .gray)
}
busyIndicator.hidesWhenStopped = true busyIndicator.hidesWhenStopped = true
return busyIndicator return busyIndicator
}() }()
@@ -51,11 +47,7 @@ class TunnelsListTableViewController: UIViewController {
override func loadView() { override func loadView() {
view = UIView() view = UIView()
if #available(iOS 13.0, *) { view.backgroundColor = .systemBackground
view.backgroundColor = .systemBackground
} else {
view.backgroundColor = .white
}
tableView.dataSource = self tableView.dataSource = self
tableView.delegate = self tableView.delegate = self
@@ -406,11 +398,7 @@ extension TunnelsListTableViewController: TunnelsManagerListDelegate {
(splitViewController.viewControllers[0] as? UINavigationController)?.popToRootViewController(animated: false) (splitViewController.viewControllers[0] as? UINavigationController)?.popToRootViewController(animated: false)
} else { } else {
let detailVC = UIViewController() let detailVC = UIViewController()
if #available(iOS 13.0, *) { detailVC.view.backgroundColor = .systemBackground
detailVC.view.backgroundColor = .systemBackground
} else {
detailVC.view.backgroundColor = .white
}
let detailNC = UINavigationController(rootViewController: detailVC) let detailNC = UINavigationController(rootViewController: detailVC)
splitViewController.showDetailViewController(detailNC, sender: self) splitViewController.showDetailViewController(detailNC, sender: self)
} }
Sources/WireGuardApp/UI/macOS/AppDelegate.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
import ServiceManagement import ServiceManagement
Sources/WireGuardApp/UI/macOS/Application.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/ErrorPresenter.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/ImportPanelPresenter.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/Info.plist
+1 -1
View File
@@ -29,7 +29,7 @@
<key>LSUIElement</key> <key>LSUIElement</key>
<true/> <true/>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright © 2018-2021 WireGuard LLC. All Rights Reserved.</string> <string>Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
<string>WireGuard.Application</string> <string>WireGuard.Application</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
Sources/WireGuardApp/UI/macOS/LaunchedAtLoginDetector.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/LoginItemHelper/Info.plist
+1 -1
View File
@@ -25,7 +25,7 @@
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string> <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright © 2018-2021 WireGuard LLC. All Rights Reserved.</string> <string>Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
<string>NSApplication</string> <string>NSApplication</string>
<key>LSBackgroundOnly</key> <key>LSBackgroundOnly</key>
Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m
+15 -19
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@@ -14,23 +14,19 @@ int main(int argc, char *argv[])
return 2; return 2;
uint64_t now = clock_gettime_nsec_np(CLOCK_UPTIME_RAW); 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]) if (![[NSData dataWithBytes:&now length:sizeof(now)] writeToURL:[containerUrl URLByAppendingPathComponent:@"login-helper-timestamp.bin"] atomically:YES])
return 3; return 3;
if (@available(macOS 10.15, *)) {
NSCondition *condition = [[NSCondition alloc] init]; NSCondition *condition = [[NSCondition alloc] init];
NSURL *appURL = [NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:appId]; NSURL *appURL = [NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:appId];
if (!appURL) if (!appURL)
return 4; return 4;
NSWorkspaceOpenConfiguration *openConfiguration = [NSWorkspaceOpenConfiguration configuration]; NSWorkspaceOpenConfiguration *openConfiguration = [NSWorkspaceOpenConfiguration configuration];
openConfiguration.activates = NO; openConfiguration.activates = NO;
openConfiguration.addsToRecentItems = NO; openConfiguration.addsToRecentItems = NO;
openConfiguration.hides = YES; openConfiguration.hides = YES;
[NSWorkspace.sharedWorkspace openApplicationAtURL:appURL configuration:openConfiguration completionHandler:^(NSRunningApplication * _Nullable app, NSError * _Nullable error) { [NSWorkspace.sharedWorkspace openApplicationAtURL:appURL configuration:openConfiguration completionHandler:^(NSRunningApplication * _Nullable app, NSError * _Nullable error) {
[condition signal]; [condition signal];
}]; }];
[condition wait]; [condition wait];
} else {
[NSWorkspace.sharedWorkspace launchAppWithBundleIdentifier:appId options:NSWorkspaceLaunchWithoutActivation
additionalEventParamDescriptor:NULL launchIdentifier:NULL];
}
return 0; return 0;
} }
Sources/WireGuardApp/UI/macOS/MacAppStoreUpdateDetector.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/NSColor+Hex.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import AppKit import AppKit
Sources/WireGuardApp/UI/macOS/NSTableView+Reuse.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/ParseError+WireGuardAppError.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/StatusItemController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/StatusMenu.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/TunnelsTracker.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/View/ButtonRow.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/View/ConfTextColorTheme.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/View/ConfTextStorage.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/View/ConfTextView.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/View/DeleteTunnelsConfirmationAlert.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/View/KeyValueRow.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/View/LogViewCell.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/View/OnDemandWiFiControls.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
import CoreWLAN import CoreWLAN
Sources/WireGuardApp/UI/macOS/View/TunnelListRow.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/View/highlighter.c
+1 -1
View File
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: MIT
/* /*
* Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/ */
Sources/WireGuardApp/UI/macOS/View/highlighter.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: MIT */
/* /*
* Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/ */
Sources/WireGuardApp/UI/macOS/ViewController/ButtonedDetailViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/ViewController/LogViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/ViewController/ManageTunnelsRootViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/ViewController/TunnelEditViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/ViewController/TunnelsListTableViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/UI/macOS/ViewController/UnusableTunnelDetailViewController.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Cocoa import Cocoa
Sources/WireGuardApp/WireGuardAppError.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
protocol WireGuardAppError: Error { protocol WireGuardAppError: Error {
typealias AlertText = (title: String, message: String) typealias AlertText = (title: String, message: String)
Sources/WireGuardApp/WireGuardResult.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
enum WireGuardResult<T> { enum WireGuardResult<T> {
case success(_ value: T) case success(_ value: T)
Sources/WireGuardApp/ZipArchive/ZipArchive.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/ZipArchive/ZipExporter.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/ZipArchive/ZipImporter.swift
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
import Foundation import Foundation
Sources/WireGuardApp/de.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names
Sources/WireGuardApp/es.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names
Sources/WireGuardApp/fa.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names
Sources/WireGuardApp/fi.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names
Sources/WireGuardApp/fr.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names
Sources/WireGuardApp/id.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names
Sources/WireGuardApp/it.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names
Sources/WireGuardApp/ja.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names
Sources/WireGuardApp/ko.lproj/Localizable.strings
+1 -1
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. // Copyright © 2018-2023 WireGuard LLC. All Rights Reserved.
// Generic alert action names // Generic alert action names

Some files were not shown because too many files have changed in this diff Show More