lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Set PGP key source once for all key importers

Browse source
This commit is contained in:
Danny Moesch 2020-02-09 22:39:59 +01:00 • committed by Mingshen Sun
parent e0c9ceb4fd
commit 43bba1fb50
4 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pass/Controllers/PGPKeyArmorSettingTableViewController.swift
View file

@ -148,8 +148,6 @@ extension PGPKeyArmorSettingTableViewController: PGPKeyImporter {
} }
func importKeys() throws { func importKeys() throws {
Defaults.pgpKeySource = Self.keySource
try KeyFileManager.PublicPgp.importKey(from: armorPublicKeyTextView.text ?? "") try KeyFileManager.PublicPgp.importKey(from: armorPublicKeyTextView.text ?? "")
try KeyFileManager.PrivatePgp.importKey(from: armorPrivateKeyTextView.text ?? "") try KeyFileManager.PrivatePgp.importKey(from: armorPrivateKeyTextView.text ?? "")
} }

2
pass/Controllers/PGPKeyFileSettingTableViewController.swift
View file

@ -82,8 +82,6 @@ extension PGPKeyFileSettingTableViewController: PGPKeyImporter {
guard let publicKey = publicKey, let privateKey = privateKey else { guard let publicKey = publicKey, let privateKey = privateKey else {
return return
} }
Defaults.pgpKeySource = Self.keySource
try KeyFileManager.PublicPgp.importKey(from: publicKey) try KeyFileManager.PublicPgp.importKey(from: publicKey)
try KeyFileManager.PrivatePgp.importKey(from: privateKey) try KeyFileManager.PrivatePgp.importKey(from: privateKey)
} }

4
pass/Controllers/PGPKeyUrlTableViewController.swift
View file

@ -37,10 +37,8 @@ extension PGPKeyUrlTableViewController: PGPKeyImporter {
return validate(pgpKeyUrl: pgpPublicKeyURLTextField.text) return validate(pgpKeyUrl: pgpPublicKeyURLTextField.text)
&& validate(pgpKeyUrl: pgpPrivateKeyURLTextField.text) && validate(pgpKeyUrl: pgpPrivateKeyURLTextField.text)
} }
func importKeys() throws {
Defaults.pgpKeySource = Self.keySource
func importKeys() throws {
Defaults.pgpPrivateKeyURL = URL(string: pgpPrivateKeyURLTextField.text!.trimmed) Defaults.pgpPrivateKeyURL = URL(string: pgpPrivateKeyURLTextField.text!.trimmed)
Defaults.pgpPublicKeyURL = URL(string: pgpPublicKeyURLTextField.text!.trimmed) Defaults.pgpPublicKeyURL = URL(string: pgpPublicKeyURLTextField.text!.trimmed)

3
pass/Controllers/SettingsTableViewController.swift
View file

@ -40,6 +40,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
SVProgressHUD.setDefaultStyle(.light) SVProgressHUD.setDefaultStyle(.light)
SVProgressHUD.show(withStatus: "FetchingPgpKey".localize()) SVProgressHUD.show(withStatus: "FetchingPgpKey".localize())
DispatchQueue.global(qos: .userInitiated).async { [unowned self] in DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
Defaults.pgpKeySource = type(of: keyImporter).keySource
do { do {
try keyImporter.importKeys() try keyImporter.importKeys()
try PGPAgent.shared.initKeys() try PGPAgent.shared.initKeys()
@ -253,8 +254,6 @@ extension SettingsTableViewController: PGPKeyImporter {
} }
func importKeys() throws { func importKeys() throws {
Defaults.pgpKeySource = Self.keySource
try KeyFileManager.PublicPgp.importKeyFromFileSharing() try KeyFileManager.PublicPgp.importKeyFromFileSharing()
try KeyFileManager.PrivatePgp.importKeyFromFileSharing() try KeyFileManager.PrivatePgp.importKeyFromFileSharing()
} }