Add ignore .gpg-id switch default ON

passKit/Crypto/GopenPGPInterface.swift

@@ -70,9 +70,16 @@ struct GopenPGPInterface: PGPInterface {
         privateKeys.keys.contains { key in key.hasSuffix(keyID.lowercased()) }
     }
 
-    func decrypt(encryptedData: Data, keyID: String, passphrase: String) throws -> Data? {
-        guard let key = privateKeys.first(where: { key, _ in key.hasSuffix(keyID.lowercased()) }),
-              let privateKey = privateKeys[key.key] else {
+    func decrypt(encryptedData: Data, keyID: String?, passphrase: String) throws -> Data? {
+        let key: CryptoKey? = {
+            if let keyID = keyID {
+                return privateKeys.first(where: { key, _ in key.hasSuffix(keyID.lowercased()) })?.value
+            } else {
+                return privateKeys.first?.value
+            }
+        }()
+
+        guard let privateKey = key else {
             throw AppError.decryption
         }
 
@@ -94,9 +101,16 @@ struct GopenPGPInterface: PGPInterface {
         }
     }
 
-    func encrypt(plainData: Data, keyID: String) throws -> Data {
-        guard let key = publicKeys.first(where: { key, _ in key.hasSuffix(keyID.lowercased()) }),
-              let publicKey = publicKeys[key.key] else {
+    func encrypt(plainData: Data, keyID: String?) throws -> Data {
+        let key: CryptoKey? = {
+            if let keyID = keyID {
+                return publicKeys.first(where: { key, _ in key.hasSuffix(keyID.lowercased()) })?.value
+            } else {
+                return publicKeys.first?.value
+            }
+        }()
+
+        guard let publicKey = key else {
             throw AppError.encryption
         }
 

passKit/Crypto/ObjectivePGPInterface.swift

@@ -29,11 +29,11 @@ struct ObjectivePGPInterface: PGPInterface {
         self.privateKey = privateKey
     }
 
-    func decrypt(encryptedData: Data, keyID _: String, passphrase: String) throws -> Data? {
+    func decrypt(encryptedData: Data, keyID _: String?, passphrase: String) throws -> Data? {
         try ObjectivePGP.decrypt(encryptedData, andVerifySignature: false, using: keyring.keys) { _ in passphrase }
     }
 
-    func encrypt(plainData: Data, keyID _: String) throws -> Data {
+    func encrypt(plainData: Data, keyID _: String?) throws -> Data {
         let encryptedData = try ObjectivePGP.encrypt(plainData, addSignature: false, using: keyring.keys, passphraseForKey: nil)
         if Defaults.encryptInArmored {
             return Armor.armored(encryptedData, as: .message).data(using: .ascii)!

passKit/Crypto/PGPAgent.swift

@@ -96,6 +96,36 @@ public class PGPAgent {
         return try pgpInterface.encrypt(plainData: plainData, keyID: keyID)
     }
 
+    public func decrypt(encryptedData: Data, requestPGPKeyPassphrase: (String) -> String) throws -> Data? {
+        // Remember the previous status and set the current status
+        let previousDecryptStatus = self.latestDecryptStatus
+        self.latestDecryptStatus = false
+        // Init keys.
+        try checkAndInit()
+        // Get the PGP key passphrase.
+        var passphrase = ""
+        if previousDecryptStatus == false {
+            passphrase = requestPGPKeyPassphrase("default")
+        } else {
+            passphrase = keyStore.get(for: Globals.pgpKeyPassphrase) ?? requestPGPKeyPassphrase("default")
+        }
+        // Decrypt.
+        guard let result = try pgpInterface!.decrypt(encryptedData: encryptedData, keyID: nil, passphrase: passphrase) else {
+            return nil
+        }
+        // The decryption step has succeed.
+        self.latestDecryptStatus = true
+        return result
+    }
+
+    public func encrypt(plainData: Data) throws -> Data {
+        try checkAndInit()
+        guard let pgpInterface = pgpInterface else {
+            throw AppError.encryption
+        }
+        return try pgpInterface.encrypt(plainData: plainData, keyID: nil)
+    }
+
     public var isPrepared: Bool {
         keyStore.contains(key: PgpKey.PUBLIC.getKeychainKey())
             && keyStore.contains(key: PgpKey.PRIVATE.getKeychainKey())

passKit/Crypto/PGPInterface.swift

@@ -7,9 +7,9 @@
 //
 
 protocol PGPInterface {
-    func decrypt(encryptedData: Data, keyID: String, passphrase: String) throws -> Data?
+    func decrypt(encryptedData: Data, keyID: String?, passphrase: String) throws -> Data?
 
-    func encrypt(plainData: Data, keyID: String) throws -> Data
+    func encrypt(plainData: Data, keyID: String?) throws -> Data
 
     func containsPublicKey(with keyID: String) -> Bool