From 18016fbbacc2bb46f72a853c0b80378eae4e36c8 Mon Sep 17 00:00:00 2001
From: maik65 <maik65@mi.fu-berlin.de>
Date: Tue, 3 Mar 2020 11:32:49 +0100
Subject: [PATCH] issue #137: calling function findMailforSecretKey in function
storeMultipleKeys.
---
enzevalos_iphone/SwiftPGP.swift | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/enzevalos_iphone/SwiftPGP.swift b/enzevalos_iphone/SwiftPGP.swift
index 3d64c20a..e4ab8e5c 100644
--- a/enzevalos_iphone/SwiftPGP.swift
+++ b/enzevalos_iphone/SwiftPGP.swift
@@ -316,16 +316,20 @@ class SwiftPGP: Encryption {
return readKeys(data: data, importDate: importDate)
}
- private func storeMultipleKeys(keys: [Key], pw: String?, secret: Bool )-> [String]{
+ private func storeMultipleKeys(keys: [Key], pw: String?, secret: Bool)-> [String] {
var ids = [String]()
let keyring = Keyring()
// merge secret and public keys
keyring.import(keys: keys)
let newKeys = keyring.keys
- for k in newKeys{
- if k.isSecret && secret || !k.isSecret && !secret{
- ids.append(storeKey(key: k))
- if let password = pw{
+ for k in newKeys {
+ if k.isSecret && secret || !k.isSecret && !secret {
+ let id = storeKey(key: k)
+ ids.append(id)
+ if k.isSecret && secret {
+ findMailForSecretKey(keyID: id)
+ }
+ if let password = pw {
pwKeyChain[k.keyID.longIdentifier] = password
}
}
@@ -335,7 +339,7 @@ class SwiftPGP: Encryption {
func store(tempKeys: [TempKey]) -> [String] {
var ids: [String] = []
- tempKeys.forEach{
+ tempKeys.forEach {
ids.append(contentsOf: storeMultipleKeys(keys: [$0.key!], pw: $0.password, secret: $0.isSecret))
}
return ids
--
GitLab