diff --git a/.swiftlint.yml b/.swiftlint.yml index 105d91e..885f798 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -92,7 +92,7 @@ whitelist_rules: - let_var_whitespace # - line_length - literal_expression_end_indentation -# - lower_acl_than_parent + - lower_acl_than_parent - mark # - missing_docs - modifier_order diff --git a/pass/Helpers/SecurePasteboard.swift b/pass/Helpers/SecurePasteboard.swift index e050e1b..8b9b309 100644 --- a/pass/Helpers/SecurePasteboard.swift +++ b/pass/Helpers/SecurePasteboard.swift @@ -9,8 +9,9 @@ import Foundation import UIKit -class SecurePasteboard { +public class SecurePasteboard { public static let shared = SecurePasteboard() + private var backgroundTaskID = UIBackgroundTaskIdentifier.invalid func copy(textToCopy: String?, expirationTime: Double = 45) { diff --git a/passAutoFillExtension/Controllers/PasscodeExtensionDisplay.swift b/passAutoFillExtension/Controllers/PasscodeExtensionDisplay.swift index c44690e..a66b234 100644 --- a/passAutoFillExtension/Controllers/PasscodeExtensionDisplay.swift +++ b/passAutoFillExtension/Controllers/PasscodeExtensionDisplay.swift @@ -13,8 +13,8 @@ import passKit // cancel means cancel the extension class PasscodeLockViewControllerForExtension: PasscodeLockViewController { var originalExtensionContest: ASCredentialProviderExtensionContext? - - public convenience init(extensionContext: ASCredentialProviderExtensionContext?) { + + convenience init(extensionContext: ASCredentialProviderExtensionContext?) { self.init() self.originalExtensionContest = extensionContext } @@ -36,7 +36,7 @@ class PasscodeExtensionDisplay { private let passcodeLockVC: PasscodeLockViewControllerForExtension private let extensionContext: ASCredentialProviderExtensionContext? - public init(extensionContext: ASCredentialProviderExtensionContext?) { + init(extensionContext: ASCredentialProviderExtensionContext?) { self.extensionContext = extensionContext self.passcodeLockVC = PasscodeLockViewControllerForExtension(extensionContext: extensionContext) passcodeLockVC.dismissCompletionCallback = { [weak self] in @@ -46,7 +46,7 @@ class PasscodeExtensionDisplay { } // present the passcode lock view if passcode is set and the view controller is not presented - public func presentPasscodeLockIfNeeded(_ extensionVC: UIViewController) { + func presentPasscodeLockIfNeeded(_ extensionVC: UIViewController) { guard PasscodeLock.shared.hasPasscode, !isPasscodePresented == true else { return } @@ -54,7 +54,7 @@ class PasscodeExtensionDisplay { extensionVC.present(passcodeLockVC, animated: true, completion: nil) } - public func dismiss(animated _: Bool = true) { + func dismiss(animated _: Bool = true) { isPasscodePresented = false } } diff --git a/passExtension/Controllers/PasscodeExtensionDisplay.swift b/passExtension/Controllers/PasscodeExtensionDisplay.swift index ea218f6..df530f0 100644 --- a/passExtension/Controllers/PasscodeExtensionDisplay.swift +++ b/passExtension/Controllers/PasscodeExtensionDisplay.swift @@ -12,8 +12,8 @@ import passKit // cancel means cancel the extension class PasscodeLockViewControllerForExtension: PasscodeLockViewController { var originalExtensionContest: NSExtensionContext? - - public convenience init(extensionContext: NSExtensionContext?) { + + convenience init(extensionContext: NSExtensionContext?) { self.init() self.originalExtensionContest = extensionContext } @@ -35,7 +35,7 @@ class PasscodeExtensionDisplay { private let passcodeLockVC: PasscodeLockViewControllerForExtension private let extensionContext: NSExtensionContext? - public init(extensionContext: NSExtensionContext?) { + init(extensionContext: NSExtensionContext?) { self.extensionContext = extensionContext self.passcodeLockVC = PasscodeLockViewControllerForExtension(extensionContext: extensionContext) passcodeLockVC.dismissCompletionCallback = { [weak self] in @@ -45,7 +45,7 @@ class PasscodeExtensionDisplay { } // present the passcode lock view if passcode is set and the view controller is not presented - public func presentPasscodeLockIfNeeded(_ extensionVC: UIViewController) { + func presentPasscodeLockIfNeeded(_ extensionVC: UIViewController) { guard PasscodeLock.shared.hasPasscode, !isPasscodePresented == true else { return } @@ -53,7 +53,7 @@ class PasscodeExtensionDisplay { extensionVC.present(passcodeLockVC, animated: true, completion: nil) } - public func dismiss(animated _: Bool = true) { + func dismiss(animated _: Bool = true) { isPasscodePresented = false } } diff --git a/passKitTests/Testbase/DictBasedKeychain.swift b/passKitTests/Testbase/DictBasedKeychain.swift index 94bc44d..6f7b455 100644 --- a/passKitTests/Testbase/DictBasedKeychain.swift +++ b/passKitTests/Testbase/DictBasedKeychain.swift @@ -12,31 +12,31 @@ import passKit class DictBasedKeychain: KeyStore { private var store: [String: Any] = [:] - public func add(data: Data?, for key: String) { + func add(data: Data?, for key: String) { store[key] = data } - public func add(string: String?, for key: String) { + func add(string: String?, for key: String) { store[key] = string } - public func contains(key: String) -> Bool { + func contains(key: String) -> Bool { store[key] != nil } - public func get(for key: String) -> Data? { + func get(for key: String) -> Data? { store[key] as? Data } - public func get(for key: String) -> String? { + func get(for key: String) -> String? { store[key] as? String } - public func removeContent(for key: String) { + func removeContent(for key: String) { store.removeValue(forKey: key) } - public func removeAllContent() { + func removeAllContent() { store.removeAll() } }