From b234100aa566a0da5b805031c5751ce057298d2b Mon Sep 17 00:00:00 2001 From: Max Goedjen Date: Fri, 15 May 2020 23:19:00 -0700 Subject: [PATCH] Fileprivate -> private (#91) --- SecretAgent/AppDelegate.swift | 2 +- SecretAgent/Notifier.swift | 2 +- SecretAgentKit/Agent.swift | 8 ++++---- SecretAgentKit/SocketController.swift | 4 ++-- SecretKit/Common/Erasers/AnySecret.swift | 12 ++++++------ SecretKit/Common/Erasers/AnySecretStore.swift | 16 ++++++++-------- SecretKit/Common/SecretStoreList.swift | 4 ++-- SecretKit/SecureEnclave/SecureEnclaveStore.swift | 12 ++++++------ SecretKit/SmartCard/SmartCardStore.swift | 14 +++++++------- Secretive/Views/ContentView.swift | 8 ++++---- Secretive/Views/DeleteSecretView.swift | 2 +- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/SecretAgent/AppDelegate.swift b/SecretAgent/AppDelegate.swift index 0f0b0a2..b8dbd10 100644 --- a/SecretAgent/AppDelegate.swift +++ b/SecretAgent/AppDelegate.swift @@ -23,7 +23,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { let path = (NSHomeDirectory() as NSString).appendingPathComponent("socket.ssh") as String return SocketController(path: path) }() - fileprivate var updateSink: AnyCancellable? + private var updateSink: AnyCancellable? func applicationDidFinishLaunching(_ aNotification: Notification) { os_log(.debug, "SecretAgent finished launching") diff --git a/SecretAgent/Notifier.swift b/SecretAgent/Notifier.swift index cbfce20..94a526e 100644 --- a/SecretAgent/Notifier.swift +++ b/SecretAgent/Notifier.swift @@ -7,7 +7,7 @@ import Brief class Notifier { - fileprivate let notificationDelegate = NotificationDelegate() + private let notificationDelegate = NotificationDelegate() init() { let updateAction = UNNotificationAction(identifier: Constants.updateActionIdentitifier, title: "Update", options: []) diff --git a/SecretAgentKit/Agent.swift b/SecretAgentKit/Agent.swift index 9c9a789..879ca92 100644 --- a/SecretAgentKit/Agent.swift +++ b/SecretAgentKit/Agent.swift @@ -6,10 +6,10 @@ import AppKit public class Agent { - fileprivate let storeList: SecretStoreList - fileprivate let witness: SigningWitness? - fileprivate let writer = OpenSSHKeyWriter() - fileprivate let requestTracer = SigningRequestTracer() + private let storeList: SecretStoreList + private let witness: SigningWitness? + private let writer = OpenSSHKeyWriter() + private let requestTracer = SigningRequestTracer() public init(storeList: SecretStoreList, witness: SigningWitness? = nil) { os_log(.debug, "Agent is running") diff --git a/SecretAgentKit/SocketController.swift b/SecretAgentKit/SocketController.swift index 1fc51d4..7b6a14b 100644 --- a/SecretAgentKit/SocketController.swift +++ b/SecretAgentKit/SocketController.swift @@ -3,8 +3,8 @@ import OSLog public class SocketController { - fileprivate var fileHandle: FileHandle? - fileprivate var port: SocketPort? + private var fileHandle: FileHandle? + private var port: SocketPort? public var handler: ((FileHandleReader, FileHandleWriter) -> Void)? public init(path: String) { diff --git a/SecretKit/Common/Erasers/AnySecret.swift b/SecretKit/Common/Erasers/AnySecret.swift index 7243f93..a3c0415 100644 --- a/SecretKit/Common/Erasers/AnySecret.swift +++ b/SecretKit/Common/Erasers/AnySecret.swift @@ -3,12 +3,12 @@ import Foundation public struct AnySecret: Secret { let base: Any - fileprivate let hashable: AnyHashable - fileprivate let _id: () -> AnyHashable - fileprivate let _name: () -> String - fileprivate let _algorithm: () -> Algorithm - fileprivate let _keySize: () -> Int - fileprivate let _publicKey: () -> Data + private let hashable: AnyHashable + private let _id: () -> AnyHashable + private let _name: () -> String + private let _algorithm: () -> Algorithm + private let _keySize: () -> Int + private let _publicKey: () -> Data public init(_ secret: T) where T: Secret { if let secret = secret as? AnySecret { diff --git a/SecretKit/Common/Erasers/AnySecretStore.swift b/SecretKit/Common/Erasers/AnySecretStore.swift index 322c31b..12b1ea0 100644 --- a/SecretKit/Common/Erasers/AnySecretStore.swift +++ b/SecretKit/Common/Erasers/AnySecretStore.swift @@ -4,12 +4,12 @@ import Combine public class AnySecretStore: SecretStore { let base: Any - fileprivate let _isAvailable: () -> Bool - fileprivate let _id: () -> UUID - fileprivate let _name: () -> String - fileprivate let _secrets: () -> [AnySecret] - fileprivate let _sign: (Data, AnySecret) throws -> Data - fileprivate var sink: AnyCancellable? + private let _isAvailable: () -> Bool + private let _id: () -> UUID + private let _name: () -> String + private let _secrets: () -> [AnySecret] + private let _sign: (Data, AnySecret) throws -> Data + private var sink: AnyCancellable? public init(_ secretStore: SecretStoreType) where SecretStoreType: SecretStore { base = secretStore @@ -47,8 +47,8 @@ public class AnySecretStore: SecretStore { public class AnySecretStoreModifiable: AnySecretStore, SecretStoreModifiable { - fileprivate let _create: (String, Bool) throws -> Void - fileprivate let _delete: (AnySecret) throws -> Void + private let _create: (String, Bool) throws -> Void + private let _delete: (AnySecret) throws -> Void public init(modifiable secretStore: SecretStoreType) where SecretStoreType: SecretStoreModifiable { _create = { try secretStore.create(name: $0, requiresAuthentication: $1) } diff --git a/SecretKit/Common/SecretStoreList.swift b/SecretKit/Common/SecretStoreList.swift index 885332a..0263a76 100644 --- a/SecretKit/Common/SecretStoreList.swift +++ b/SecretKit/Common/SecretStoreList.swift @@ -5,7 +5,7 @@ public class SecretStoreList: ObservableObject { @Published public var stores: [AnySecretStore] = [] @Published public var modifiableStore: AnySecretStoreModifiable? - fileprivate var sinks: [AnyCancellable] = [] + private var sinks: [AnyCancellable] = [] public init() { } @@ -28,7 +28,7 @@ public class SecretStoreList: ObservableObject { extension SecretStoreList { - fileprivate func addInternal(store: AnySecretStore) { + private func addInternal(store: AnySecretStore) { stores.append(store) let sink = store.objectWillChange.sink { self.objectWillChange.send() diff --git a/SecretKit/SecureEnclave/SecureEnclaveStore.swift b/SecretKit/SecureEnclave/SecureEnclaveStore.swift index 5baf358..a0e00a2 100644 --- a/SecretKit/SecureEnclave/SecureEnclaveStore.swift +++ b/SecretKit/SecureEnclave/SecureEnclaveStore.swift @@ -14,7 +14,7 @@ extension SecureEnclave { } public let id = UUID() public let name = NSLocalizedString("Secure Enclave", comment: "Secure Enclave") - @Published public fileprivate(set) var secrets: [Secret] = [] + @Published public private(set) var secrets: [Secret] = [] public init() { DistributedNotificationCenter.default().addObserver(forName: .secretStoreUpdated, object: nil, queue: .main) { _ in @@ -107,7 +107,7 @@ extension SecureEnclave { extension SecureEnclave.Store { - fileprivate func reloadSecrets(notify: Bool = true) { + private func reloadSecrets(notify: Bool = true) { secrets.removeAll() loadSecrets() if notify { @@ -115,7 +115,7 @@ extension SecureEnclave.Store { } } - fileprivate func loadSecrets() { + private func loadSecrets() { let attributes = [ kSecClass: kSecClassKey, kSecAttrKeyType: SecureEnclave.Constants.keyType, @@ -139,7 +139,7 @@ extension SecureEnclave.Store { secrets.append(contentsOf: wrapped) } - fileprivate func savePublicKey(_ publicKey: SecKey, name: String) throws { + private func savePublicKey(_ publicKey: SecKey, name: String) throws { let attributes = [ kSecClass: kSecClassKey, kSecAttrKeyType: SecureEnclave.Constants.keyType, @@ -178,8 +178,8 @@ extension SecureEnclave { extension SecureEnclave { enum Constants { - fileprivate static let keyTag = "com.maxgoedjen.secretive.secureenclave.key".data(using: .utf8)! as CFData - fileprivate static let keyType = kSecAttrKeyTypeECSECPrimeRandom + static let keyTag = "com.maxgoedjen.secretive.secureenclave.key".data(using: .utf8)! as CFData + static let keyType = kSecAttrKeyTypeECSECPrimeRandom } } diff --git a/SecretKit/SmartCard/SmartCardStore.swift b/SecretKit/SmartCard/SmartCardStore.swift index 6d01ce7..2fdbe4d 100644 --- a/SecretKit/SmartCard/SmartCardStore.swift +++ b/SecretKit/SmartCard/SmartCardStore.swift @@ -11,10 +11,10 @@ extension SmartCard { // TODO: Read actual smart card name, eg "YubiKey 5c" @Published public var isAvailable: Bool = false public let id = UUID() - public fileprivate(set) var name = NSLocalizedString("Smart Card", comment: "Smart Card") - @Published public fileprivate(set) var secrets: [Secret] = [] - fileprivate let watcher = TKTokenWatcher() - fileprivate var tokenID: String? + public private(set) var name = NSLocalizedString("Smart Card", comment: "Smart Card") + @Published public private(set) var secrets: [Secret] = [] + private let watcher = TKTokenWatcher() + private var tokenID: String? public init() { tokenID = watcher.nonSecureEnclaveTokens.first @@ -83,12 +83,12 @@ extension SmartCard { extension SmartCard.Store { - fileprivate func smartcardRemoved(for tokenID: String? = nil) { + private func smartcardRemoved(for tokenID: String? = nil) { self.tokenID = nil reloadSecrets() } - fileprivate func reloadSecrets() { + private func reloadSecrets() { DispatchQueue.main.async { self.isAvailable = self.tokenID != nil self.secrets.removeAll() @@ -96,7 +96,7 @@ extension SmartCard.Store { } } - fileprivate func loadSecrets() { + private func loadSecrets() { guard let tokenID = tokenID else { return } // Hack to read name if there's only one smart card let slotNames = TKSmartCardSlotManager().slotNames diff --git a/Secretive/Views/ContentView.swift b/Secretive/Views/ContentView.swift index 31b5bf7..aa23966 100644 --- a/Secretive/Views/ContentView.swift +++ b/Secretive/Views/ContentView.swift @@ -9,9 +9,9 @@ struct ContentView Void)? - @State fileprivate var active: AnySecret.ID? - @State fileprivate var showingDeletion = false - @State fileprivate var deletingSecret: AnySecret? + @State private var active: AnySecret.ID? + @State private var showingDeletion = false + @State private var deletingSecret: AnySecret? var body: some View { VStack { @@ -115,7 +115,7 @@ struct ContentView: View { @State var confirm = "" - fileprivate var dismissalBlock: (Bool) -> () + private var dismissalBlock: (Bool) -> () init(secret: StoreType.SecretType, store: StoreType, dismissalBlock: @escaping (Bool) -> ()) { self.secret = secret