diff --git a/pass/Services/PasswordDecryptor.swift b/pass/Services/PasswordDecryptor.swift index 8824bb3..e18aaba 100644 --- a/pass/Services/PasswordDecryptor.swift +++ b/pass/Services/PasswordDecryptor.swift @@ -30,8 +30,11 @@ func decryptPassword( } DispatchQueue.global(qos: .userInteractive).async { do { + guard let passwordEntity = PasswordStore.shared.fetchPasswordEntity(with: passwordPath) else { + throw AppError.decryption + } let requestPGPKeyPassphrase = Utils.createRequestPGPKeyPassphraseHandler(controller: controller) - let decryptedPassword = try PasswordStore.shared.decrypt(path: passwordPath, keyID: keyID, requestPGPKeyPassphrase: requestPGPKeyPassphrase) + let decryptedPassword = try PasswordStore.shared.decrypt(passwordEntity: passwordEntity, keyID: keyID, requestPGPKeyPassphrase: requestPGPKeyPassphrase) DispatchQueue.main.async { completion(decryptedPassword) diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index fdf321a..f71b8a6 100644 --- a/passKit/Models/PasswordStore.swift +++ b/passKit/Models/PasswordStore.swift @@ -403,13 +403,6 @@ public class PasswordStore { return Password(name: passwordEntity.name, path: passwordEntity.path, plainText: plainText) } - public func decrypt(path: String, keyID: String? = nil, requestPGPKeyPassphrase: @escaping (String) -> String) throws -> Password { - guard let passwordEntity = fetchPasswordEntity(with: path) else { - throw AppError.decryption - } - return try decrypt(passwordEntity: passwordEntity, keyID: keyID, requestPGPKeyPassphrase: requestPGPKeyPassphrase) - } - public func encrypt(password: Password, keyID: String? = nil) throws -> Data { let keyIDs: [String] = { if let keyID {