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

Add PGPAgent tests and minor updated

Browse source
This commit is contained in:
Yishi Lin 2019-07-20 00:16:51 +08:00
parent a628a9b4da
commit e967bb1f4c
8 changed files with 68 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pass/Controllers/SettingsTableViewController.swift
View file

@ -89,8 +89,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
SVProgressHUD.show(withStatus: "FetchingPgpKey".localize())
DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
do {
try self.passwordStore.pgpAgent?.pgpKeyImportFromFileSharing()
try self.passwordStore.pgpAgent?.initPGPKeys()
try self.passwordStore.pgpAgent?.initPGPKeyFromFileSharing()
DispatchQueue.main.async {
self.pgpKeyTableViewCell.detailTextLabel?.text = self.passwordStore.pgpAgent?.pgpKeyID
SVProgressHUD.showSuccess(withStatus: "Imported".localize())
@ -193,7 +192,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
optionMenu.addAction(urlAction)
optionMenu.addAction(armorAction)
if passwordStore.pgpKeyExists(inFileSharing: true) {
if passwordStore.pgpAgent?.isFileSharingReady ?? false {
fileActionTitle.append(" (\("Import".localize()))")
let fileAction = UIAlertAction(title: fileActionTitle, style: .default) { _ in
// passphrase related