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

Change logic of passphrass for multikeys

Browse source
This commit is contained in:
Mingshen Sun 2020-04-13 19:15:52 -07:00
parent e9c5b63c4b
commit eb6e854d92
15 changed files with 95 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pass/Controllers/PGPKeyArmorImportTableViewController.swift
View file

@ -15,7 +15,10 @@ class PGPKeyArmorImportTableViewController: AutoCellHeightUITableViewController,
@IBOutlet weak var armorPrivateKeyTextView: UITextView!
@IBOutlet weak var scanPublicKeyCell: UITableViewCell!
@IBOutlet weak var scanPrivateKeyCell: UITableViewCell!
var armorPublicKey: String?
var armorPrivateKey: String?
class ScannedPGPKey {
enum KeyType {
case publicKey, privateKey
@ -74,7 +77,9 @@ class PGPKeyArmorImportTableViewController: AutoCellHeightUITableViewController,
}
@IBAction func save(_ sender: Any) {
savePassphraseDialog()
armorPublicKey = armorPublicKeyTextView.text
armorPrivateKey = armorPrivateKeyTextView.text
self.saveImportedKeys()
}
func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
@ -144,8 +149,8 @@ extension PGPKeyArmorImportTableViewController: PGPKeyImporter {
}
func importKeys() throws {
try KeyFileManager.PublicPgp.importKey(from: armorPublicKeyTextView.text ?? "")
try KeyFileManager.PrivatePgp.importKey(from: armorPrivateKeyTextView.text ?? "")
try KeyFileManager.PublicPgp.importKey(from: armorPublicKey ?? "")
try KeyFileManager.PrivatePgp.importKey(from: armorPrivateKey ?? "")
}
func saveImportedKeys() {